Rename TYPE_DEBUG_PLAYER to TYPE_DEBUG_VIDEO_VIEW.
authorCarl Hetherington <cth@carlh.net>
Wed, 20 May 2020 08:02:06 +0000 (10:02 +0200)
committerCarl Hetherington <cth@carlh.net>
Wed, 20 May 2020 19:56:28 +0000 (21:56 +0200)
src/lib/dcpomatic_log.h
src/lib/log_entry.cc
src/lib/log_entry.h
src/tools/dcpomatic_player.cc
src/wx/simple_video_view.cc

index 382a586..c969c50 100644 (file)
@@ -33,7 +33,7 @@ extern boost::shared_ptr<Log> dcpomatic_log;
 #define LOG_WARNING_NC(...)   dcpomatic_log->log(__VA_ARGS__, LogEntry::TYPE_WARNING);
 #define LOG_TIMING(...)       dcpomatic_log->log(String::compose(__VA_ARGS__), LogEntry::TYPE_TIMING);
 #define LOG_DEBUG_ENCODE(...) dcpomatic_log->log(String::compose(__VA_ARGS__), LogEntry::TYPE_DEBUG_ENCODE);
-#define LOG_DEBUG_PLAYER(...) dcpomatic_log->log(String::compose(__VA_ARGS__), LogEntry::TYPE_DEBUG_PLAYER);
+#define LOG_DEBUG_VIDEO_VIEW(...) dcpomatic_log->log(String::compose(__VA_ARGS__), LogEntry::TYPE_DEBUG_VIDEO_VIEW);
 #define LOG_DEBUG_THREED(...) dcpomatic_log->log(String::compose(__VA_ARGS__), LogEntry::TYPE_DEBUG_THREED);
 #define LOG_DEBUG_THREED_NC(...) dcpomatic_log->log(__VA_ARGS__, LogEntry::TYPE_DEBUG_THREED);
 #define LOG_DISK(...)         dcpomatic_log->log(String::compose(__VA_ARGS__), LogEntry::TYPE_DISK);
index 4aff47c..01d1415 100644 (file)
@@ -31,7 +31,7 @@ int const LogEntry::TYPE_DEBUG_THREED = 0x008;
 int const LogEntry::TYPE_DEBUG_ENCODE = 0x010;
 int const LogEntry::TYPE_TIMING       = 0x020;
 int const LogEntry::TYPE_DEBUG_EMAIL  = 0x040;
-int const LogEntry::TYPE_DEBUG_PLAYER = 0x080;
+int const LogEntry::TYPE_DEBUG_VIDEO_VIEW = 0x080;
 int const LogEntry::TYPE_DISK         = 0x100;
 
 using std::string;
index d4992de..136ab00 100644 (file)
@@ -35,7 +35,7 @@ public:
        static const int TYPE_DEBUG_ENCODE;
        static const int TYPE_TIMING;
        static const int TYPE_DEBUG_EMAIL;
-       static const int TYPE_DEBUG_PLAYER;
+       static const int TYPE_DEBUG_VIDEO_VIEW; ///< real-time video viewing (i.e. "playback")
        static const int TYPE_DISK;
 
        explicit LogEntry (int type);
index 5098152..67a06ae 100644 (file)
@@ -1013,7 +1013,7 @@ private:
                        } else {
                                dcpomatic_log.reset (new NullLog());
                        }
-                       dcpomatic_log->set_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR | LogEntry::TYPE_DEBUG_PLAYER);
+                       dcpomatic_log->set_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR | LogEntry::TYPE_DEBUG_VIDEO_VIEW);
                }
        }
 
index 768c320..d68ea48 100644 (file)
@@ -166,7 +166,7 @@ SimpleVideoView::timer ()
                return;
        }
 
-       LOG_DEBUG_PLAYER("%1 -> %2; delay %3", next.seconds(), _viewer->time().seconds(), max((next.seconds() - _viewer->time().seconds()) * 1000, 1.0));
+       LOG_DEBUG_VIDEO_VIEW("%1 -> %2; delay %3", next.seconds(), _viewer->time().seconds(), max((next.seconds() - _viewer->time().seconds()) * 1000, 1.0));
        _timer.Start (max(1, time_until_next_frame().get_value_or(0)), wxTIMER_ONE_SHOT);
 
        if (_viewer->butler()) {