From: Carl Hetherington Date: Thu, 10 Sep 2020 23:07:46 +0000 (+0200) Subject: Add dcpomatic_combine tool (#1245). X-Git-Tag: v2.15.102~3 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=5a3e836da9480bca0c3ef3384fa2010f358ccc7e Add dcpomatic_combine tool (#1245). --- diff --git a/cscript b/cscript index 241a9580a..5aeba3da3 100644 --- a/cscript +++ b/cscript @@ -373,8 +373,8 @@ def dependencies(target, options): (target.platform == 'osx' and target.bits == 64) or (target.platform == 'windows')) else {} - deps.append(('libdcp', '184bdd2', cpp_lib_options)) - deps.append(('libsub', '72bf4fc', cpp_lib_options)) + deps.append(('libdcp', '40f6f7d', cpp_lib_options)) + deps.append(('libsub', 'c5b7a36', cpp_lib_options)) deps.append(('leqm-nrt', 'carl')) deps.append(('rtaudio', 'carl')) # We get our OpenSSL libraries from the environment, but we diff --git a/graphics/linux/128/dcpomatic2_combiner.png b/graphics/linux/128/dcpomatic2_combiner.png new file mode 100644 index 000000000..27ad5d0e7 Binary files /dev/null and b/graphics/linux/128/dcpomatic2_combiner.png differ diff --git a/graphics/linux/16/dcpomatic2_combiner.png b/graphics/linux/16/dcpomatic2_combiner.png new file mode 100644 index 000000000..ae6f698cc Binary files /dev/null and b/graphics/linux/16/dcpomatic2_combiner.png differ diff --git a/graphics/linux/22/dcpomatic2_combiner.png b/graphics/linux/22/dcpomatic2_combiner.png new file mode 100644 index 000000000..4fa3d3b0a Binary files /dev/null and b/graphics/linux/22/dcpomatic2_combiner.png differ diff --git a/graphics/linux/256/dcpomatic2_combiner.png b/graphics/linux/256/dcpomatic2_combiner.png new file mode 100644 index 000000000..7388b2ee8 Binary files /dev/null and b/graphics/linux/256/dcpomatic2_combiner.png differ diff --git a/graphics/linux/32/dcpomatic2_combiner.png b/graphics/linux/32/dcpomatic2_combiner.png new file mode 100644 index 000000000..e24e0e0e5 Binary files /dev/null and b/graphics/linux/32/dcpomatic2_combiner.png differ diff --git a/graphics/linux/48/dcpomatic2_combiner.png b/graphics/linux/48/dcpomatic2_combiner.png new file mode 100644 index 000000000..10fcca296 Binary files /dev/null and b/graphics/linux/48/dcpomatic2_combiner.png differ diff --git a/graphics/linux/512/dcpomatic2_combiner.png b/graphics/linux/512/dcpomatic2_combiner.png new file mode 100644 index 000000000..345166990 Binary files /dev/null and b/graphics/linux/512/dcpomatic2_combiner.png differ diff --git a/graphics/linux/64/dcpomatic2_combiner.png b/graphics/linux/64/dcpomatic2_combiner.png new file mode 100644 index 000000000..4c52f59c3 Binary files /dev/null and b/graphics/linux/64/dcpomatic2_combiner.png differ diff --git a/graphics/osx/dcpomatic2_combiner.icns b/graphics/osx/dcpomatic2_combiner.icns new file mode 100644 index 000000000..8f4f5c2a7 Binary files /dev/null and b/graphics/osx/dcpomatic2_combiner.icns differ diff --git a/graphics/osx/dcpomatic2_combiner.iconset/icon_128x128.png b/graphics/osx/dcpomatic2_combiner.iconset/icon_128x128.png new file mode 100644 index 000000000..27ad5d0e7 Binary files /dev/null and b/graphics/osx/dcpomatic2_combiner.iconset/icon_128x128.png differ diff --git a/graphics/osx/dcpomatic2_combiner.iconset/icon_128x128@2x.png b/graphics/osx/dcpomatic2_combiner.iconset/icon_128x128@2x.png new file mode 100644 index 000000000..27ad5d0e7 Binary files /dev/null and b/graphics/osx/dcpomatic2_combiner.iconset/icon_128x128@2x.png differ diff --git a/graphics/osx/dcpomatic2_combiner.iconset/icon_16x16.png b/graphics/osx/dcpomatic2_combiner.iconset/icon_16x16.png new file mode 100644 index 000000000..ae6f698cc Binary files /dev/null and b/graphics/osx/dcpomatic2_combiner.iconset/icon_16x16.png differ diff --git a/graphics/osx/dcpomatic2_combiner.iconset/icon_16x16@2x.png b/graphics/osx/dcpomatic2_combiner.iconset/icon_16x16@2x.png new file mode 100644 index 000000000..ae6f698cc Binary files /dev/null and b/graphics/osx/dcpomatic2_combiner.iconset/icon_16x16@2x.png differ diff --git a/graphics/osx/dcpomatic2_combiner.iconset/icon_256x256.png b/graphics/osx/dcpomatic2_combiner.iconset/icon_256x256.png new file mode 100644 index 000000000..7388b2ee8 Binary files /dev/null and b/graphics/osx/dcpomatic2_combiner.iconset/icon_256x256.png differ diff --git a/graphics/osx/dcpomatic2_combiner.iconset/icon_256x256@2x.png b/graphics/osx/dcpomatic2_combiner.iconset/icon_256x256@2x.png new file mode 100644 index 000000000..7388b2ee8 Binary files /dev/null and b/graphics/osx/dcpomatic2_combiner.iconset/icon_256x256@2x.png differ diff --git a/graphics/osx/dcpomatic2_combiner.iconset/icon_32x32.png b/graphics/osx/dcpomatic2_combiner.iconset/icon_32x32.png new file mode 100644 index 000000000..e24e0e0e5 Binary files /dev/null and b/graphics/osx/dcpomatic2_combiner.iconset/icon_32x32.png differ diff --git a/graphics/osx/dcpomatic2_combiner.iconset/icon_32x32@2x.png b/graphics/osx/dcpomatic2_combiner.iconset/icon_32x32@2x.png new file mode 100644 index 000000000..e24e0e0e5 Binary files /dev/null and b/graphics/osx/dcpomatic2_combiner.iconset/icon_32x32@2x.png differ diff --git a/graphics/osx/dcpomatic2_combiner.iconset/icon_512x512.png b/graphics/osx/dcpomatic2_combiner.iconset/icon_512x512.png new file mode 100644 index 000000000..345166990 Binary files /dev/null and b/graphics/osx/dcpomatic2_combiner.iconset/icon_512x512.png differ diff --git a/graphics/osx/dcpomatic2_combiner.iconset/icon_512x512@2x.png b/graphics/osx/dcpomatic2_combiner.iconset/icon_512x512@2x.png new file mode 100644 index 000000000..345166990 Binary files /dev/null and b/graphics/osx/dcpomatic2_combiner.iconset/icon_512x512@2x.png differ diff --git a/graphics/src/dcpomatic2_combiner.svg b/graphics/src/dcpomatic2_combiner.svg new file mode 100644 index 000000000..8a150c521 --- /dev/null +++ b/graphics/src/dcpomatic2_combiner.svg @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/graphics/update b/graphics/update index cee8a3ca1..5896867bc 100755 --- a/graphics/update +++ b/graphics/update @@ -23,7 +23,7 @@ function required_font() fi } -svg_apps="dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player dcpomatic2_playlist dcpomatic2_disk" +svg_apps="dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player dcpomatic2_playlist dcpomatic2_disk dcpomatic2_combiner" required_font "Libre Baskerville" diff --git a/graphics/windows/dcpomatic2_combiner.ico b/graphics/windows/dcpomatic2_combiner.ico new file mode 100644 index 000000000..0db1eb108 Binary files /dev/null and b/graphics/windows/dcpomatic2_combiner.ico differ diff --git a/platform/linux/dcpomatic_combiner.desktop.in b/platform/linux/dcpomatic_combiner.desktop.in new file mode 100644 index 000000000..2b875ee99 --- /dev/null +++ b/platform/linux/dcpomatic_combiner.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Exec=@INSTALL_PREFIX@/bin/dcpomatic2_combiner +Name=DCP-o-matic 2 Combiner +Icon=dcpomatic2_combiner +Comment=DCP combiner +Categories=AudioVideo;Video diff --git a/platform/linux/wscript b/platform/linux/wscript index 0fc593f56..dad5778a6 100644 --- a/platform/linux/wscript +++ b/platform/linux/wscript @@ -51,4 +51,11 @@ def build(bld): obj.VERSION = bld.env.VERSION desktops.append(obj.target) + obj = bld(features='subst') + obj.source = 'dcpomatic_combiner.desktop.in' + obj.target = 'dcpomatic2_combiner.desktop' + obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX + obj.VERSION = bld.env.VERSION + desktops.append(obj.target) + bld.install_files('${PREFIX}/share/applications', desktops) diff --git a/platform/osx/dcpomatic2_combiner.Info.plist.in b/platform/osx/dcpomatic2_combiner.Info.plist.in new file mode 100644 index 000000000..a9ab61968 --- /dev/null +++ b/platform/osx/dcpomatic2_combiner.Info.plist.in @@ -0,0 +1,36 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + dcpomatic2_combiner + CFBundleGetInfoString + DCP-o-matic 2 Combiner + CFBundleIconFile + dcpomatic2_combiner.icns + CFBundleIdentifier + com.dcpomatic.combiner + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + DCP-o-matic 2 Combiner + CFBundlePackageType + APPL + CFBundleShortVersions + @VERSION@ + CFBundleSignature + DOMC + CFBundleVersion + @VERSION@ + CFBundleAllowMixedLocalizations + + LSUIElement + 0 + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index f55a0e8b1..643e6af33 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -191,6 +191,7 @@ function copy_resources { cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_batch.icns "$dest" cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_playlist.icns "$dest" cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_disk.icns "$dest" + cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_combiner.icns "$dest" cp $prefix/src/dcpomatic/graphics/osx/preferences/defaults.png "$dest" cp $prefix/src/dcpomatic/graphics/osx/preferences/defaults@2x.png "$dest" cp $prefix/src/dcpomatic/graphics/osx/preferences/kdm_email.png "$dest" @@ -522,6 +523,15 @@ rl=("$approot/MacOS/dcpomatic2_playlist" "$approot/Frameworks/"*.dylib) relink_relative "${rl[@]}" make_dmg "$appdir" "" "DCP-o-matic Playlist Editor" com.dcpomatic.playlist +# DCP-o-matic Combiner +setup "DCP-o-matic 2 Combiner.app" +copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_combiner "$approot/MacOS" +copy $ROOT src/openssl/apps/openssl "$approot/MacOS" +cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_combiner.Info.plist "$approot/Info.plist" +rl=("$approot/MacOS/dcpomatic2_combiner" "$approot/Frameworks/"*.dylib) +relink_relative "${rl[@]}" +make_dmg "$appdir" "" "DCP-o-matic Combiner" com.dcpomatic.combiner + # DCP-o-matic Disk Writer .app setup "DCP-o-matic 2 Disk Writer.app" copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_disk "$approot/MacOS" diff --git a/platform/osx/wscript b/platform/osx/wscript index da20065f5..c0b3d9d10 100644 --- a/platform/osx/wscript +++ b/platform/osx/wscript @@ -6,3 +6,4 @@ def build(bld): obj = bld(features='subst', source='dcpomatic2_player.Info.plist.in', target='dcpomatic2_player.Info.plist', version=bld.env.VERSION) obj = bld(features='subst', source='dcpomatic2_playlist.Info.plist.in', target='dcpomatic2_playlist.Info.plist', version=bld.env.VERSION) obj = bld(features='subst', source='dcpomatic2_disk.Info.plist.in', target='dcpomatic2_disk.Info.plist', version=bld.env.VERSION) + obj = bld(features='subst', source='dcpomatic2_combiner.Info.plist.in', target='dcpomatic2_combiner.Info.plist', version=bld.env.VERSION) diff --git a/platform/windows/dcpomatic2_combiner_debug.bat b/platform/windows/dcpomatic2_combiner_debug.bat new file mode 100644 index 000000000..a4aae9f0c --- /dev/null +++ b/platform/windows/dcpomatic2_combiner_debug.bat @@ -0,0 +1 @@ +gdb.exe -x gdb_script dcpomatic2_combiner.exe > %HOMEPATH%/Documents/dcpomatic_debug_log.txt diff --git a/platform/windows/dcpomatic_combiner.rc b/platform/windows/dcpomatic_combiner.rc new file mode 100644 index 000000000..1b72bf58a --- /dev/null +++ b/platform/windows/dcpomatic_combiner.rc @@ -0,0 +1,2 @@ +id ICON "../../graphics/windows/dcpomatic2_combiner.ico" +#include "wx-3.0/wx/msw/wx.rc" diff --git a/platform/windows/wscript b/platform/windows/wscript index 64f0a57cf..e46038087 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -10,7 +10,8 @@ def write_installer(bits, dcpomatic_version, debug, variant, disk): ('player', 'Player'), ('cli', 'CLI'), ('create', 'Creator'), - ('playlist', 'Playlist Editor') + ('playlist', 'Playlist Editor'), + ('combiner', 'Combiner'), ] if disk: diff --git a/run/dcpomatic_combiner b/run/dcpomatic_combiner new file mode 100755 index 000000000..3cf60d831 --- /dev/null +++ b/run/dcpomatic_combiner @@ -0,0 +1,25 @@ +#!/bin/bash + +export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:/home/c.hetherington/lib:$LD_LIBRARY_PATH +export DYLD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:/Users/c.hetherington/osx-environment/64/lib +if [ "$1" == "--debug" ]; then + shift + gdb --args build/src/tools/dcpomatic2_combiner $* +elif [ "$1" == "--valgrind" ]; then + shift + valgrind --tool="memcheck" --suppressions=suppressions --track-fds=yes build/src/tools/dcpomatic2_combiner $* +elif [ "$1" == "--callgrind" ]; then + shift + valgrind --tool="callgrind" build/src/tools/dcpomatic2_combiner $* +elif [ "$1" == "--massif" ]; then + shift + valgrind --tool="massif" build/src/tools/dcpomatic2_combiner $* +elif [ "$1" == "--i18n" ]; then + shift + LANGUAGE=fr_FR.UTF8 LANG=fr_FR.UTF8 LC_ALL=fr_FR.UTF8 build/src/tools/dcpomatic2_combiner "$*" +elif [ "$1" == "--perf" ]; then + shift + perf record build/src/tools/dcpomatic2_combiner $* +else + build/src/tools/dcpomatic2_combiner $* +fi diff --git a/src/lib/combine_dcp_job.cc b/src/lib/combine_dcp_job.cc new file mode 100644 index 000000000..b3c29b205 --- /dev/null +++ b/src/lib/combine_dcp_job.cc @@ -0,0 +1,74 @@ +/* + Copyright (C) 2020 Carl Hetherington + + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + DCP-o-matic is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with DCP-o-matic. If not, see . + +*/ + + +#include "combine_dcp_job.h" +#include +#include + +#include "i18n.h" + + +using std::string; +using std::vector; +using boost::shared_ptr; + + +CombineDCPJob::CombineDCPJob (vector inputs, boost::filesystem::path output) + : Job (shared_ptr()) + , _inputs (inputs) + , _output (output) +{ + +} + + +string +CombineDCPJob::name () const +{ + return _("Combine DCPs"); +} + + +string +CombineDCPJob::json_name () const +{ + return N_("combine_dcps"); +} + + +void +CombineDCPJob::run () +{ + try { + dcp::combine (_inputs, _output); + } catch (dcp::CombineError& e) { + set_state (FINISHED_ERROR); + set_error (e.what(), ""); + return; + } catch (dcp::ReadError& e) { + set_state (FINISHED_ERROR); + set_error (e.what(), e.detail().get_value_or("")); + return; + } + + set_progress (1); + set_state (FINISHED_OK); +} diff --git a/src/lib/combine_dcp_job.h b/src/lib/combine_dcp_job.h new file mode 100644 index 000000000..97bf20110 --- /dev/null +++ b/src/lib/combine_dcp_job.h @@ -0,0 +1,39 @@ +/* + Copyright (C) 2020 Carl Hetherington + + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + DCP-o-matic is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with DCP-o-matic. If not, see . + +*/ + + +#include "job.h" +#include + + +class CombineDCPJob : public Job +{ +public: + CombineDCPJob (std::vector inputs, boost::filesystem::path output); + + std::string name () const; + std::string json_name () const; + void run (); + +private: + std::vector _inputs; + boost::filesystem::path _output; +}; + diff --git a/src/lib/wscript b/src/lib/wscript index 0c9cddfa4..04044a8c3 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -55,6 +55,7 @@ sources = """ config.cc content.cc content_factory.cc + combine_dcp_job.cc copy_dcp_details_to_film.cc create_cli.cc cross_common.cc diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc new file mode 100644 index 000000000..5f1a7722a --- /dev/null +++ b/src/tools/dcpomatic_combiner.cc @@ -0,0 +1,313 @@ +/* + Copyright (C) 2020 Carl Hetherington + + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + DCP-o-matic is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with DCP-o-matic. If not, see . + +*/ + + +#include "wx/dir_picker_ctrl.h" +#include "wx/editable_list.h" +#include "wx/wx_signal_manager.h" +#include "lib/combine_dcp_job.h" +#include "lib/config.h" +#include "lib/cross.h" +#include "lib/job_manager.h" +#include "lib/util.h" +#include +DCPOMATIC_DISABLE_WARNINGS +#include +DCPOMATIC_ENABLE_WARNINGS +#include +#include +#include +#include + + +using std::exception; +using std::string; +using std::vector; +using boost::dynamic_pointer_cast; +using boost::optional; +using boost::shared_ptr; + + +static string +display_string (boost::filesystem::path p, int) +{ + return p.filename().string(); +} + + +class DirDialogWrapper : public wxDirDialog +{ +public: + DirDialogWrapper (wxWindow* parent) + : wxDirDialog (parent, _("Choose a DCP folder"), wxT(""), wxDD_DIR_MUST_EXIST) + { + + } + + boost::filesystem::path get () const + { + return boost::filesystem::path(wx_to_std(GetPath())); + } + + void set (boost::filesystem::path) + { + /* Not used */ + } +}; + + +class DOMFrame : public wxFrame +{ +public: + explicit DOMFrame (wxString const & title) + : wxFrame (0, -1, title) + { + /* Use a panel as the only child of the Frame so that we avoid + the dark-grey background on Windows. + */ + wxPanel* overall_panel = new wxPanel (this); + wxSizer* s = new wxBoxSizer (wxHORIZONTAL); + s->Add (overall_panel, 1, wxEXPAND); + SetSizer (s); + + vector columns; + columns.push_back(EditableListColumn(_("Input DCP"), 600, true)); + + _input = new EditableList( + overall_panel, + columns, + boost::bind(&DOMFrame::inputs, this), + boost::bind(&DOMFrame::set_inputs, this, _1), + &display_string, + false, + true + ); + + wxBoxSizer* output = new wxBoxSizer (wxHORIZONTAL); + add_label_to_sizer (output, overall_panel, _("Output DCP folder"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _output = new DirPickerCtrl (overall_panel); + output->Add (_output, 1, wxEXPAND); + + _combine = new Button (overall_panel, _("Combine")); + + wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL); + sizer->Add (_input, 1, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER); + sizer->Add (output, 0, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER); + sizer->Add (_combine, 0, wxALL | wxALIGN_RIGHT, DCPOMATIC_DIALOG_BORDER); + overall_panel->SetSizer (sizer); + Fit (); + SetSize (768, GetSize().GetHeight() + 32); + + _combine->Bind (wxEVT_BUTTON, boost::bind(&DOMFrame::combine, this)); + _output->Bind (wxEVT_DIRPICKER_CHANGED, boost::bind(&DOMFrame::setup_sensitivity, this)); + + setup_sensitivity (); + } + +private: + void set_inputs (vector inputs) + { + _inputs = inputs; + } + + vector inputs () const + { + return _inputs; + } + + void combine () + { + boost::filesystem::path const output = wx_to_std(_output->GetPath()); + + if (boost::filesystem::is_directory(output) && !boost::filesystem::is_empty(output)) { + if (!confirm_dialog ( + this, + std_to_wx ( + String::compose(wx_to_std(_("The directory %1 already exists and is not empty. " + "Are you sure you want to use it?")), + output.string()) + ) + )) { + return; + } + } else if (boost::filesystem::is_regular_file(output)) { + error_dialog ( + this, + String::compose (wx_to_std(_("%1 already exists as a file, so you cannot use it for a DCP.")), output.string()) + ); + return; + } + + JobManager* jm = JobManager::instance (); + jm->add (shared_ptr(new CombineDCPJob(_inputs, output))); + bool const ok = display_progress (_("DCP-o-matic Combine"), _("Combining DCPs")); + if (!ok) { + return; + } + + DCPOMATIC_ASSERT (!jm->get().empty()); + shared_ptr last = dynamic_pointer_cast (jm->get().back()); + DCPOMATIC_ASSERT (last); + + if (last->finished_ok()) { + message_dialog (this, _("DCPs combined successfully.")); + } else { + wxString m = std_to_wx(last->error_summary()); + if (!last->error_details().empty()) { + m += wxString::Format(" (%s)", std_to_wx(last->error_details())); + } + error_dialog (this, m); + } + } + + void setup_sensitivity () + { + _combine->Enable (!_output->GetPath().IsEmpty()); + } + + EditableList* _input; + DirPickerCtrl* _output; + vector _inputs; + Button* _combine; +}; + + +class App : public wxApp +{ +public: + App () + : _frame (0) + {} + + bool OnInit () + { + try { + Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); + Config::Warning.connect (boost::bind (&App::config_warning, this, _1)); + + SetAppName (_("DCP-o-matic Combiner")); + + if (!wxApp::OnInit()) { + return false; + } + +#ifdef DCPOMATIC_LINUX + unsetenv ("UBUNTU_MENUPROXY"); +#endif + +#ifdef DCPOMATIC_OSX + make_foreground_application (); +#endif + + dcpomatic_setup_path_encoding (); + + /* Enable i18n; this will create a Config object + to look for a force-configured language. This Config + object will be wrong, however, because dcpomatic_setup + hasn't yet been called and there aren't any filters etc. + set up yet. + */ + dcpomatic_setup_i18n (); + + /* Set things up, including filters etc. + which will now be internationalised correctly. + */ + dcpomatic_setup (); + + /* Force the configuration to be re-loaded correctly next + time it is needed. + */ + Config::drop (); + + _frame = new DOMFrame (_("DCP-o-matic DCP Combiner")); + SetTopWindow (_frame); + + _frame->Show (); + + signal_manager = new wxSignalManager (this); + Bind (wxEVT_IDLE, boost::bind(&App::idle, this, _1)); + } + catch (exception& e) + { + error_dialog (0, wxString::Format ("DCP-o-matic DCP Combiner could not start."), std_to_wx(e.what())); + return false; + } + + return true; + } + + void config_failed_to_load () + { + message_dialog (_frame, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create.")); + } + + void config_warning (string m) + { + message_dialog (_frame, std_to_wx(m)); + } + + void idle (wxIdleEvent& ev) + { + signal_manager->ui_idle (); + ev.Skip (); + } + + void report_exception () + { + try { + throw; + } catch (FileError& e) { + error_dialog ( + 0, + wxString::Format ( + _("An exception occurred: %s (%s)\n\n") + REPORT_PROBLEM, + std_to_wx (e.what()), + std_to_wx (e.file().string().c_str ()) + ) + ); + } catch (exception& e) { + error_dialog ( + 0, + wxString::Format ( + _("An exception occurred: %s.\n\n") + REPORT_PROBLEM, + std_to_wx (e.what ()) + ) + ); + } catch (...) { + error_dialog (0, _("An unknown exception occurred.") + " " + REPORT_PROBLEM); + } + } + + bool OnExceptionInMainLoop () + { + report_exception (); + /* This will terminate the program */ + return false; + } + + void OnUnhandledException () + { + report_exception (); + } + + DOMFrame* _frame; +}; + +IMPLEMENT_APP (App) diff --git a/src/tools/wscript b/src/tools/wscript index 7eeeecddf..9caa84e9b 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2015 Carl Hetherington +# Copyright (C) 2012-2020 Carl Hetherington # # This file is part of DCP-o-matic. # @@ -73,7 +73,7 @@ def build(bld): elif bld.env.VARIANT == 'swaroop-studio': gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player', 'swaroop_dcpomatic_playlist'] else: - gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player', 'dcpomatic_playlist'] + gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player', 'dcpomatic_playlist', 'dcpomatic_combiner'] if bld.env.ENABLE_DISK: gui_tools.append('dcpomatic_disk')