Various incomplete hacks on regions / audio mapping.

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

diff --git a/src/lib/player.h b/src/lib/player.h
index 7a99d656190bd25c23faddcd08f61e218942c884..4979778ede20425c8cb3040bc944129c27650ded 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -1,3 +1,5 @@
+/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
+
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
@@ -17,8 +19,8 @@
 
 */
 
-#ifndef DVDOMATIC_PLAYER_H
-#define DVDOMATIC_PLAYER_H
+#ifndef DCPOMATIC_PLAYER_H
+#define DCPOMATIC_PLAYER_H
 
 #include <list>
 #include <boost/shared_ptr.hpp>
@@ -27,15 +29,20 @@
 #include "audio_source.h"
 #include "video_sink.h"
 #include "audio_sink.h"
+#include "playlist.h"
+#include "audio_buffers.h"
 
-class VideoDecoder;
-class SndfileDecoder;
 class Job;
 class Film;
 class Playlist;
 class AudioContent;
+class Decoder;
 
-class Player : public VideoSource, public AudioSource, public VideoSink, public boost::enable_shared_from_this<Player>
+/** @class Player
+ *  @brief A class which can `play' a Playlist; emitting its audio and video.
+ */
+ 
+class Player : public VideoSource, public AudioSource, public boost::enable_shared_from_this<Player>
 {
 public:
        Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
@@ -43,20 +50,36 @@ 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 (Time);
+       void seek_back ();
+       void seek_forward ();
 
-       double last_video_time () const;
+       Time last_video () const {
+               return _last_video;
+       }
 
 private:
-       void process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr<Subtitle> s);
-       void process_audio (boost::weak_ptr<const AudioContent>, boost::shared_ptr<AudioBuffers>);
+
+       struct RegionDecoder
+       {
+               RegionDecoder ()
+                       : last (0)
+               {}
+               
+               boost::shared_ptr<Playlist::Region> region;
+               boost::shared_ptr<Decoder> decoder;
+               Time last;
+       };
+       
+       void process_video (boost::shared_ptr<RegionDecoder>, boost::shared_ptr<const Image>, bool, boost::shared_ptr<Subtitle>, Time);
+       void process_audio (boost::shared_ptr<RegionDecoder>, boost::shared_ptr<const AudioBuffers>, Time);
        void setup_decoders ();
        void playlist_changed ();
        void content_changed (boost::weak_ptr<Content>, int);
+       void emit_black_frame ();
+       void emit_silence (Time);
 
        boost::shared_ptr<const Film> _film;
        boost::shared_ptr<const Playlist> _playlist;
@@ -64,15 +87,16 @@ private:
        bool _video;
        bool _audio;
        bool _subtitles;
-       
-       bool _have_valid_decoders;
-       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;
 
-       boost::shared_ptr<AudioBuffers> _audio_buffers;
+       /** Our decoders are ready to go; if this is false the decoders must be (re-)created before they are used */
+       bool _have_valid_decoders;
+       std::list<boost::shared_ptr<RegionDecoder> > _decoders;
 
-       bool _video_sync;
+       Time _position;
+       AudioBuffers _audio_buffers;
+       Time _last_video;
+       bool _last_was_black;
+       Time _last_audio;
 };
 
 #endif