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

diff --git a/src/lib/player.h b/src/lib/player.h
index 0abb02daa..a795f8174 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -45,38 +45,6 @@ class PlayerVideo;
 class ImageProxy;
 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 Player
  *  @brief A class which can `play' a Playlist.
  */
@@ -95,8 +63,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,6 +75,9 @@ 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 flush ();
@@ -119,7 +88,7 @@ private:
 	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;
 
@@ -166,8 +135,6 @@ private:
 
 	boost::shared_ptr<AudioProcessor> _audio_processor;
 
-	PlayerStatistics _statistics;
-
 	boost::signals2::scoped_connection _film_changed_connection;
 	boost::signals2::scoped_connection _playlist_changed_connection;
 	boost::signals2::scoped_connection _playlist_content_changed_connection;