Mostly-merge master.

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

diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index f98d4d8be83ae0e8c6bb23ce90d1d2b2d0017344..67bb25e0dc71e56fe5678c8bef2b25bd0f17c655 100644 (file)
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -25,7 +25,6 @@
 #include <sndfile.h>
 #include "sndfile_content.h"
 #include "sndfile_decoder.h"
-#include "film.h"
 #include "exceptions.h"
 #include "audio_buffers.h"
 
@@ -37,9 +36,8 @@ using std::min;
 using std::cout;
 using boost::shared_ptr;
 
-SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<const SndfileContent> c)
-       : Decoder (f)
-       , AudioDecoder (f, c)
+SndfileDecoder::SndfileDecoder (shared_ptr<const SndfileContent> c)
+       : AudioDecoder (c)
        , _sndfile_content (c)
        , _deinterleave_buffer (0)
 {
@@ -105,7 +103,7 @@ SndfileDecoder::pass ()
        }
                
        data->set_frames (this_time);
-       audio (data, _done * TIME_HZ / audio_frame_rate ());
+       audio (data, ContentTime::from_frames (_done, audio_frame_rate ()));
        _done += this_time;
        _remaining -= this_time;
 
@@ -118,10 +116,10 @@ SndfileDecoder::audio_channels () const
        return _info.channels;
 }
 
-AudioFrame
+ContentTime
 SndfileDecoder::audio_length () const
 {
-       return _info.frames;
+       return ContentTime::from_frames (_info.frames, audio_frame_rate ());
 }
 
 int
@@ -136,6 +134,6 @@ SndfileDecoder::seek (ContentTime t, bool accurate)
        Decoder::seek (t, accurate);
        AudioDecoder::seek (t, accurate);
 
-       _done = t * audio_frame_rate() / TIME_HZ;
+       _done = t.frames (audio_frame_rate ());
        _remaining = _info.frames - _done;
 }