Merge master; fix crash on new film.

[dcpomatic.git] / src / lib / util.h

diff --git a/src/lib/util.h b/src/lib/util.h
index 02cc742aa52f62a8fac1a467d1c7a44b310f8625..0edfe2076b3bd8ce80f6077df102d1b3d2564f17 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -159,6 +159,7 @@ class AudioBuffers
 public:
        AudioBuffers (int channels, int frames);
        AudioBuffers (AudioBuffers const &);
+       AudioBuffers (boost::shared_ptr<const AudioBuffers>);
        ~AudioBuffers ();
 
        float** data () const {
@@ -182,7 +183,7 @@ public:
 
        void copy_from (AudioBuffers* from, int frames_to_copy, int read_offset, int write_offset);
        void move (int from, int to, int frames);
-       void accumulate (boost::shared_ptr<AudioBuffers>, int, int);
+       void accumulate (boost::shared_ptr<const AudioBuffers>, int, int);
 
 private:
        /** Number of channels */