Merge master.

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

diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc
index 5cfd295042e6bfdc407511a6f2171ca2a041b306..fecc85106f6f889d5a1bd725ac10978022bae7ac 100644 (file)
--- a/src/wx/subtitle_panel.cc
+++ b/src/wx/subtitle_panel.cc
@@ -29,6 +29,7 @@
 #include "film_editor.h"
 #include "wx_util.h"
 #include "subtitle_view.h"
+#include "content_panel.h"
 
 using std::vector;
 using std::string;
@@ -36,8 +37,8 @@ using boost::shared_ptr;
 using boost::lexical_cast;
 using boost::dynamic_pointer_cast;
 
-SubtitlePanel::SubtitlePanel (FilmEditor* e)
-       : FilmEditorPanel (e, _("Subtitles"))
+SubtitlePanel::SubtitlePanel (ContentPanel* p)
+       : ContentSubPanel (p, _("Subtitles"))
        , _view (0)
 {
        wxFlexGridSizer* grid = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
@@ -105,8 +106,8 @@ SubtitlePanel::film_changed (Film::Property property)
 void
 SubtitlePanel::film_content_changed (int property)
 {
-       FFmpegContentList fc = _editor->selected_ffmpeg_content ();
-       SubtitleContentList sc = _editor->selected_subtitle_content ();
+       FFmpegContentList fc = _parent->selected_ffmpeg ();
+       SubtitleContentList sc = _parent->selected_subtitle ();
 
        shared_ptr<FFmpegContent> fcs;
        if (fc.size() == 1) {
@@ -133,8 +134,8 @@ SubtitlePanel::film_content_changed (int property)
                        }
                }
                setup_sensitivity ();
-       } else if (property == SubtitleContentProperty::SUBTITLE_USE) {
-               checked_set (_use, scs ? scs->subtitle_use() : false);
+       } else if (property == SubtitleContentProperty::USE_SUBTITLES) {
+               checked_set (_use, scs ? scs->use_subtitles() : false);
                setup_sensitivity ();
        } else if (property == SubtitleContentProperty::SUBTITLE_X_OFFSET) {
                checked_set (_x_offset, scs ? (scs->subtitle_x_offset() * 100) : 0);
@@ -148,9 +149,9 @@ SubtitlePanel::film_content_changed (int property)
 void
 SubtitlePanel::use_toggled ()
 {
-       SubtitleContentList c = _editor->selected_subtitle_content ();
+       SubtitleContentList c = _parent->selected_subtitle ();
        for (SubtitleContentList::iterator i = c.begin(); i != c.end(); ++i) {
-               (*i)->set_subtitle_use (_use->GetValue());
+               (*i)->set_use_subtitles (_use->GetValue());
        }
 }
 
@@ -160,13 +161,13 @@ SubtitlePanel::setup_sensitivity ()
        int any_subs = 0;
        int ffmpeg_subs = 0;
        int subrip_or_dcp_subs = 0;
-       SubtitleContentList c = _editor->selected_subtitle_content ();
+       SubtitleContentList c = _parent->selected_subtitle ();
        for (SubtitleContentList::const_iterator i = c.begin(); i != c.end(); ++i) {
                shared_ptr<const FFmpegContent> fc = boost::dynamic_pointer_cast<const FFmpegContent> (*i);
                shared_ptr<const SubRipContent> sc = boost::dynamic_pointer_cast<const SubRipContent> (*i);
                shared_ptr<const DCPSubtitleContent> dsc = boost::dynamic_pointer_cast<const DCPSubtitleContent> (*i);
                if (fc) {
-                       if (!fc->subtitle_streams().empty ()) {
+                       if (fc->has_subtitles ()) {
                                ++ffmpeg_subs;
                                ++any_subs;
                        }
@@ -191,7 +192,7 @@ SubtitlePanel::setup_sensitivity ()
 void
 SubtitlePanel::stream_changed ()
 {
-       FFmpegContentList fc = _editor->selected_ffmpeg_content ();
+       FFmpegContentList fc = _parent->selected_ffmpeg ();
        if (fc.size() != 1) {
                return;
        }
@@ -213,7 +214,7 @@ SubtitlePanel::stream_changed ()
 void
 SubtitlePanel::x_offset_changed ()
 {
-       SubtitleContentList c = _editor->selected_subtitle_content ();
+       SubtitleContentList c = _parent->selected_subtitle ();
        for (SubtitleContentList::iterator i = c.begin(); i != c.end(); ++i) {
                (*i)->set_subtitle_x_offset (_x_offset->GetValue() / 100.0);
        }
@@ -222,7 +223,7 @@ SubtitlePanel::x_offset_changed ()
 void
 SubtitlePanel::y_offset_changed ()
 {
-       SubtitleContentList c = _editor->selected_subtitle_content ();
+       SubtitleContentList c = _parent->selected_subtitle ();
        for (SubtitleContentList::iterator i = c.begin(); i != c.end(); ++i) {
                (*i)->set_subtitle_y_offset (_y_offset->GetValue() / 100.0);
        }
@@ -231,7 +232,7 @@ SubtitlePanel::y_offset_changed ()
 void
 SubtitlePanel::scale_changed ()
 {
-       SubtitleContentList c = _editor->selected_subtitle_content ();
+       SubtitleContentList c = _parent->selected_subtitle ();
        for (SubtitleContentList::iterator i = c.begin(); i != c.end(); ++i) {
                (*i)->set_subtitle_scale (_scale->GetValue() / 100.0);
        }
@@ -241,7 +242,7 @@ void
 SubtitlePanel::content_selection_changed ()
 {
        film_content_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
-       film_content_changed (SubtitleContentProperty::SUBTITLE_USE);
+       film_content_changed (SubtitleContentProperty::USE_SUBTITLES);
        film_content_changed (SubtitleContentProperty::SUBTITLE_X_OFFSET);
        film_content_changed (SubtitleContentProperty::SUBTITLE_Y_OFFSET);
        film_content_changed (SubtitleContentProperty::SUBTITLE_SCALE);
@@ -255,7 +256,7 @@ SubtitlePanel::view_clicked ()
                _view = 0;
        }
 
-       SubtitleContentList c = _editor->selected_subtitle_content ();
+       SubtitleContentList c = _parent->selected_subtitle ();
        assert (c.size() == 1);
 
        shared_ptr<SubtitleDecoder> decoder;
@@ -271,7 +272,7 @@ SubtitlePanel::view_clicked ()
        }
        
        if (decoder) {
-               _view = new SubtitleView (this, _editor->film(), decoder, c.front()->position ());
+               _view = new SubtitleView (this, _parent->film(), decoder, c.front()->position ());
                _view->Show ();
        }
 }