Rename player DCP directory to player content; ignore failures to load directories...

[dcpomatic.git] / src / wx / controls.cc

diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index 0c9a27518635f70dde4b120ca111d8eb1e71deec..074aa82c2d1ad764ddcda972abbb86f76c51e788 100644 (file)
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -26,6 +26,7 @@
 #include "lib/job_manager.h"
 #include "lib/player_video.h"
 #include "lib/dcp_content.h"
+#include "lib/spl_entry.h"
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
@@ -102,6 +103,10 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
        wxBoxSizer* buttons_sizer = new wxBoxSizer (wxVERTICAL);
        _add_button = new wxButton(this, wxID_ANY, _("Add"));
        buttons_sizer->Add (_add_button);
+       _save_button = new wxButton(this, wxID_ANY, _("Save..."));
+       buttons_sizer->Add (_save_button);
+       _load_button = new wxButton(this, wxID_ANY, _("Load..."));
+       buttons_sizer->Add (_load_button);
        e_sizer->Add (buttons_sizer, 0, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
 
        _v_sizer->Add (e_sizer, 1, wxEXPAND);
@@ -112,6 +117,8 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
        _cpl->Show (false);
        _spl_view->Show (false);
        _add_button->Show (false);
+       _save_button->Show (false);
+       _load_button->Show (false);
        _log->Show (false);
 
        wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL);
@@ -168,6 +175,8 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
                _jump_to_selected->SetValue (Config::instance()->jump_to_selected ());
        }
        _add_button->Bind       (wxEVT_BUTTON,              boost::bind(&Controls::add_clicked, this));
+       _save_button->Bind      (wxEVT_BUTTON,              boost::bind(&Controls::save_clicked, this));
+       _load_button->Bind      (wxEVT_BUTTON,              boost::bind(&Controls::load_clicked, this));
 
        _viewer->PositionChanged.connect (boost::bind(&Controls::position_changed, this));
        _viewer->Started.connect (boost::bind(&Controls::started, this));
@@ -185,6 +194,7 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
                );
 
        _config_changed_connection = Config::instance()->Changed.connect (bind(&Controls::config_changed, this, _1));
+       config_changed (Config::OTHER);
 }
 
 void
@@ -192,17 +202,53 @@ Controls::add_clicked ()
 {
        optional<CPL> sel = selected_cpl ();
        DCPOMATIC_ASSERT (sel);
-       _spl.push_back (SPLEntry(sel->first, sel->second));
+       _spl.playlist.push_back (SPLEntry(sel->first, sel->second));
        add_cpl_to_list (sel->first, _spl_view);
        SPLChanged (_spl);
        setup_sensitivity ();
 }
 
+void
+Controls::save_clicked ()
+{
+       wxFileDialog* d = new wxFileDialog (
+               this, _("Select playlist file"), wxEmptyString, wxEmptyString, wxT ("XML files (*.xml)|*.xml"),
+               wxFD_SAVE | wxFD_OVERWRITE_PROMPT
+               );
+
+       if (d->ShowModal() == wxID_OK) {
+               _spl.as_xml (boost::filesystem::path(wx_to_std(d->GetPath())));
+       }
+
+       d->Destroy ();
+}
+
+void
+Controls::load_clicked ()
+{
+       wxFileDialog* d = new wxFileDialog (
+               this, _("Select playlist file"), wxEmptyString, wxEmptyString, wxT ("XML files (*.xml)|*.xml")
+               );
+
+       if (d->ShowModal() == wxID_OK) {
+               _spl = SPL (boost::filesystem::path(wx_to_std(d->GetPath())));
+               _spl_view->DeleteAllItems ();
+               BOOST_FOREACH (SPLEntry i, _spl.playlist) {
+                       add_cpl_to_list (i.cpl, _spl_view);
+               }
+               SPLChanged (_spl);
+       }
+
+       d->Destroy ();
+}
+
 void
 Controls::config_changed (int property)
 {
-       if (property == Config::PLAYER_DCP_DIRECTORY) {
+       if (property == Config::PLAYER_CONTENT_DIRECTORY) {
                update_dcp_directory ();
+       } else {
+               setup_sensitivity ();
        }
 }
 
@@ -416,7 +462,7 @@ Controls::setup_sensitivity ()
 {
        /* examine content is the only job which stops the viewer working */
        bool const active_job = _active_job && *_active_job != "examine_content";
-       bool const c = ((_film && !_film->content().empty()) || !_spl.empty()) && !active_job;
+       bool const c = ((_film && !_film->content().empty()) || !_spl.playlist.empty()) && !active_job;
 
        _slider->Enable (c);
        _rewind_button->Enable (c);
@@ -443,7 +489,8 @@ Controls::setup_sensitivity ()
                _eye->Enable (c && _film->three_d ());
        }
 
-       _add_button->Enable (static_cast<bool>(selected_cpl()));
+       _add_button->Enable (Config::instance()->allow_spl_editing() && static_cast<bool>(selected_cpl()));
+       _save_button->Enable (Config::instance()->allow_spl_editing());
 }
 
 optional<Controls::CPL>
@@ -521,6 +568,8 @@ Controls::show_extended_player_controls (bool s)
        _spl_view->Show (s);
        _log->Show (s);
        _add_button->Show (s);
+       _save_button->Show (s);
+       _load_button->Show (s);
        _v_sizer->Layout ();
 }
 
@@ -566,7 +615,7 @@ Controls::update_dcp_directory ()
 
        _cpl->DeleteAllItems ();
        _cpls.clear ();
-       optional<path> dir = Config::instance()->player_dcp_directory();
+       optional<path> dir = Config::instance()->player_content_directory();
        if (!dir) {
                return;
        }
@@ -584,6 +633,8 @@ Controls::update_dcp_directory ()
                        }
                } catch (boost::filesystem::filesystem_error& e) {
                        /* Never mind */
+               } catch (dcp::DCPReadError& e) {
+                       /* Never mind */
                }
        }
 }