diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-05-20 10:02:06 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-05-20 21:56:28 +0200 |
| commit | 6ef1fc5f40567650ca9ef2b7644e4fdd97640ae6 (patch) | |
| tree | 4aba208d86fd744170b1092f62a6c3085d462fdd | |
| parent | 93f6b7f36dba0eed49936dcd014a9cf5941a66ac (diff) | |
Rename TYPE_DEBUG_PLAYER to TYPE_DEBUG_VIDEO_VIEW.
| -rw-r--r-- | src/lib/dcpomatic_log.h | 2 | ||||
| -rw-r--r-- | src/lib/log_entry.cc | 2 | ||||
| -rw-r--r-- | src/lib/log_entry.h | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic_player.cc | 2 | ||||
| -rw-r--r-- | src/wx/simple_video_view.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/dcpomatic_log.h b/src/lib/dcpomatic_log.h index 382a586d4..c969c508d 100644 --- a/src/lib/dcpomatic_log.h +++ b/src/lib/dcpomatic_log.h @@ -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); diff --git a/src/lib/log_entry.cc b/src/lib/log_entry.cc index 4aff47c73..01d1415c7 100644 --- a/src/lib/log_entry.cc +++ b/src/lib/log_entry.cc @@ -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; diff --git a/src/lib/log_entry.h b/src/lib/log_entry.h index d4992de86..136ab00f9 100644 --- a/src/lib/log_entry.h +++ b/src/lib/log_entry.h @@ -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); diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 50981525f..67a06aec4 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -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); } } diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc index 768c32087..d68ea48dd 100644 --- a/src/wx/simple_video_view.cc +++ b/src/wx/simple_video_view.cc @@ -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()) { |