X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=c3489b7e1f227d3c6645cce9ab65fcf06348f51c;hb=8102046b2f29e0c7b234c29bf204b056cb30e64f;hp=4865073d705484050330a604adc8e9de6b1ba4e1;hpb=e939aa008f49da93ce95c409182657cc083d5987;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 4865073d7..c3489b7e1 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -43,6 +43,8 @@
 #include "content_video.h"
 #include "player_video_frame.h"
 
+#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+
 using std::list;
 using std::cout;
 using std::min;
@@ -189,6 +191,7 @@ Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
 	}
 }
 
+/** @param already_resampled true if this data has already been through the chain up to the resampler */
 void
 Player::playlist_changed ()
 {
@@ -293,7 +296,7 @@ Player::black_player_video_frame () const
 {
 	return shared_ptr<PlayerVideoFrame> (
 		new PlayerVideoFrame (
-			shared_ptr<const ImageProxy> (new RawImageProxy (_black_image)),
+			shared_ptr<const ImageProxy> (new RawImageProxy (_black_image, _film->log ())),
 			Crop (),
 			_video_container_size,
 			_video_container_size,
@@ -337,7 +340,7 @@ Player::content_to_player_video_frame (
 		ContentTime const from = dcp_to_content_subtitle (*i, time);
 		ContentTime const to = from + ContentTime::from_frames (1, content->video_frame_rate ());
 		
-		list<shared_ptr<ContentImageSubtitle> > image_subtitles = subtitle_decoder->get_image_subtitles (from, to);
+		list<shared_ptr<ContentImageSubtitle> > image_subtitles = subtitle_decoder->get_image_subtitles (ContentTimePeriod (from, to));
 		if (!image_subtitles.empty ()) {
 			list<PositionImage> im = process_content_image_subtitles (
 				subtitle_content,
@@ -348,7 +351,7 @@ Player::content_to_player_video_frame (
 		}
 		
 		if (_burn_subtitles) {
-			list<shared_ptr<ContentTextSubtitle> > text_subtitles = subtitle_decoder->get_text_subtitles (from, to);
+			list<shared_ptr<ContentTextSubtitle> > text_subtitles = subtitle_decoder->get_text_subtitles (ContentTimePeriod (from, to));
 			if (!text_subtitles.empty ()) {
 				list<PositionImage> im = process_content_text_subtitles (text_subtitles);
 				copy (im.begin(), im.end(), back_inserter (sub_images));
@@ -496,8 +499,6 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate)
 			min (AudioFrame (all->audio->frames()), length_frames) - offset.frames (_film->audio_frame_rate ())
 			);
 	}
-
-	return audio;
 }
 
 VideoFrame
@@ -538,8 +539,8 @@ Player::dcp_to_content_subtitle (shared_ptr<const Piece> piece, DCPTime t) const
 void
 PlayerStatistics::dump (shared_ptr<Log> log) const
 {
-	log->log (String::compose ("Video: %1 good %2 skipped %3 black %4 repeat", video.good, video.skip, video.black, video.repeat));
-	log->log (String::compose ("Audio: %1 good %2 skipped %3 silence", audio.good, audio.skip, audio.silence.seconds()));
+	log->log (String::compose ("Video: %1 good %2 skipped %3 black %4 repeat", video.good, video.skip, video.black, video.repeat), Log::TYPE_GENERAL);
+	log->log (String::compose ("Audio: %1 good %2 skipped %3 silence", audio.good, audio.skip, audio.silence.seconds()), Log::TYPE_GENERAL);
 }
 
 PlayerStatistics const &