Tidy and fix logging.

5 files changed, 6 insertions, 9 deletions

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 93b270faa..89690a5d0 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -41,6 +41,7 @@
 #include "lib/compose.hpp"
 #include "lib/string_text_file_content.h"
 #include "lib/string_text_file.h"
+#include "lib/dcpomatic_log.h"
 #include <wx/wx.h>
 #include <wx/notebook.h>
 #include <wx/listctrl.h>
@@ -59,8 +60,6 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 
-#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-
 ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
 	: _video_panel (0)
 	, _audio_panel (0)
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 2d489b3e8..66b919a75 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -193,7 +193,7 @@ FilmViewer::recreate_butler ()
 		map.set (dcp::RS,     1, 1 / sqrt(2)); // Rs -> Rt
 	}
 
-	_butler.reset (new Butler(_player, _film->log(), map, _audio_channels, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
+	_butler.reset (new Butler(_player, map, _audio_channels, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
 	if (!Config::instance()->sound() && !_audio.isStreamOpen()) {
 		_butler->disable_audio ();
 	}
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 45dc2b477..abb28c228 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -153,7 +153,7 @@ KDMDialog::make_clicked ()
 		return;
 	}
 
-	pair<shared_ptr<Job>, int> result = _output->make (screen_kdms, film->name(), _timing, bind (&KDMDialog::confirm_overwrite, this, _1), film->log());
+	pair<shared_ptr<Job>, int> result = _output->make (screen_kdms, film->name(), _timing, bind (&KDMDialog::confirm_overwrite, this, _1));
 	if (result.first) {
 		JobManager::instance()->add (result.first);
 	}
diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index 07bbce2d2..694957ee8 100644
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -179,7 +179,7 @@ KDMOutputPanel::kdm_write_type_changed ()
 
 pair<shared_ptr<Job>, int>
 KDMOutputPanel::make (
-	list<ScreenKDM> screen_kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite, shared_ptr<Log> log
+	list<ScreenKDM> screen_kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite
 	)
 {
 	list<CinemaKDMs> const cinema_kdms = CinemaKDMs::collect (screen_kdms);
@@ -278,8 +278,7 @@ KDMOutputPanel::make (
 					_container_name_format->get(),
 					_filename_format->get(),
 					name_values,
-					name,
-					log
+					name
 					)
 				);
 		}
diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h
index ba947b714..ed162e053 100644
--- a/src/wx/kdm_output_panel.h
+++ b/src/wx/kdm_output_panel.h
@@ -52,8 +52,7 @@ public:
 		std::list<ScreenKDM> screen_kdms,
 		std::string name,
 		KDMTimingPanel* timing,
-		boost::function<bool (boost::filesystem::path)> confirm_overwrite,
-		boost::shared_ptr<Log> log
+		boost::function<bool (boost::filesystem::path)> confirm_overwrite
 		);
 
 private: