Tidy and fix logging.

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

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 80b9744d8505a884c60d5cc8712ecce90b05cabb..ae16290f57d7343297bde3e3a5ed9c307991f3be 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -60,8 +60,6 @@
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) dcpomatic_log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-
 using std::list;
 using std::cout;
 using std::min;
@@ -156,7 +154,7 @@ Player::setup_pieces_unlocked ()
                }
 
                shared_ptr<Decoder> decoder = decoder_factory (_film, i, _fast);
-               FrameRateChange frc (i->active_video_frame_rate(_film), _film->video_frame_rate());
+               FrameRateChange frc (_film, i);
 
                if (!decoder) {
                        /* Not something that we can decode; e.g. Atmos content */
@@ -735,7 +733,7 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
                return;
        }
 
-       FrameRateChange frc(piece->content->active_video_frame_rate(_film), _film->video_frame_rate());
+       FrameRateChange frc (_film, piece->content);
        if (frc.skip && (video.frame % 2) == 1) {
                return;
        }