← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to intern/audaspace/FX/AUD_SuperposeFactory.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
intern/audaspace/FX/AUD_SuperposeFactory.h
43
43
        /**
44
44
         * First played factory.
45
45
         */
46
 
        AUD_Reference<AUD_IFactory> m_factory1;
 
46
        boost::shared_ptr<AUD_IFactory> m_factory1;
47
47
 
48
48
        /**
49
49
         * Second played factory.
50
50
         */
51
 
        AUD_Reference<AUD_IFactory> m_factory2;
 
51
        boost::shared_ptr<AUD_IFactory> m_factory2;
52
52
 
53
53
        // hide copy constructor and operator=
54
54
        AUD_SuperposeFactory(const AUD_SuperposeFactory&);
60
60
         * \param factory1 The first input factory.
61
61
         * \param factory2 The second input factory.
62
62
         */
63
 
        AUD_SuperposeFactory(AUD_Reference<AUD_IFactory> factory1, AUD_Reference<AUD_IFactory> factory2);
 
63
        AUD_SuperposeFactory(boost::shared_ptr<AUD_IFactory> factory1, boost::shared_ptr<AUD_IFactory> factory2);
64
64
 
65
 
        virtual AUD_Reference<AUD_IReader> createReader();
 
65
        virtual boost::shared_ptr<AUD_IReader> createReader();
66
66
};
67
67
 
68
68
#endif //__AUD_SUPERPOSEFACTORY_H__