← 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_StreamBufferFactory.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_StreamBufferFactory.cpp
33
33
 
34
34
#include <cstring>
35
35
 
36
 
AUD_StreamBufferFactory::AUD_StreamBufferFactory(AUD_Reference<AUD_IFactory> factory) :
 
36
AUD_StreamBufferFactory::AUD_StreamBufferFactory(boost::shared_ptr<AUD_IFactory> factory) :
37
37
        m_buffer(new AUD_Buffer())
38
38
{
39
 
        AUD_Reference<AUD_IReader> reader = factory->createReader();
 
39
        boost::shared_ptr<AUD_IReader> reader = factory->createReader();
40
40
 
41
41
        m_specs = reader->getSpecs();
42
42
 
70
70
        m_buffer->resize(index * sample_size, true);
71
71
}
72
72
 
73
 
AUD_Reference<AUD_IReader> AUD_StreamBufferFactory::createReader()
 
73
boost::shared_ptr<AUD_IReader> AUD_StreamBufferFactory::createReader()
74
74
{
75
 
        return new AUD_BufferReader(m_buffer, m_specs);
 
75
        return boost::shared_ptr<AUD_IReader>(new AUD_BufferReader(m_buffer, m_specs));
76
76
}