X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_panel.cc;h=63a18b0ce874ce5daea97ded5204ef92287ac4ba;hb=54d5424caa2ccc2746d67b847898bb18dbcd692c;hp=8f2b08af51dd263dce782f3164c81a41566d8113;hpb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;p=dcpomatic.git diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc index 8f2b08af5..63a18b0ce 100644 --- 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)); } @@ -89,32 +100,43 @@ SubtitlePanel::film_changed (Film::Property property) } void -SubtitlePanel::film_content_changed (shared_ptr c, int property) +SubtitlePanel::film_content_changed (int property) { - shared_ptr sc = dynamic_pointer_cast (c); - shared_ptr fc = dynamic_pointer_cast (c); + FFmpegContentList fc = _editor->selected_ffmpeg_content (); + SubtitleContentList sc = _editor->selected_subtitle_content (); + + shared_ptr fcs; + if (fc.size() == 1) { + fcs = fc.front (); + } + + shared_ptr scs; + if (sc.size() == 1) { + scs = sc.front (); + } if (property == FFmpegContentProperty::SUBTITLE_STREAMS) { _stream->Clear (); - if (fc) { - vector > s = fc->subtitle_streams (); + if (fcs) { + vector > s = fcs->subtitle_streams (); for (vector >::iterator i = s.begin(); i != s.end(); ++i) { - _stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx (lexical_cast ((*i)->id)))); + _stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx ((*i)->identifier ()))); } - if (fc->subtitle_stream()) { - checked_set (_stream, lexical_cast (fc->subtitle_stream()->id)); + if (fcs->subtitle_stream()) { + checked_set (_stream, fcs->subtitle_stream()->identifier ()); } else { _stream->SetSelection (wxNOT_FOUND); } } setup_sensitivity (); - } else if (property == SubtitleContentProperty::SUBTITLE_OFFSET) { - checked_set (_offset, sc ? (sc->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, sc ? (sc->subtitle_scale() * 100) : 100); + checked_set (_scale, scs ? (scs->subtitle_scale() * 100) : 100); } - } void @@ -138,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); } @@ -146,47 +169,57 @@ SubtitlePanel::setup_sensitivity () void SubtitlePanel::stream_changed () { - shared_ptr c = _editor->selected_content (); - if (!c) { - return; - } - - shared_ptr fc = dynamic_pointer_cast (c); - if (!fc) { + FFmpegContentList fc = _editor->selected_ffmpeg_content (); + if (fc.size() != 1) { return; } + + shared_ptr fcs = fc.front (); - vector > a = fc->subtitle_streams (); + vector > a = fcs->subtitle_streams (); vector >::iterator i = a.begin (); string const s = string_client_data (_stream->GetClientObject (_stream->GetSelection ())); - while (i != a.end() && lexical_cast ((*i)->id) != s) { + while (i != a.end() && (*i)->identifier () != s) { ++i; } if (i != a.end ()) { - fc->set_subtitle_stream (*i); + fcs->set_subtitle_stream (*i); } } void -SubtitlePanel::offset_changed () +SubtitlePanel::x_offset_changed () { - shared_ptr c = _editor->selected_subtitle_content (); - if (!c) { - return; + SubtitleContentList c = _editor->selected_subtitle_content (); + if (c.size() == 1) { + c.front()->set_subtitle_x_offset (_x_offset->GetValue() / 100.0); } +} - c->set_subtitle_offset (_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); + } } void SubtitlePanel::scale_changed () { - shared_ptr c = _editor->selected_subtitle_content (); - if (!c) { - return; + SubtitleContentList c = _editor->selected_subtitle_content (); + if (c.size() == 1) { + c.front()->set_subtitle_scale (_scale->GetValue() / 100.0); } - - c->set_subtitle_scale (_scale->GetValue() / 100.0); } +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); +}