#include <boost/lexical_cast.hpp>
#include <wx/spinctrl.h>
+#include "lib/ffmpeg_content.h"
#include "subtitle_panel.h"
#include "film_editor.h"
#include "wx_util.h"
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);
_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->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (SubtitlePanel::with_subtitles_toggled), 0, this);
- _offset->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (SubtitlePanel::offset_changed), 0, this);
- _scale->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (SubtitlePanel::scale_changed), 0, this);
- _stream->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (SubtitlePanel::stream_changed), 0, this);
+ _with_subtitles->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::with_subtitles_toggled, 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));
}
void
{
switch (property) {
case Film::CONTENT:
- setup_control_sensitivity ();
+ setup_sensitivity ();
break;
case Film::WITH_SUBTITLES:
checked_set (_with_subtitles, _editor->film()->with_subtitles ());
- setup_control_sensitivity ();
+ setup_sensitivity ();
break;
default:
break;
}
void
-SubtitlePanel::film_content_changed (shared_ptr<Content> c, int property)
+SubtitlePanel::film_content_changed (int property)
{
- shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (c);
- shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (c);
+ FFmpegContentList fc = _editor->selected_ffmpeg_content ();
+ SubtitleContentList sc = _editor->selected_subtitle_content ();
+
+ shared_ptr<FFmpegContent> fcs;
+ if (fc.size() == 1) {
+ fcs = fc.front ();
+ }
+
+ shared_ptr<SubtitleContent> scs;
+ if (sc.size() == 1) {
+ scs = sc.front ();
+ }
if (property == FFmpegContentProperty::SUBTITLE_STREAMS) {
_stream->Clear ();
- if (fc) {
- vector<shared_ptr<FFmpegSubtitleStream> > s = fc->subtitle_streams ();
+ 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 (fc->subtitle_stream()) {
- checked_set (_stream, lexical_cast<string> (fc->subtitle_stream()->id));
+ if (fcs->subtitle_stream()) {
+ checked_set (_stream, fcs->subtitle_stream()->identifier ());
} else {
_stream->SetSelection (wxNOT_FOUND);
}
}
- setup_control_sensitivity ();
- } else if (property == SubtitleContentProperty::SUBTITLE_OFFSET) {
- checked_set (_offset, sc ? (sc->subtitle_offset() * 100) : 0);
+ setup_sensitivity ();
+ } 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
-SubtitlePanel::with_subtitles_toggled (wxCommandEvent &)
+SubtitlePanel::with_subtitles_toggled ()
{
if (!_editor->film()) {
return;
}
void
-SubtitlePanel::setup_control_sensitivity ()
+SubtitlePanel::setup_sensitivity ()
{
bool h = false;
- if (_editor->generally_sensitive() && _editor->film()) {
- h = _editor->film()->has_subtitles ();
- }
-
- _with_subtitles->Enable (h);
-
bool j = false;
if (_editor->film()) {
+ h = _editor->film()->has_subtitles ();
j = _editor->film()->with_subtitles ();
}
- _offset->Enable (j);
+ _with_subtitles->Enable (h);
+ _x_offset->Enable (j);
+ _y_offset->Enable (j);
_scale->Enable (j);
_stream->Enable (j);
}
void
-SubtitlePanel::stream_changed (wxCommandEvent &)
+SubtitlePanel::stream_changed ()
{
- shared_ptr<Content> c = _editor->selected_content ();
- if (!c) {
- return;
- }
-
- shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (c);
- if (!fc) {
+ FFmpegContentList fc = _editor->selected_ffmpeg_content ();
+ if (fc.size() != 1) {
return;
}
+
+ shared_ptr<FFmpegContent> fcs = fc.front ();
- vector<shared_ptr<FFmpegSubtitleStream> > a = fc->subtitle_streams ();
+ 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;
}
if (i != a.end ()) {
- fc->set_subtitle_stream (*i);
+ fcs->set_subtitle_stream (*i);
}
}
void
-SubtitlePanel::offset_changed (wxCommandEvent &)
+SubtitlePanel::x_offset_changed ()
{
- shared_ptr<SubtitleContent> 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::scale_changed (wxCommandEvent &)
+SubtitlePanel::y_offset_changed ()
{
- shared_ptr<SubtitleContent> c = _editor->selected_subtitle_content ();
- if (!c) {
- return;
+ SubtitleContentList c = _editor->selected_subtitle_content ();
+ if (c.size() == 1) {
+ c.front()->set_subtitle_y_offset (_y_offset->GetValue() / 100.0);
}
+}
- c->set_subtitle_scale (_scale->GetValue() / 100.0);
+void
+SubtitlePanel::scale_changed ()
+{
+ SubtitleContentList c = _editor->selected_subtitle_content ();
+ if (c.size() == 1) {
+ c.front()->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);
+}
projects / dcpomatic.git / blobdiff