From: Carl Hetherington Date: Mon, 24 Sep 2018 09:27:20 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic X-Git-Tag: v2.13.55~7 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=e571e208d540a5bb6dafa49a8e91cb0428931abb;hp=9b2d6c3fee3555f87f0d2c15763293f5892055cb Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic --- diff --git a/cscript b/cscript index dc8a419d9..fdcdc11ea 100644 --- a/cscript +++ b/cscript @@ -338,7 +338,7 @@ def dependencies(target): return deps def option_defaults(): - return { "player-only": False, "gui": True, "variant": None } + return { "gui": True, "variant": None } def configure_options(target, options): opt = '' @@ -363,9 +363,6 @@ def configure_options(target, options): if not options['gui']: opt += ' --disable-gui' - if options['player-only']: - opt += ' --player-only' - if options['variant'] is not None: opt += ' --variant=%s' % options['variant'] diff --git a/src/lib/config.cc b/src/lib/config.cc index e5d241d2b..54716d849 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -167,6 +167,7 @@ Config::set_defaults () _image_display = 0; _respect_kdm_validity_periods = true; _player_log_file = boost::none; + _player_dcp_directory = boost::none; _allowed_dcp_frame_rates.clear (); _allowed_dcp_frame_rates.push_back (24); @@ -497,6 +498,7 @@ try _image_display = f.optional_number_child("ImageDisplay").get_value_or(0); _respect_kdm_validity_periods = f.optional_bool_child("RespectKDMValidityPeriods").get_value_or(true); _player_log_file = f.optional_string_child("PlayerLogFile"); + _player_dcp_directory = f.optional_string_child("PlayerDCPDirectory"); /* Replace any cinemas from config.xml with those from the configured file */ if (boost::filesystem::exists (_cinemas_file)) { @@ -888,6 +890,9 @@ Config::write_config () const if (_player_log_file) { root->add_child("PlayerLogFile")->add_child_text(_player_log_file->string()); } + if (_player_dcp_directory) { + root->add_child("PlayerDCPDirectory")->add_child_text(_player_dcp_directory->string()); + } try { doc.write_to_file_formatted(config_file().string()); diff --git a/src/lib/config.h b/src/lib/config.h index 02295725b..fc5d820f9 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -481,6 +481,10 @@ public: return _player_log_file; } + boost::optional player_dcp_directory () const { + return _player_dcp_directory; + } + /* SET (mostly) */ void set_master_encoding_threads (int n) { @@ -903,6 +907,18 @@ public: changed (); } + void set_player_dcp_directory (boost::filesystem::path p) { + maybe_set (_player_dcp_directory, p); + } + + void unset_player_dcp_directory () { + if (!_player_dcp_directory) { + return; + } + _player_dcp_directory = boost::none; + changed (); + } + void changed (Property p = OTHER); boost::signals2::signal Changed; /** Emitted if read() failed on an existing Config file. There is nothing @@ -1089,6 +1105,11 @@ private: int _image_display; bool _respect_kdm_validity_periods; boost::optional _player_log_file; + /** A directory containing DCPs whose contents are presented to the user + in the dual-screen player mode. DCPs on the list can be loaded + for playback. + */ + boost::optional _player_dcp_directory; static int const _current_version; diff --git a/src/tools/wscript b/src/tools/wscript index 4c6a74a47..ed70e5627 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -35,7 +35,7 @@ def build(bld): if bld.env.TARGET_WINDOWS: uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE WINSOCK2 OLE32 DSOUND WINMM KSUSER ' - if not bld.env.PLAYER_ONLY: + if bld.env.VARIANT != "swaroop": for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create']: obj = bld(features='cxx cxxprogram') obj.uselib = uselib @@ -48,7 +48,7 @@ def build(bld): gui_tools = [] if not bld.env.DISABLE_GUI: - if bld.env.PLAYER_ONLY: + if bld.env.VARIANT == 'swaroop': gui_tools = ['dcpomatic_player'] else: gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player'] diff --git a/src/wx/dir_picker_ctrl.h b/src/wx/dir_picker_ctrl.h index 659fe07ea..f23609659 100644 --- a/src/wx/dir_picker_ctrl.h +++ b/src/wx/dir_picker_ctrl.h @@ -18,6 +18,9 @@ */ +#ifndef DCPOMATIC_DIR_PICKER_CTRL +#define DCPOMATIC_DIR_PICKER_CTRL + #include class DirPickerCtrl : public wxPanel @@ -36,3 +39,5 @@ private: wxString _path; wxSizer* _sizer; }; + +#endif diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index 7edcabf40..91fd42624 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -30,6 +30,7 @@ #include #include #include +#include #include using namespace std; @@ -195,6 +196,20 @@ checked_set (FilePickerCtrl* widget, boost::filesystem::path value) } } +void +checked_set (wxDirPickerCtrl* widget, boost::filesystem::path value) +{ + if (widget->GetPath() != std_to_wx (value.string())) { + if (value.empty()) { + /* Hack to make wxWidgets clear the control when we are passed + an empty value. + */ + value = " "; + } + widget->SetPath (std_to_wx (value.string())); + } +} + void checked_set (wxSpinCtrl* widget, int value) { diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h index f59f5d683..1acca044a 100644 --- a/src/wx/wx_util.h +++ b/src/wx/wx_util.h @@ -36,6 +36,7 @@ #endif class FilePickerCtrl; +class wxDirPickerCtrl; class wxSpinCtrl; class wxSpinCtrlDouble; class wxGridBagSizer; @@ -89,6 +90,7 @@ extern boost::filesystem::path path_from_file_dialog (wxFileDialog* dialog, std: extern double calculate_mark_interval (double start); extern void checked_set (FilePickerCtrl* widget, boost::filesystem::path value); +extern void checked_set (wxDirPickerCtrl* widget, boost::filesystem::path value); extern void checked_set (wxSpinCtrl* widget, int value); extern void checked_set (wxSpinCtrlDouble* widget, double value); extern void checked_set (wxChoice* widget, int value); diff --git a/wscript b/wscript index 501bd4fb9..92a79bb9b 100644 --- a/wscript +++ b/wscript @@ -48,7 +48,6 @@ def options(opt): opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation') opt.add_option('--disable-gui', action='store_true', default=False, help='disable building of GUI tools') - opt.add_option('--player-only', action='store_true', default=False, help='just build the player; no other tools') opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests') opt.add_option('--install-prefix', default=None, help='prefix of where DCP-o-matic will be installed') opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to make a Windows package') @@ -75,7 +74,6 @@ def configure(conf): # Save conf.options that we need elsewhere in conf.env conf.env.DISABLE_GUI = conf.options.disable_gui - conf.env.PLAYER_ONLY = conf.options.player_only conf.env.DISABLE_TESTS = conf.options.disable_tests conf.env.TARGET_WINDOWS = conf.options.target_windows conf.env.TARGET_OSX = sys.platform == 'darwin' @@ -117,6 +115,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-O2') if conf.options.variant is not None: + conf.env.VARIANT = conf.options.variant conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_VARIANT_%s' % conf.options.variant.upper()) #