Further fixes and tidying to 'better-seek'.

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

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index f26c676b200038c54673871ef2b80c42ee8d8adb..1b1ae70c0c8195bb27fd95d3e667dc3f03b6e464 100644 (file)
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -22,6 +22,8 @@
 #include "audio_buffers.h"
 #include "audio_decoder_stream.h"
 #include "audio_content.h"
+#include "log.h"
+#include "compose.hpp"
 #include <boost/foreach.hpp>
 #include <iostream>
 
@@ -30,6 +32,7 @@
 using std::cout;
 using std::map;
 using boost::shared_ptr;
+using boost::optional;
 
 AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<const AudioContent> content, shared_ptr<Log> log)
        : DecoderPart (parent, log)
@@ -81,7 +84,7 @@ AudioDecoder::give (AudioStreamPtr stream, shared_ptr<const AudioBuffers> data,
 void
 AudioDecoder::flush ()
 {
-       for (map<AudioStreamPtr, shared_ptr<AudioDecoderStream> >::const_iterator i = _streams.begin(); i != _streams.end(); ++i) {
+       for (StreamMap::const_iterator i = _streams.begin(); i != _streams.end(); ++i) {
                i->second->flush ();
        }
 }
@@ -89,7 +92,8 @@ AudioDecoder::flush ()
 void
 AudioDecoder::seek (ContentTime t, bool accurate)
 {
-       for (map<AudioStreamPtr, shared_ptr<AudioDecoderStream> >::const_iterator i = _streams.begin(); i != _streams.end(); ++i) {
+       _log->log (String::compose ("AD seek to %1", to_string(t)), LogEntry::TYPE_DEBUG_DECODE);
+       for (StreamMap::const_iterator i = _streams.begin(); i != _streams.end(); ++i) {
                i->second->seek (t, accurate);
        }
 }
@@ -97,7 +101,19 @@ AudioDecoder::seek (ContentTime t, bool accurate)
 void
 AudioDecoder::set_fast ()
 {
-       for (map<AudioStreamPtr, shared_ptr<AudioDecoderStream> >::const_iterator i = _streams.begin(); i != _streams.end(); ++i) {
+       for (StreamMap::const_iterator i = _streams.begin(); i != _streams.end(); ++i) {
                i->second->set_fast ();
        }
 }
+
+optional<ContentTime>
+AudioDecoder::position () const
+{
+       optional<ContentTime> pos;
+       for (StreamMap::const_iterator i = _streams.begin(); i != _streams.end(); ++i) {
+               if (!pos || (i->second->position() && i->second->position().get() < pos.get())) {
+                       pos = i->second->position();
+               }
+       }
+       return pos;
+}