Add total-playlist loop option; move state of content list into the Playlist.

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

diff --git a/src/lib/player.cc b/src/lib/player.cc
index b2122458784fa2bc9251b4baa54e2d06ecd47b89..d62d8f8b6408bf66b95ddb7eb08f1c51bea3aae0 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -229,67 +229,69 @@ Player::setup_decoders ()
 
        double video_so_far = 0;
        double audio_so_far = 0;
-       
-       list<shared_ptr<const VideoContent> > vc = _playlist->video ();
-       for (list<shared_ptr<const VideoContent> >::iterator i = vc.begin(); i != vc.end(); ++i) {
-               
-               shared_ptr<const VideoContent> video_content;
-               shared_ptr<const AudioContent> audio_content;
-               shared_ptr<VideoDecoder> video_decoder;
-               shared_ptr<AudioDecoder> audio_decoder;
-               
-               /* XXX: into content? */
-               
-               shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (*i);
-               if (fc) {
-                       shared_ptr<FFmpegDecoder> fd (
-                               new FFmpegDecoder (
-                                       _film, fc, _video,
-                                       _audio && _playlist->audio_from() == Playlist::AUDIO_FFMPEG,
-                                       _subtitles
-                                       )
-                               );
+
+       for (int l = 0; l < _playlist->loop(); ++l) {
+               list<shared_ptr<const VideoContent> > vc = _playlist->video ();
+               for (list<shared_ptr<const VideoContent> >::iterator i = vc.begin(); i != vc.end(); ++i) {
                        
-                       video_content = fc;
-                       audio_content = fc;
-                       video_decoder = fd;
-                       audio_decoder = fd;
-               }
-               
-               shared_ptr<const ImageMagickContent> ic = dynamic_pointer_cast<const ImageMagickContent> (*i);
-               if (ic) {
-                       video_content = ic;
-                       video_decoder.reset (new ImageMagickDecoder (_film, ic));
+                       shared_ptr<const VideoContent> video_content;
+                       shared_ptr<const AudioContent> audio_content;
+                       shared_ptr<VideoDecoder> video_decoder;
+                       shared_ptr<AudioDecoder> audio_decoder;
+                       
+                       /* XXX: into content? */
+                       
+                       shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (*i);
+                       if (fc) {
+                               shared_ptr<FFmpegDecoder> fd (
+                                       new FFmpegDecoder (
+                                               _film, fc, _video,
+                                               _audio && _playlist->audio_from() == Playlist::AUDIO_FFMPEG,
+                                               _subtitles
+                                               )
+                                       );
+                               
+                               video_content = fc;
+                               audio_content = fc;
+                               video_decoder = fd;
+                               audio_decoder = fd;
+                       }
+                       
+                       shared_ptr<const ImageMagickContent> ic = dynamic_pointer_cast<const ImageMagickContent> (*i);
+                       if (ic) {
+                               video_content = ic;
+                               video_decoder.reset (new ImageMagickDecoder (_film, ic));
+                       }
+                       
+                       video_decoder->connect_video (shared_from_this ());
+                       _video_decoders.push_back (video_decoder);
+                       _video_start.push_back (video_so_far);
+                       video_so_far += video_content->video_length() / video_content->video_frame_rate();
+                       
+                       if (audio_decoder && _playlist->audio_from() == Playlist::AUDIO_FFMPEG) {
+                               audio_decoder->Audio.connect (bind (&Player::process_audio, this, audio_content, _1, _2));
+                               _audio_decoders.push_back (audio_decoder);
+                               _audio_start.push_back (audio_so_far);
+                               audio_so_far += double(audio_content->audio_length()) / audio_content->audio_frame_rate();
+                       }
                }
                
-               video_decoder->connect_video (shared_from_this ());
-               _video_decoders.push_back (video_decoder);
-               _video_start.push_back (video_so_far);
-               video_so_far += video_content->video_length() / video_content->video_frame_rate();
-
-               if (audio_decoder && _playlist->audio_from() == Playlist::AUDIO_FFMPEG) {
-                       audio_decoder->Audio.connect (bind (&Player::process_audio, this, audio_content, _1, _2));
-                       _audio_decoders.push_back (audio_decoder);
-                       _audio_start.push_back (audio_so_far);
-                       audio_so_far += double(audio_content->audio_length()) / audio_content->audio_frame_rate();
-               }
-       }
-       
-       _video_decoder = 0;
-       _sequential_audio_decoder = 0;
-
-       if (_playlist->audio_from() == Playlist::AUDIO_SNDFILE) {
+               _video_decoder = 0;
+               _sequential_audio_decoder = 0;
                
-               list<shared_ptr<const AudioContent> > ac = _playlist->audio ();
-               for (list<shared_ptr<const AudioContent> >::iterator i = ac.begin(); i != ac.end(); ++i) {
+               if (_playlist->audio_from() == Playlist::AUDIO_SNDFILE) {
                        
-                       shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (*i);
-                       assert (sc);
-                       
-                       shared_ptr<AudioDecoder> d (new SndfileDecoder (_film, sc));
-                       d->Audio.connect (bind (&Player::process_audio, this, sc, _1, _2));
-                       _audio_decoders.push_back (d);
-                       _audio_start.push_back (audio_so_far);
+                       list<shared_ptr<const AudioContent> > ac = _playlist->audio ();
+                       for (list<shared_ptr<const AudioContent> >::iterator i = ac.begin(); i != ac.end(); ++i) {
+                               
+                               shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (*i);
+                               assert (sc);
+                               
+                               shared_ptr<AudioDecoder> d (new SndfileDecoder (_film, sc));
+                               d->Audio.connect (bind (&Player::process_audio, this, sc, _1, _2));
+                               _audio_decoders.push_back (d);
+                               _audio_start.push_back (audio_so_far);
+                       }
                }
        }
 }