X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=a795f8174323002900ece524f1cffcad88309cdd;hb=44c918a83e1e64922448ba20b5dfdcf30d026f84;hp=a3b745c8e4ca69acd641cb106be7b733ca19e7da;hpb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d;p=dcpomatic.git

diff --git a/src/lib/player.h b/src/lib/player.h
index a3b745c8e..a795f8174 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,10 +20,6 @@
 #ifndef DCPOMATIC_PLAYER_H
 #define DCPOMATIC_PLAYER_H
 
-#include <list>
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include "playlist.h"
 #include "content.h"
 #include "film.h"
 #include "rect.h"
@@ -34,10 +30,12 @@
 #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 Playlist;
 class AudioContent;
 class Piece;
 class Image;
@@ -45,38 +43,7 @@ class Decoder;
 class Resampler;
 class PlayerVideo;
 class ImageProxy;
- 
-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 Font;
 
 /** @class Player
  *  @brief A class which can `play' a Playlist.
@@ -84,17 +51,18 @@ public:
 class Player : public boost::enable_shared_from_this<Player>, public boost::noncopyable
 {
 public:
-	Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
+	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);
-	PlayerSubtitles get_subtitles (DCPTime time, DCPTime length, bool starting);
+	PlayerSubtitles get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt);
+	std::list<boost::shared_ptr<Font> > get_subtitle_fonts ();
 
 	void set_video_container_size (dcp::Size);
-	void set_approximate_size ();
+	void set_ignore_video ();
+	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.
@@ -107,17 +75,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 playlist_changed ();
-	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 ();
-	VideoFrame dcp_to_content_video (boost::shared_ptr<const Piece> piece, DCPTime t) const;
-	DCPTime content_video_to_dcp (boost::shared_ptr<const Piece> piece, VideoFrame f) const;
-	AudioFrame dcp_to_content_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const;
+	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_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;
 
@@ -140,10 +111,10 @@ private:
 				overlaps.push_back (*i);
 			}
 		}
-		
+
 		return overlaps;
 	}
-	
+
 	boost::shared_ptr<const Film> _film;
 	boost::shared_ptr<const Playlist> _playlist;
 
@@ -151,17 +122,22 @@ private:
 	bool _have_valid_pieces;
 	std::list<boost::shared_ptr<Piece> > _pieces;
 
+	/** Size of the image in the DCP (e.g. 1990x1080 for flat) */
 	dcp::Size _video_container_size;
 	boost::shared_ptr<Image> _black_image;
 
-	bool _approximate_size;
-	bool _burn_subtitles;
+	/** true if the player should ignore all video; i.e. never produce any */
+	bool _ignore_video;
+	/** true if the player should always burn subtitles into the video regardless
+	    of content settings
+	*/
+	bool _always_burn_subtitles;
 
-	PlayerStatistics _statistics;
+	boost::shared_ptr<AudioProcessor> _audio_processor;
 
+	boost::signals2::scoped_connection _film_changed_connection;
 	boost::signals2::scoped_connection _playlist_changed_connection;
 	boost::signals2::scoped_connection _playlist_content_changed_connection;
-	boost::signals2::scoped_connection _film_changed_connection;
 };
 
 #endif