Make --config player option, er, optional.

[dcpomatic.git] / src / tools / dcpomatic_player.cc

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 40e386e077df5cf808a67ee384d5f765e2137610..26110b373761e5a02f867d98a658dae69b7c788f 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -130,9 +130,7 @@ public:
                , _view_full_screen (0)
                , _view_dual_screen (0)
        {
-               /* XXX */
                dcpomatic_log.reset (new NullLog());
-               cout << "here's the log " << dcpomatic_log.get() << "\n";
 
 #if defined(DCPOMATIC_WINDOWS)
                maybe_open_console ();
@@ -188,9 +186,6 @@ public:
                _viewer->Started.connect (bind(&DOMFrame::playback_started, this, _1));
                _viewer->Seeked.connect (bind(&DOMFrame::playback_seeked, this, _1));
                _viewer->Stopped.connect (bind(&DOMFrame::playback_stopped, this, _1));
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-               _viewer->PositionChanged.connect (bind(&DOMFrame::position_changed, this));
-#endif
                _info = new PlayerInformation (_overall_panel, _viewer);
                setup_main_sizer (Config::instance()->player_mode());
 #ifdef __WXOSX__
@@ -226,40 +221,10 @@ public:
                setup_screen ();
 
 #ifdef DCPOMATIC_VARIANT_SWAROOP
-               if (
-                       boost::filesystem::is_regular_file(Config::path("position")) &&
-                       boost::filesystem::is_regular_file(Config::path("spl.xml"))) {
-
-                       shared_ptr<Film> film (new Film(boost::optional<boost::filesystem::path>()));
-                       film->read_metadata (Config::path("spl.xml"));
-                       reset_film (film);
-                       FILE* f = fopen_boost (Config::path("position"), "r");
-                       if (f) {
-                               char buffer[64];
-                               fscanf (f, "%63s", buffer);
-                               _viewer->seek (DCPTime(atoi(buffer)), true);
-                               _viewer->start ();
-                               fclose (f);
-                       }
-               }
-
+               sc->check_restart ();
 #endif
        }
 
-       void position_changed ()
-       {
-               if (!_viewer->playing() || _viewer->position().get() % DCPTime::HZ) {
-                       return;
-               }
-
-               FILE* f = fopen_boost (Config::path("position"), "w");
-               if (f) {
-                       string const p = dcp::raw_convert<string> (_viewer->position().get());
-                       fwrite (p.c_str(), p.length(), 1, f);
-                       fclose (f);
-               }
-       }
-
 #ifdef DCPOMATIC_VARIANT_SWAROOP
        void monitor_checker_state_changed ()
        {
@@ -413,7 +378,7 @@ public:
                reset_film ();
                try {
                        shared_ptr<DCPContent> dcp (new DCPContent(dir));
-                       _film->examine_and_add_content (dcp);
+                       _film->examine_and_add_content (dcp, true);
                        bool const ok = display_progress (_("DCP-o-matic Player"), _("Loading content"));
                        if (!ok || !report_errors_from_last_job(this)) {
                                return;
@@ -490,8 +455,6 @@ public:
                        return;
                }
 
-               _film->write_metadata (Config::path("spl.xml"));
-
                if (_viewer->playing ()) {
                        _viewer->stop ();
                }
@@ -1037,6 +1000,7 @@ private:
 
 static const wxCmdLineEntryDesc command_line_description[] = {
        { wxCMD_LINE_PARAM, 0, 0, "DCP to load or create", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
+       { wxCMD_LINE_OPTION, "c", "config", "Directory containing config.xml", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
        { wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 }
 };
 
@@ -1172,6 +1136,11 @@ private:
                        _dcp_to_load = wx_to_std (parser.GetParam (0));
                }
 
+               wxString config;
+               if (parser.Found("c", &config)) {
+                       Config::override_path = wx_to_std (config);
+               }
+
                return true;
        }