← Back to branch summary

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

« back to all changes in this revision

Viewing changes to intern/audaspace/FX/AUD_DoubleReader.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_DoubleReader.h
32
32
 
33
33
#include "AUD_IReader.h"
34
34
#include "AUD_Buffer.h"
35
 
#include "AUD_Reference.h"
 
35
 
 
36
#include <boost/shared_ptr.hpp>
36
37
 
37
38
/**
38
39
 * This reader plays two readers sequently.
43
44
        /**
44
45
         * The first reader.
45
46
         */
46
 
        AUD_Reference<AUD_IReader> m_reader1;
 
47
        boost::shared_ptr<AUD_IReader> m_reader1;
47
48
 
48
49
        /**
49
50
         * The second reader.
50
51
         */
51
 
        AUD_Reference<AUD_IReader> m_reader2;
 
52
        boost::shared_ptr<AUD_IReader> m_reader2;
52
53
 
53
54
        /**
54
55
         * Whether we've reached the end of the first reader.
65
66
         * \param reader1 The first reader to read from.
66
67
         * \param reader2 The second reader to read from.
67
68
         */
68
 
        AUD_DoubleReader(AUD_Reference<AUD_IReader> reader1, AUD_Reference<AUD_IReader> reader2);
 
69
        AUD_DoubleReader(boost::shared_ptr<AUD_IReader> reader1, boost::shared_ptr<AUD_IReader> reader2);
69
70
 
70
71
        /**
71
72
         * Destroys the reader.