Merge master.

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

diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc
index c820220d4940bb9db8abd75bed68d3bd1f3343b5..63a18b0ce874ce5daea97ded5204ef92287ac4ba 100644 (file)
--- a/src/wx/subtitle_panel.cc
+++ b/src/wx/subtitle_panel.cc
@@ -41,14 +41,23 @@ SubtitlePanel::SubtitlePanel (FilmEditor* e)
        grid->AddSpacer (0);
        
        {
-               add_label_to_sizer (grid, this, _("Subtitle Offset"), true);
+               add_label_to_sizer (grid, this, _("Subtitle X Offset"), true);
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-               _offset = new wxSpinCtrl (this);
-               s->Add (_offset);
+               _x_offset = new wxSpinCtrl (this);
+               s->Add (_x_offset);
                add_label_to_sizer (s, this, _("%"), false);
                grid->Add (s);
        }
 
+       {
+               add_label_to_sizer (grid, this, _("Subtitle Y Offset"), true);
+               wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+               _y_offset = new wxSpinCtrl (this);
+               s->Add (_y_offset);
+               add_label_to_sizer (s, this, _("%"), false);
+               grid->Add (s);
+       }
+       
        {
                add_label_to_sizer (grid, this, _("Subtitle Scale"), true);
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
@@ -62,12 +71,14 @@ SubtitlePanel::SubtitlePanel (FilmEditor* e)
        _stream = new wxChoice (this, wxID_ANY);
        grid->Add (_stream, 1, wxEXPAND);
        
-       _offset->SetRange (-100, 100);
+       _x_offset->SetRange (-100, 100);
+       _y_offset->SetRange (-100, 100);
        _scale->SetRange (1, 1000);
        _scale->SetValue (100);
 
        _with_subtitles->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::with_subtitles_toggled, this));
-       _offset->Bind         (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::offset_changed, this));
+       _x_offset->Bind       (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::x_offset_changed, this));
+       _y_offset->Bind       (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::y_offset_changed, this));
        _scale->Bind          (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::scale_changed, this));
        _stream->Bind         (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&SubtitlePanel::stream_changed, this));
 }
@@ -109,18 +120,20 @@ SubtitlePanel::film_content_changed (int property)
                if (fcs) {
                        vector<shared_ptr<FFmpegSubtitleStream> > s = fcs->subtitle_streams ();
                        for (vector<shared_ptr<FFmpegSubtitleStream> >::iterator i = s.begin(); i != s.end(); ++i) {
-                               _stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx (lexical_cast<string> ((*i)->id))));
+                               _stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx ((*i)->identifier ())));
                        }
                        
                        if (fcs->subtitle_stream()) {
-                               checked_set (_stream, lexical_cast<string> (fcs->subtitle_stream()->id));
+                               checked_set (_stream, fcs->subtitle_stream()->identifier ());
                        } else {
                                _stream->SetSelection (wxNOT_FOUND);
                        }
                }
                setup_sensitivity ();
-       } else if (property == SubtitleContentProperty::SUBTITLE_OFFSET) {
-               checked_set (_offset, scs ? (scs->subtitle_offset() * 100) : 0);
+       } else if (property == SubtitleContentProperty::SUBTITLE_X_OFFSET) {
+               checked_set (_x_offset, scs ? (scs->subtitle_x_offset() * 100) : 0);
+       } else if (property == SubtitleContentProperty::SUBTITLE_Y_OFFSET) {
+               checked_set (_y_offset, scs ? (scs->subtitle_y_offset() * 100) : 0);
        } else if (property == SubtitleContentProperty::SUBTITLE_SCALE) {
                checked_set (_scale, scs ? (scs->subtitle_scale() * 100) : 100);
        }
@@ -147,7 +160,8 @@ SubtitlePanel::setup_sensitivity ()
        }
        
        _with_subtitles->Enable (h);
-       _offset->Enable (j);
+       _x_offset->Enable (j);
+       _y_offset->Enable (j);
        _scale->Enable (j);
        _stream->Enable (j);
 }
@@ -165,7 +179,7 @@ SubtitlePanel::stream_changed ()
        vector<shared_ptr<FFmpegSubtitleStream> > a = fcs->subtitle_streams ();
        vector<shared_ptr<FFmpegSubtitleStream> >::iterator i = a.begin ();
        string const s = string_client_data (_stream->GetClientObject (_stream->GetSelection ()));
-       while (i != a.end() && lexical_cast<string> ((*i)->id) != s) {
+       while (i != a.end() && (*i)->identifier () != s) {
                ++i;
        }
 
@@ -175,11 +189,20 @@ SubtitlePanel::stream_changed ()
 }
 
 void
-SubtitlePanel::offset_changed ()
+SubtitlePanel::x_offset_changed ()
 {
        SubtitleContentList c = _editor->selected_subtitle_content ();
        if (c.size() == 1) {
-               c.front()->set_subtitle_offset (_offset->GetValue() / 100.0);
+               c.front()->set_subtitle_x_offset (_x_offset->GetValue() / 100.0);
+       }
+}
+
+void
+SubtitlePanel::y_offset_changed ()
+{
+       SubtitleContentList c = _editor->selected_subtitle_content ();
+       if (c.size() == 1) {
+               c.front()->set_subtitle_y_offset (_y_offset->GetValue() / 100.0);
        }
 }
 
@@ -195,7 +218,8 @@ SubtitlePanel::scale_changed ()
 void
 SubtitlePanel::content_selection_changed ()
 {
-
+       film_content_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
+       film_content_changed (SubtitleContentProperty::SUBTITLE_X_OFFSET);
+       film_content_changed (SubtitleContentProperty::SUBTITLE_Y_OFFSET);
+       film_content_changed (SubtitleContentProperty::SUBTITLE_SCALE);
 }
-
-