← Back to branch summary

~ubuntu-branches/ubuntu/saucy/blender/saucy-proposed

« back to all changes in this revision

Viewing changes to intern/audaspace/intern/AUD_MixerFactory.cpp

  • 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/intern/AUD_MixerFactory.cpp
30
30
#include "AUD_MixerFactory.h"
31
31
#include "AUD_IReader.h"
32
32
 
33
 
AUD_Reference<AUD_IReader> AUD_MixerFactory::getReader() const
 
33
boost::shared_ptr<AUD_IReader> AUD_MixerFactory::getReader() const
34
34
{
35
35
        return m_factory->createReader();
36
36
}
37
37
 
38
 
AUD_MixerFactory::AUD_MixerFactory(AUD_Reference<AUD_IFactory> factory,
 
38
AUD_MixerFactory::AUD_MixerFactory(boost::shared_ptr<AUD_IFactory> factory,
39
39
                                                                   AUD_DeviceSpecs specs) :
40
40
        m_specs(specs), m_factory(factory)
41
41
{
46
46
        return m_specs;
47
47
}
48
48
 
49
 
AUD_Reference<AUD_IFactory> AUD_MixerFactory::getFactory() const
 
49
boost::shared_ptr<AUD_IFactory> AUD_MixerFactory::getFactory() const
50
50
{
51
51
        return m_factory;
52
52
}