Give player its own configuration dialogue.

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

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 1d748be5ff2d820becaaf50189f0470199fcd1a1..843f392809d45e68f3aca113a7d3250f57f920e6 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -37,6 +37,8 @@
 #include "lib/case_insensitive_sorter.h"
 #include "lib/playlist.h"
 #include "lib/config.h"
+#include "lib/log.h"
+#include "lib/compose.hpp"
 #include <wx/wx.h>
 #include <wx/notebook.h>
 #include <wx/listctrl.h>
@@ -54,6 +56,8 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 
+#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
+
 ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> film, FilmViewer* viewer)
        : _timeline_dialog (0)
        , _parent (n)
@@ -270,7 +274,7 @@ ContentPanel::add_file_clicked ()
        /* This method is also called when Ctrl-A is pressed, so check that our notebook page
           is visible.
        */
-       if (_parent->GetCurrentPage() != _panel) {
+       if (_parent->GetCurrentPage() != _panel || !_film) {
                return;
        }
 
@@ -417,14 +421,14 @@ ContentPanel::setup_sensitivity ()
        ContentList video_selection = selected_video ();
        ContentList audio_selection = selected_audio ();
 
-       _remove->Enable   (!selection.empty() && _generally_sensitive);
-       _earlier->Enable  (selection.size() == 1 && _generally_sensitive);
-       _later->Enable    (selection.size() == 1 && _generally_sensitive);
-       _timeline->Enable (!_film->content().empty() && _generally_sensitive);
+       _remove->Enable   (_generally_sensitive && !selection.empty());
+       _earlier->Enable  (_generally_sensitive && selection.size() == 1);
+       _later->Enable    (_generally_sensitive && selection.size() == 1);
+       _timeline->Enable (_generally_sensitive && _film && !_film->content().empty());
 
-       _video_panel->Enable    (video_selection.size() > 0 && _generally_sensitive);
-       _audio_panel->Enable    (audio_selection.size() > 0 && _generally_sensitive);
-       _subtitle_panel->Enable (selection.size() == 1 && selection.front()->subtitle && _generally_sensitive);
+       _video_panel->Enable    (_generally_sensitive && video_selection.size() > 0);
+       _audio_panel->Enable    (_generally_sensitive && audio_selection.size() > 0);
+       _subtitle_panel->Enable (_generally_sensitive && selection.size() == 1 && selection.front()->subtitle);
        _timing_panel->Enable   (_generally_sensitive);
 }
 
@@ -445,20 +449,7 @@ void
 ContentPanel::set_general_sensitivity (bool s)
 {
        _generally_sensitive = s;
-
-       _content->Enable (s);
-       _add_file->Enable (s);
-       _add_folder->Enable (s);
-       _add_dcp->Enable (s);
-       _remove->Enable (s);
-       _earlier->Enable (s);
-       _later->Enable (s);
-       _timeline->Enable (s);
-
-       /* Set the panels in the content notebook */
-       BOOST_FOREACH (ContentSubPanel* i, _panels) {
-               i->Enable (s);
-       }
+       setup_sensitivity ();
 }
 
 void
@@ -545,6 +536,12 @@ ContentPanel::setup ()
        BOOST_FOREACH (shared_ptr<Content> i, content) {
                int const t = _content->GetItemCount ();
                bool const valid = i->paths_valid ();
+
+               /* Temporary debugging for Igor */
+               BOOST_FOREACH (boost::filesystem::path j, i->paths()) {
+                       LOG_GENERAL ("Check %1 %2 answer %3", j.string(), boost::filesystem::exists(j) ? "yes" : "no", valid ? "yes" : "no");
+               }
+
                shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (i);
                bool const needs_kdm = dcp && dcp->needs_kdm ();
                bool const needs_assets = dcp && dcp->needs_assets ();
@@ -582,6 +579,8 @@ ContentPanel::setup ()
                /* Select the item of content if none was selected before */
                _content->SetItemState (0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
        }
+
+       setup_sensitivity ();
 }
 
 void
@@ -612,9 +611,13 @@ ContentPanel::add_files (list<boost::filesystem::path> paths)
 
        /* XXX: check for lots of files here and do something */
 
-       BOOST_FOREACH (boost::filesystem::path i, paths) {
-               BOOST_FOREACH (shared_ptr<Content> j, content_factory (_film, i)) {
-                       _film->examine_and_add_content (j);
+       try {
+               BOOST_FOREACH (boost::filesystem::path i, paths) {
+                       BOOST_FOREACH (shared_ptr<Content> j, content_factory (_film, i)) {
+                               _film->examine_and_add_content (j);
+                       }
                }
+       } catch (exception& e) {
+               error_dialog (_parent, e.what());
        }
 }