Assorted C++11/formatting cleanups.

[dcpomatic.git] / src / lib / audio_buffers.cc

diff --git a/src/lib/audio_buffers.cc b/src/lib/audio_buffers.cc
index cfe762659ebdb6d91128557b35cccb3c08c56144..5f2d5539d0293706634f43c7320b9c7dceb2a6a6 100644 (file)
--- a/src/lib/audio_buffers.cc
+++ b/src/lib/audio_buffers.cc
@@ -27,7 +27,7 @@
 #include <stdexcept>
 
 using std::bad_alloc;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** Construct an AudioBuffers.  Audio data is undefined after this constructor.
  *  @param channels Number of channels.
@@ -47,13 +47,13 @@ AudioBuffers::AudioBuffers (AudioBuffers const & other)
        copy_from (&other, other._frames, 0, 0);
 }
 
-AudioBuffers::AudioBuffers (boost::shared_ptr<const AudioBuffers> other)
+AudioBuffers::AudioBuffers (std::shared_ptr<const AudioBuffers> other)
 {
        allocate (other->_channels, other->_frames);
        copy_from (other.get(), other->_frames, 0, 0);
 }
 
-AudioBuffers::AudioBuffers (boost::shared_ptr<const AudioBuffers> other, int32_t frames_to_copy, int32_t read_offset)
+AudioBuffers::AudioBuffers (std::shared_ptr<const AudioBuffers> other, int32_t frames_to_copy, int32_t read_offset)
 {
        allocate (other->_channels, frames_to_copy);
        copy_from (other.get(), frames_to_copy, read_offset, 0);
@@ -192,9 +192,8 @@ AudioBuffers::copy_from (AudioBuffers const * from, int32_t frames_to_copy, int3
                return;
        }
 
-       DCPOMATIC_ASSERT (from->channels() == channels());
-
        DCPOMATIC_ASSERT (from);
+       DCPOMATIC_ASSERT (from->channels() == channels());
        DCPOMATIC_ASSERT (read_offset >= 0 && (read_offset + frames_to_copy) <= from->_allocated_frames);
        DCPOMATIC_ASSERT (write_offset >= 0 && (write_offset + frames_to_copy) <= _allocated_frames);