Rename TYPE_DEBUG_PLAYER to TYPE_DEBUG_VIDEO_VIEW.

diff --git a/src/lib/dcpomatic_log.h b/src/lib/dcpomatic_log.h
index 382a586d430b5bee8687ffcac517b980c917af50..c969c508d1b27aa43276b40efb4e4351921f7dc3 100644 (file)
--- 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_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);
 #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 4aff47c73a035fe58b518a2e59612fa92cefc0c7..01d1415c701fbe4d218c1abb54a5e097b6bd5c66 100644 (file)
--- 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_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;
 int const LogEntry::TYPE_DISK         = 0x100;
 
 using std::string;

diff --git a/src/lib/log_entry.h b/src/lib/log_entry.h
index d4992de86d999b5ce94ae3ed8996c193302a85b8..136ab00f905182566d3a81afb1a1c20c451dcd95 100644 (file)
--- 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_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);
        static const int TYPE_DISK;
 
        explicit LogEntry (int type);

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 50981525f34b0035349134733784967ca82331c8..67a06aec4f452b1dabde3f2166c73a3d54ba7a46 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -1013,7 +1013,7 @@ private:
                        } else {
                                dcpomatic_log.reset (new NullLog());
                        }
                        } 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 768c320875bc52c9f059cf0c66fc308ee50b629b..d68ea48ddf679c38c818e8394e00004882ca4620 100644 (file)
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -166,7 +166,7 @@ SimpleVideoView::timer ()
                return;
        }
 
                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()) {
        _timer.Start (max(1, time_until_next_frame().get_value_or(0)), wxTIMER_ONE_SHOT);
 
        if (_viewer->butler()) {