Untested merge of master.

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

diff --git a/src/lib/player.h b/src/lib/player.h
index 79203692e963dc9c53df06dab626ad798378f6ce..539fae67a2ad7730e226af84bffd95f37f1dad14 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_PLAYER_H
-#define DVDOMATIC_PLAYER_H
+#ifndef DCPOMATIC_PLAYER_H
+#define DCPOMATIC_PLAYER_H
 
 #include <list>
 #include <boost/shared_ptr.hpp>
@@ -28,14 +28,14 @@
 #include "video_sink.h"
 #include "audio_sink.h"
 
-class FFmpegDecoder;
-class ImageMagickDecoder;
+class VideoDecoder;
 class SndfileDecoder;
 class Job;
 class Film;
 class Playlist;
+class AudioContent;
 
-class Player : public VideoSource, public AudioSource, public VideoSink, public AudioSink, public boost::enable_shared_from_this<Player>
+class Player : public TimedVideoSource, public TimedAudioSource, public TimedVideoSink, public boost::enable_shared_from_this<Player>
 {
 public:
        Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
@@ -43,18 +43,18 @@ public:
        void disable_video ();
        void disable_audio ();
        void disable_subtitles ();
-       void disable_video_sync ();
 
        bool pass ();
        void set_progress (boost::shared_ptr<Job>);
        bool seek (double);
-       bool seek_to_last ();
+       void seek_back ();
+       void seek_forward ();
 
        double last_video_time () const;
 
 private:
-       void process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr<Subtitle> s);
-       void process_audio (boost::shared_ptr<AudioBuffers>);
+       void process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr<Subtitle> s, double);
+       void process_audio (boost::weak_ptr<const AudioContent>, boost::shared_ptr<AudioBuffers>, double);
        void setup_decoders ();
        void playlist_changed ();
        void content_changed (boost::weak_ptr<Content>, int);
@@ -67,13 +67,12 @@ private:
        bool _subtitles;
        
        bool _have_valid_decoders;
-       boost::shared_ptr<FFmpegDecoder> _ffmpeg_decoder;
-       bool _ffmpeg_decoder_done;
-       std::list<boost::shared_ptr<ImageMagickDecoder> > _imagemagick_decoders;
-       std::list<boost::shared_ptr<ImageMagickDecoder> >::iterator _imagemagick_decoder;
+       std::list<boost::shared_ptr<VideoDecoder> > _video_decoders;
+       std::list<boost::shared_ptr<VideoDecoder> >::iterator _video_decoder;
        std::list<boost::shared_ptr<SndfileDecoder> > _sndfile_decoders;
 
-       bool _video_sync;
+       boost::shared_ptr<AudioBuffers> _audio_buffers;
+       boost::optional<double> _audio_time;
 };
 
 #endif