Fix could-not-load-film error when loading a project with a missing subtitle file.

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

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index dcd2d438906b847fb3a2996501fa8333856da0a6..4adeb90a4e610b096b22112be778f68da1c52fe3 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -39,6 +39,8 @@
 #include "lib/config.h"
 #include "lib/log.h"
 #include "lib/compose.hpp"
+#include "lib/text_subtitle_content.h"
+#include "lib/text_subtitle.h"
 #include <wx/wx.h>
 #include <wx/notebook.h>
 #include <wx/listctrl.h>
@@ -254,18 +256,31 @@ ContentPanel::selection_changed ()
 
        optional<DCPTime> go_to;
        BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
-               if (!go_to || i->position() < go_to.get()) {
-                       go_to = i->position ();
+               DCPTime p;
+               p = i->position();
+               if (dynamic_pointer_cast<TextSubtitleContent>(i) && i->paths_valid()) {
+                       /* Rather special case; if we select a text subtitle file jump to its
+                          first subtitle.
+                       */
+                       TextSubtitle ts (dynamic_pointer_cast<TextSubtitleContent>(i));
+                       if (ts.first()) {
+                               p += DCPTime(ts.first().get(), _film->active_frame_rate_change(i->position()));
+                       }
+               }
+               if (!go_to || p < go_to.get()) {
+                       go_to = p;
                }
        }
 
        if (go_to && Config::instance()->jump_to_selected ()) {
-               _film_viewer->set_position (go_to.get ());
+               _film_viewer->set_position (go_to.get().ceil(_film->video_frame_rate()));
        }
 
        if (_timeline_dialog) {
                _timeline_dialog->set_selection (selected ());
        }
+
+       SelectionChanged ();
 }
 
 void
@@ -394,6 +409,10 @@ ContentPanel::remove_clicked (bool hotkey)
 void
 ContentPanel::timeline_clicked ()
 {
+       if (!_film) {
+               return;
+       }
+
        if (_timeline_dialog) {
                _timeline_dialog->Destroy ();
                _timeline_dialog = 0;
@@ -421,14 +440,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);
 }
 
@@ -449,20 +468,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
@@ -592,6 +598,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