/*
- Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
grid->AddSpacer (0);
{
- add_label_to_sizer (grid, this, _("Subtitle Offset"), true);
+ add_label_to_sizer (grid, this, _("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 Scale"), true);
+ add_label_to_sizer (grid, this, _("Y Offset"), true);
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _scale = new wxSpinCtrl (this);
- s->Add (_scale);
+ _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, _("X Scale"), true);
+ wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ _x_scale = new wxSpinCtrl (this);
+ s->Add (_x_scale);
add_label_to_sizer (s, this, _("%"), false);
grid->Add (s);
}
- add_label_to_sizer (grid, this, _("Subtitle Stream"), true);
+ {
+ add_label_to_sizer (grid, this, _("Y Scale"), true);
+ wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ _y_scale = new wxSpinCtrl (this);
+ s->Add (_y_scale);
+ add_label_to_sizer (s, this, _("%"), false);
+ grid->Add (s);
+ }
+
+ add_label_to_sizer (grid, this, _("Stream"), true);
_stream = new wxChoice (this, wxID_ANY);
grid->Add (_stream, 1, wxEXPAND);
- _offset->SetRange (-100, 100);
- _scale->SetRange (1, 1000);
- _scale->SetValue (100);
+ _x_offset->SetRange (-100, 100);
+ _y_offset->SetRange (-100, 100);
+ _x_scale->SetRange (10, 1000);
+ _y_scale->SetRange (10, 1000);
_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));
- _scale->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::scale_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));
+ _x_scale->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::x_scale_changed, this));
+ _y_scale->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::y_scale_changed, this));
_stream->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&SubtitlePanel::stream_changed, this));
}
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_SCALE) {
- checked_set (_scale, scs ? (scs->subtitle_scale() * 100) : 100);
+ } 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_X_SCALE) {
+ checked_set (_x_scale, scs ? int (rint (scs->subtitle_x_scale() * 100)) : 100);
+ } else if (property == SubtitleContentProperty::SUBTITLE_Y_SCALE) {
+ checked_set (_y_scale, scs ? int (rint (scs->subtitle_y_scale() * 100)) : 100);
}
}
}
_with_subtitles->Enable (h);
- _offset->Enable (j);
- _scale->Enable (j);
+ _x_offset->Enable (j);
+ _y_offset->Enable (j);
+ _x_scale->Enable (j);
+ _y_scale->Enable (j);
_stream->Enable (j);
}
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;
}
}
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::scale_changed ()
+SubtitlePanel::y_offset_changed ()
{
SubtitleContentList c = _editor->selected_subtitle_content ();
if (c.size() == 1) {
- c.front()->set_subtitle_scale (_scale->GetValue() / 100.0);
+ c.front()->set_subtitle_y_offset (_y_offset->GetValue() / 100.0);
}
}
void
-SubtitlePanel::content_selection_changed ()
+SubtitlePanel::x_scale_changed ()
{
+ SubtitleContentList c = _editor->selected_subtitle_content ();
+ if (c.size() == 1) {
+ c.front()->set_subtitle_x_scale (_x_scale->GetValue() / 100.0);
+ }
+}
+void
+SubtitlePanel::y_scale_changed ()
+{
+ SubtitleContentList c = _editor->selected_subtitle_content ();
+ if (c.size() == 1) {
+ c.front()->set_subtitle_y_scale (_y_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_X_SCALE);
+ film_content_changed (SubtitleContentProperty::SUBTITLE_Y_SCALE);
+}