diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-10-23 12:35:07 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-10-23 12:35:09 +0200 |
| commit | 0ae0428494f6f3d23ac8224561b73607f524b32c (patch) | |
| tree | a8f48f3bec5b595cd7eaac5f168734d1b6f5293a /src/tools/dcpomatic.cc | |
| parent | ce596021e11ea3b579f759436d66c43ac107d3d1 (diff) | |
Remove log handling from Film.
It should be the main UI's responsibility to set up dcpomatic_log, maybe
writing it to the film's directory if it wants to.
Diffstat (limited to 'src/tools/dcpomatic.cc')
| -rw-r--r-- | src/tools/dcpomatic.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index e0c69f5a4..f5994913a 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -77,6 +77,7 @@ #include "lib/encode_server_finder.h" #include "lib/exceptions.h" #include "lib/ffmpeg_film_encoder.h" +#include "lib/file_log.h" #include "lib/film.h" #include "lib/font_config.h" #ifdef DCPOMATIC_GROK @@ -87,6 +88,7 @@ #include "lib/kdm_with_metadata.h" #include "lib/log.h" #include "lib/make_dcp.h" +#include "lib/null_log.h" #include "lib/release_notes.h" #include "lib/screen.h" #include "lib/send_kdm_email_job.h" @@ -520,14 +522,17 @@ public: _controls->set_film (_film); _video_waveform_dialog.reset(); set_menu_sensitivity (); - if (_film && _film->directory()) { - Config::instance()->add_to_history (_film->directory().get()); - } if (_film) { + if (_film->directory()) { + Config::instance()->add_to_history(_film->directory().get()); + dcpomatic_log = make_shared<FileLog>(_film->file("log")); + } else { + dcpomatic_log = make_shared<NullLog>(); + } + _film->Change.connect (boost::bind (&DOMFrame::film_change, this, _1)); _film->Message.connect (boost::bind(&DOMFrame::film_message, this, _1)); _film->DirtyChange.connect (boost::bind(&DOMFrame::set_title, this)); - dcpomatic_log = _film->log (); } set_title (); } |