Various work on the audio code.

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

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index b866d3ecf14f65abfb99278fa6e35d6f0e9b25af..6a795f3ac1906c3bf0979c9623424ae36a588e41 100644 (file)
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -94,11 +94,18 @@ AudioDecoder::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();
+       optional<ContentTime> p;
+       for (map<AudioStreamPtr, ContentTime>::const_iterator i = _positions.begin(); i != _positions.end(); ++i) {
+               if (!p || i->second < *p) {
+                       p = i->second;
                }
        }
-       return pos;
+
+       return p;
+}
+
+void
+AudioDecoder::set_position (AudioStreamPtr stream, ContentTime time)
+{
+       _positions[stream] = time;
 }