Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 09b67e921bf42e2820937212fd1cfae32a3bdef7..12832cfd78aa3c5c059e29723c73d29d4a84d3ee 100644 (file)
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -24,6 +24,7 @@
 #include "ffmpeg_decoder.h"
 #include "ffmpeg_content.h"
 #include "image_decoder.h"
+#include "audio_content.h"
 #include "content_factory.h"
 #include "dcp_content.h"
 #include "job.h"
@@ -555,6 +556,39 @@ Playlist::video_content_at (DCPTime time) const
        return false;
 }
 
+bool
+Playlist::audio_content_at (DCPTime time) const
+{
+       BOOST_FOREACH (shared_ptr<Content> i, _content) {
+               if (!i->audio) {
+                       continue;
+               }
+               if (i->position() <= time && time < i->end()) {
+                       return true;
+               }
+       }
+
+       return false;
+}
+
+shared_ptr<Content>
+Playlist::next_audio_content (DCPTime time) const
+{
+       shared_ptr<Content> next;
+       DCPTime next_position;
+       BOOST_FOREACH (shared_ptr<Content> i, _content) {
+               if (!i->audio) {
+                       continue;
+               }
+               if (i->position() >= time && (!next || i->position() < next_position)) {
+                       next = i;
+                       next_position = i->position();
+               }
+       }
+
+       return next;
+}
+
 pair<double, double>
 Playlist::speed_up_range (int dcp_video_frame_rate) const
 {