Tidy up logging a bit. Make it configurable from the GUI.

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

diff --git a/src/lib/player.cc b/src/lib/player.cc
index eb4a3d3a56711a7567e774894aae4b1c9fc47033..a90350922edcd88af9b06a87a0572232fe33dee7 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -30,12 +30,15 @@
 #include "playlist.h"
 #include "job.h"
 #include "image.h"
+#include "image_proxy.h"
 #include "ratio.h"
 #include "resampler.h"
 #include "log.h"
 #include "scaler.h"
 #include "player_video_frame.h"
 
+#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::GENERAL);
+
 using std::list;
 using std::cout;
 using std::min;
@@ -179,12 +182,13 @@ Player::pass ()
 
 /** @param extra Amount of extra time to add to the content frame's time (for repeat) */
 void
-Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image, Eyes eyes, bool same, VideoContent::Frame frame, Time extra)
+Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const ImageProxy> image, Eyes eyes, Part part, bool same, VideoContent::Frame frame, Time extra)
 {
        /* Keep a note of what came in so that we can repeat it if required */
        _last_incoming_video.weak_piece = weak_piece;
        _last_incoming_video.image = image;
        _last_incoming_video.eyes = eyes;
+       _last_incoming_video.part = part;
        _last_incoming_video.same = same;
        _last_incoming_video.frame = frame;
        _last_incoming_video.extra = extra;
@@ -216,7 +220,10 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
                        content->crop(),
                        image_size,
                        _video_container_size,
-                       _film->scaler()
+                       _film->scaler(),
+                       eyes,
+                       part,
+                       content->colour_conversion()
                        )
                );
        
@@ -252,7 +259,7 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
        _last_video = piece->content;
 #endif
 
-       Video (pi, eyes, content->colour_conversion(), same, time);
+       Video (pi, same, time);
 
        _last_emit_was_black = false;
        _video_position = piece->video_position = (time + TIME_HZ / _film->video_frame_rate());
@@ -419,7 +426,7 @@ Player::setup_pieces ()
                if (fc) {
                        shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (_film, fc, _video, _audio));
                        
-                       fd->Video.connect (bind (&Player::process_video, this, weak_ptr<Piece> (piece), _1, _2, _3, _4, 0));
+                       fd->Video.connect (bind (&Player::process_video, this, weak_ptr<Piece> (piece), _1, _2, _3, _4, _5, 0));
                        fd->Audio.connect (bind (&Player::process_audio, this, weak_ptr<Piece> (piece), _1, _2));
                        fd->Subtitle.connect (bind (&Player::process_subtitle, this, weak_ptr<Piece> (piece), _1, _2, _3, _4));
 
@@ -442,7 +449,7 @@ Player::setup_pieces ()
 
                        if (!reusing) {
                                shared_ptr<ImageDecoder> id (new ImageDecoder (_film, ic));
-                               id->Video.connect (bind (&Player::process_video, this, weak_ptr<Piece> (piece), _1, _2, _3, _4, 0));
+                               id->Video.connect (bind (&Player::process_video, this, weak_ptr<Piece> (piece), _1, _2, _3, _4, _5, 0));
                                piece->decoder = id;
                        }
                }
@@ -521,11 +528,14 @@ Player::set_video_container_size (libdcp::Size s)
        
        _black_frame.reset (
                new PlayerVideoFrame (
-                       im,
+                       shared_ptr<ImageProxy> (new RawImageProxy (im, _film->log ())),
                        Crop(),
                        _video_container_size,
                        _video_container_size,
-                       Scaler::from_id ("bicubic")
+                       Scaler::from_id ("bicubic"),
+                       EYES_BOTH,
+                       PART_WHOLE,
+                       ColourConversion ()
                        )
                );
 }
@@ -542,10 +552,8 @@ Player::resampler (shared_ptr<AudioContent> c, bool create)
                return shared_ptr<Resampler> ();
        }
 
-       _film->log()->log (
-               String::compose (
-                       "Creating new resampler for %1 to %2 with %3 channels", c->content_audio_frame_rate(), c->output_audio_frame_rate(), c->audio_channels()
-                       )
+       LOG_GENERAL (
+               "Creating new resampler for %1 to %2 with %3 channels", c->content_audio_frame_rate(), c->output_audio_frame_rate(), c->audio_channels()
                );
        
        shared_ptr<Resampler> r (new Resampler (c->content_audio_frame_rate(), c->output_audio_frame_rate(), c->audio_channels()));
@@ -560,7 +568,7 @@ Player::emit_black ()
        _last_video.reset ();
 #endif
 
-       Video (_black_frame, EYES_BOTH, ColourConversion(), _last_emit_was_black, _video_position);
+       Video (_black_frame, _last_emit_was_black, _video_position);
        _video_position += _film->video_frames_to_time (1);
        _last_emit_was_black = true;
 }
@@ -619,6 +627,7 @@ Player::repeat_last_video ()
                _last_incoming_video.weak_piece,
                _last_incoming_video.image,
                _last_incoming_video.eyes,
+               _last_incoming_video.part,
                _last_incoming_video.same,
                _last_incoming_video.frame,
                _last_incoming_video.extra