Fix duplicate name of _mutex in ExceptionStore and some of its children.

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

diff --git a/src/lib/player.h b/src/lib/player.h
index 6edfa49b7d20ada1a4acb15d1c1171ea39a3560b..061388c4489b6354463edf3fb8e17c6878e2caa2 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -20,70 +20,27 @@
 #ifndef DCPOMATIC_PLAYER_H
 #define DCPOMATIC_PLAYER_H
 
-#include "content.h"
+#include "player_subtitles.h"
 #include "film.h"
-#include "rect.h"
-#include "audio_content.h"
-#include "dcpomatic_time.h"
-#include "content_subtitle.h"
+#include "content.h"
 #include "position_image.h"
 #include "piece.h"
-#include "content_video.h"
-#include "player_subtitles.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <list>
 
-class Job;
-class Film;
-class AudioContent;
-class Piece;
-class Image;
-class Decoder;
-class Resampler;
 class PlayerVideo;
-class ImageProxy;
+class Playlist;
 class Font;
-
-class PlayerStatistics
-{
-public:
-       struct Video {
-               Video ()
-                       : black (0)
-                       , repeat (0)
-                       , good (0)
-                       , skip (0)
-               {}
-
-               int black;
-               int repeat;
-               int good;
-               int skip;
-       } video;
-
-       struct Audio {
-               Audio ()
-                       : silence (0)
-                       , good (0)
-                       , skip (0)
-               {}
-
-               DCPTime silence;
-               int64_t good;
-               int64_t skip;
-       } audio;
-
-       void dump (boost::shared_ptr<Log>) const;
-};
+class AudioBuffers;
 
 /** @class Player
- *  @brief A class which can `play' a Film.
+ *  @brief A class which can `play' a Playlist.
  */
 class Player : public boost::enable_shared_from_this<Player>, public boost::noncopyable
 {
 public:
-       Player (boost::shared_ptr<const Film>);
+       Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist> playlist);
 
        std::list<boost::shared_ptr<PlayerVideo> > get_video (DCPTime time, bool accurate);
        boost::shared_ptr<AudioBuffers> get_audio (DCPTime time, DCPTime length, bool accurate);
@@ -95,8 +52,6 @@ public:
        void set_enable_subtitles (bool enable);
        void set_always_burn_subtitles (bool burn);
 
-       PlayerStatistics const & statistics () const;
-
        /** Emitted when something has changed such that if we went back and emitted
         *  the last frame again it would look different.  This is not emitted after
         *  a seek.
@@ -109,16 +64,20 @@ private:
        friend class PlayerWrapper;
        friend class Piece;
        friend struct player_overlaps_test;
+       friend struct player_time_calculation_test1;
+       friend struct player_time_calculation_test2;
+       friend struct player_time_calculation_test3;
 
        void setup_pieces ();
-       void content_changed (boost::weak_ptr<Content>, int, bool);
        void flush ();
        void film_changed (Film::Property);
+       void playlist_changed ();
+       void playlist_content_changed (boost::weak_ptr<Content>, int, bool);
        std::list<PositionImage> transform_image_subtitles (std::list<ImageSubtitle>) const;
        void update_subtitle_from_text ();
        Frame dcp_to_content_video (boost::shared_ptr<const Piece> piece, DCPTime t) const;
        DCPTime content_video_to_dcp (boost::shared_ptr<const Piece> piece, Frame f) const;
-       Frame dcp_to_content_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const;
+       Frame dcp_to_resampled_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const;
        ContentTime dcp_to_content_subtitle (boost::shared_ptr<const Piece> piece, DCPTime t) const;
        boost::shared_ptr<PlayerVideo> black_player_video_frame (DCPTime) const;
 
@@ -146,6 +105,7 @@ private:
        }
 
        boost::shared_ptr<const Film> _film;
+       boost::shared_ptr<const Playlist> _playlist;
 
        /** Our pieces are ready to go; if this is false the pieces must be (re-)created before they are used */
        bool _have_valid_pieces;
@@ -164,10 +124,9 @@ private:
 
        boost::shared_ptr<AudioProcessor> _audio_processor;
 
-       PlayerStatistics _statistics;
-
-       boost::signals2::scoped_connection _film_content_changed_connection;
        boost::signals2::scoped_connection _film_changed_connection;
+       boost::signals2::scoped_connection _playlist_changed_connection;
+       boost::signals2::scoped_connection _playlist_content_changed_connection;
 };
 
 #endif