Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 1c0bc5a60d045f758a17cf1948decf3dc1aa71c5..ff54c40142b06c2fb702e6211990dc1a1d359f87 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -32,11 +32,13 @@
 #include "raw_convert.h"
 #include <libcxml/cxml.h>
 #include <dcp/colour_matrix.h>
+#include <libxml++/libxml++.h>
 #include <iomanip>
+#include <iostream>
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
 
 int const VideoContentProperty::VIDEO_SIZE       = 0;
 int const VideoContentProperty::VIDEO_FRAME_RATE  = 1;
@@ -394,16 +396,14 @@ VideoContent::video_size_after_3d_split () const
 }
 
 void
-VideoContent::unset_colour_conversion (bool signal)
+VideoContent::unset_colour_conversion ()
 {
        {
                boost::mutex::scoped_lock lm (_mutex);
                _colour_conversion = boost::optional<ColourConversion> ();
        }
 
-       if (signal) {
-               signal_changed (VideoContentProperty::COLOUR_CONVERSION);
-       }
+       signal_changed (VideoContentProperty::COLOUR_CONVERSION);
 }
 
 void