Rename debug type THREED to THREED_D.

5 files changed, 11 insertions, 11 deletions

diff --git a/src/lib/dcpomatic_log.h b/src/lib/dcpomatic_log.h
index c557bb17d..605f95122 100644
--- a/src/lib/dcpomatic_log.h
+++ b/src/lib/dcpomatic_log.h
@@ -33,8 +33,8 @@ extern std::shared_ptr<Log> dcpomatic_log;
 #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_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_DEBUG_THREE_D(...) dcpomatic_log->log(String::compose(__VA_ARGS__), LogEntry::TYPE_DEBUG_THREE_D);
+#define LOG_DEBUG_THREE_D_NC(...) dcpomatic_log->log(__VA_ARGS__, LogEntry::TYPE_DEBUG_THREE_D);
 #define LOG_DISK(...)         dcpomatic_log->log(String::compose(__VA_ARGS__), LogEntry::TYPE_DISK);
 #define LOG_DISK_NC(...)      dcpomatic_log->log(__VA_ARGS__, LogEntry::TYPE_DISK);
 #define LOG_DEBUG_PLAYER(...)    dcpomatic_log->log(String::compose(__VA_ARGS__), LogEntry::TYPE_DEBUG_PLAYER);
diff --git a/src/lib/log_entry.cc b/src/lib/log_entry.cc
index 2af2c0f25..fc0305340 100644
--- a/src/lib/log_entry.cc
+++ b/src/lib/log_entry.cc
@@ -27,7 +27,7 @@
 int const LogEntry::TYPE_GENERAL      = 0x001;
 int const LogEntry::TYPE_WARNING      = 0x002;
 int const LogEntry::TYPE_ERROR        = 0x004;
-int const LogEntry::TYPE_DEBUG_THREED = 0x008;
+int const LogEntry::TYPE_DEBUG_THREE_D = 0x008;
 int const LogEntry::TYPE_DEBUG_ENCODE = 0x010;
 int const LogEntry::TYPE_TIMING       = 0x020;
 int const LogEntry::TYPE_DEBUG_EMAIL  = 0x040;
diff --git a/src/lib/log_entry.h b/src/lib/log_entry.h
index 50b8bc1a6..a2eb5fbac 100644
--- a/src/lib/log_entry.h
+++ b/src/lib/log_entry.h
@@ -31,7 +31,7 @@ public:
 	static const int TYPE_GENERAL;
 	static const int TYPE_WARNING;
 	static const int TYPE_ERROR;
-	static const int TYPE_DEBUG_THREED;
+	static const int TYPE_DEBUG_THREE_D;
 	static const int TYPE_DEBUG_ENCODE;
 	static const int TYPE_TIMING;
 	static const int TYPE_DEBUG_EMAIL;
diff --git a/src/lib/shuffler.cc b/src/lib/shuffler.cc
index 0e478a562..2b3c5ba84 100644
--- a/src/lib/shuffler.cc
+++ b/src/lib/shuffler.cc
@@ -46,7 +46,7 @@ struct Comparator
 void
 Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video)
 {
-	LOG_DEBUG_THREED ("Shuffler::video frame=%1 eyes=%2 part=%3", video.frame, static_cast<int>(video.eyes), static_cast<int>(video.part));
+	LOG_DEBUG_THREE_D ("Shuffler::video frame=%1 eyes=%2 part=%3", video.frame, static_cast<int>(video.eyes), static_cast<int>(video.part));
 
 	if (video.eyes != EYES_LEFT && video.eyes != EYES_RIGHT) {
 		/* Pass through anything that we don't care about */
@@ -58,7 +58,7 @@ Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video)
 	DCPOMATIC_ASSERT (piece);
 
 	if (!_last && video.eyes == EYES_LEFT) {
-		LOG_DEBUG_THREED_NC ("Shuffler first after clear");
+		LOG_DEBUG_THREE_D_NC ("Shuffler first after clear");
 		/* We haven't seen anything since the last clear() and we have some eyes-left so assume everything is OK */
 		Video (weak_piece, video);
 		_last = video;
@@ -81,7 +81,7 @@ Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video)
 		if (!store_front_in_sequence) {
 			string const store = _store.empty() ? "store empty" : String::compose("store front frame=%1 eyes=%2", _store.front().second.frame, static_cast<int>(_store.front().second.eyes));
 			string const last = _last ? String::compose("last frame=%1 eyes=%2", _last->frame, static_cast<int>(_last->eyes)) : "no last";
-			LOG_DEBUG_THREED("Shuffler not in sequence: %1 %2", store, last);
+			LOG_DEBUG_THREE_D("Shuffler not in sequence: %1 %2", store, last);
 		}
 
 		if (!store_front_in_sequence && _store.size() <= _max_size) {
@@ -96,7 +96,7 @@ Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video)
 			LOG_WARNING ("Shuffler is full after receiving frame %1; 3D sync may be incorrect.", video.frame);
 		}
 
-		LOG_DEBUG_THREED("Shuffler emits frame=%1 eyes=%2 store=%3", _store.front().second.frame, static_cast<int>(_store.front().second.eyes), _store.size());
+		LOG_DEBUG_THREE_D("Shuffler emits frame=%1 eyes=%2 store=%3", _store.front().second.frame, static_cast<int>(_store.front().second.eyes), _store.size());
 		Video (_store.front().first, _store.front().second);
 		_last = _store.front().second;
 		_store.pop_front ();
@@ -106,7 +106,7 @@ Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video)
 void
 Shuffler::clear ()
 {
-	LOG_DEBUG_THREED_NC ("Shuffler::clear");
+	LOG_DEBUG_THREE_D_NC ("Shuffler::clear");
 	_store.clear ();
 	_last = optional<ContentVideo>();
 }
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index ea84136e1..e17e0a57b 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -1452,7 +1452,7 @@ private:
 		checked_set (_log_warning, config->log_types() & LogEntry::TYPE_WARNING);
 		checked_set (_log_error, config->log_types() & LogEntry::TYPE_ERROR);
 		checked_set (_log_timing, config->log_types() & LogEntry::TYPE_TIMING);
-		checked_set (_log_debug_threed, config->log_types() & LogEntry::TYPE_DEBUG_THREED);
+		checked_set (_log_debug_threed, config->log_types() & LogEntry::TYPE_DEBUG_THREE_D);
 		checked_set (_log_debug_encode, config->log_types() & LogEntry::TYPE_DEBUG_ENCODE);
 		checked_set (_log_debug_email, config->log_types() & LogEntry::TYPE_DEBUG_EMAIL);
 		checked_set (_log_debug_video_view, config->log_types() & LogEntry::TYPE_DEBUG_VIDEO_VIEW);
@@ -1529,7 +1529,7 @@ private:
 			types |= LogEntry::TYPE_TIMING;
 		}
 		if (_log_debug_threed->GetValue ()) {
-			types |= LogEntry::TYPE_DEBUG_THREED;
+			types |= LogEntry::TYPE_DEBUG_THREE_D;
 		}
 		if (_log_debug_encode->GetValue ()) {
 			types |= LogEntry::TYPE_DEBUG_ENCODE;