/*
- Copyright (C) 2015-2017 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
using boost::shared_ptr;
using boost::bind;
using boost::dynamic_pointer_cast;
+using boost::optional;
int const SubtitleAppearanceDialog::NONE = 0;
int const SubtitleAppearanceDialog::OUTLINE = 1;
: wxDialog (parent, wxID_ANY, _("Subtitle appearance"))
, _content (content)
{
+ shared_ptr<FFmpegContent> ff = dynamic_pointer_cast<FFmpegContent> (content);
+ if (ff) {
+ _stream = ff->subtitle_stream ();
+ }
+
wxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
SetSizer (overall_sizer);
int r = 0;
add_label_to_sizer (_table, this, _("Colour"), true, wxGBPosition (r, 0));
- _colour = new wxColourPickerCtrl (this, wxID_ANY);
- _table->Add (_colour, wxGBPosition (r, 1));
+ {
+ wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ _force_colour = new wxCheckBox (this, wxID_ANY, _("Set to"));
+ s->Add (_force_colour, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 8);
+ _colour = new wxColourPickerCtrl (this, wxID_ANY);
+ s->Add (_colour, 0, wxALIGN_CENTER_VERTICAL);
+ _table->Add (s, wxGBPosition (r, 1));
+ }
++r;
add_label_to_sizer (_table, this, _("Effect"), true, wxGBPosition (r, 0));
++r;
add_label_to_sizer (_table, this, _("Effect colour"), true, wxGBPosition (r, 0));
- _effect_colour = new wxColourPickerCtrl (this, wxID_ANY);
- _table->Add (_effect_colour, wxGBPosition (r, 1));
+ {
+ wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ _force_effect_colour = new wxCheckBox (this, wxID_ANY, _("Set to"));
+ s->Add (_force_effect_colour, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 8);
+ _effect_colour = new wxColourPickerCtrl (this, wxID_ANY);
+ s->Add (_effect_colour, 0, wxALIGN_CENTER_VERTICAL);
+ _table->Add (s, wxGBPosition (r, 1));
+ }
++r;
add_label_to_sizer (_table, this, _("Outline width"), true, wxGBPosition (r, 0));
_table->Add (_fade_out, wxGBPosition (r, 1));
++r;
- wxScrolled<wxPanel>* colours_panel = new wxScrolled<wxPanel> (this);
- colours_panel->EnableScrolling (false, true);
- colours_panel->ShowScrollbars (wxSHOW_SB_NEVER, wxSHOW_SB_ALWAYS);
- colours_panel->SetScrollRate (0, 16);
-
- wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
- table->AddGrowableCol (1, 1);
-
- map<RGBA, RGBA> colours = _stream->colours ();
-
- wxStaticText* t = new wxStaticText (colours_panel, wxID_ANY, "");
- t->SetLabelMarkup (_("<b>Original colour</b>"));
- table->Add (t, 1, wxEXPAND);
- t = new wxStaticText (colours_panel, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE_HORIZONTAL);
- t->SetLabelMarkup (_("<b>New colour</b>"));
- table->Add (t, 1, wxALIGN_CENTER);
-
- for (map<RGBA, RGBA>::const_iterator i = colours.begin(); i != colours.end(); ++i) {
- wxPanel* from = new wxPanel (colours_panel, wxID_ANY);
- from->SetBackgroundColour (wxColour (i->first.r, i->first.g, i->first.b, i->first.a));
- table->Add (from, 1, wxEXPAND);
- RGBAColourPicker* to = new RGBAColourPicker (colours_panel, i->second);
- table->Add (to, 1, wxEXPAND);
- _pickers[i->first] = to;
- }
+ if (_stream) {
+ wxScrolled<wxPanel>* colours_panel = new wxScrolled<wxPanel> (this);
+ colours_panel->EnableScrolling (false, true);
+ colours_panel->ShowScrollbars (wxSHOW_SB_NEVER, wxSHOW_SB_ALWAYS);
+ colours_panel->SetScrollRate (0, 16);
+
+ wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+ table->AddGrowableCol (1, 1);
- colours_panel->SetSizer (table);
+ map<RGBA, RGBA> colours = _stream->colours ();
- overall_sizer->Add (colours_panel, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
+ wxStaticText* t = new wxStaticText (colours_panel, wxID_ANY, "");
+ t->SetLabelMarkup (_("<b>Original colour</b>"));
+ table->Add (t, 1, wxEXPAND);
+ t = new wxStaticText (colours_panel, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE_HORIZONTAL);
+ t->SetLabelMarkup (_("<b>New colour</b>"));
+ table->Add (t, 1, wxALIGN_CENTER);
- wxButton* restore = new wxButton (this, wxID_ANY, _("Restore to original colours"));
- restore->Bind (wxEVT_BUTTON, bind (&SubtitleAppearanceDialog::restore, this));
- overall_sizer->Add (restore, 0, wxALL, DCPOMATIC_SIZER_X_GAP);
+ for (map<RGBA, RGBA>::const_iterator i = colours.begin(); i != colours.end(); ++i) {
+ wxPanel* from = new wxPanel (colours_panel, wxID_ANY);
+ from->SetBackgroundColour (wxColour (i->first.r, i->first.g, i->first.b, i->first.a));
+ table->Add (from, 1, wxEXPAND);
+ RGBAColourPicker* to = new RGBAColourPicker (colours_panel, i->second);
+ table->Add (to, 1, wxEXPAND);
+ _pickers[i->first] = to;
+ }
+
+ colours_panel->SetSizer (table);
+
+ overall_sizer->Add (colours_panel, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
+
+ wxButton* restore = new wxButton (this, wxID_ANY, _("Restore to original colours"));
+ restore->Bind (wxEVT_BUTTON, bind (&SubtitleAppearanceDialog::restore, this));
+ overall_sizer->Add (restore, 0, wxALL, DCPOMATIC_SIZER_X_GAP);
+ }
wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
if (buttons) {
_effect->Append (_("Outline"));
_effect->Append (_("Shadow"));;
- _colour->SetColour (wxColour (_content->subtitle->colour().r, _content->subtitle->colour().g, _content->subtitle->colour().b));
- if (_content->subtitle->outline()) {
+ optional<dcp::Colour> colour = _content->subtitle->colour();
+ if (colour) {
+ _force_colour->SetValue (true);
+ _colour->SetColour (wxColour (colour->r, colour->g, colour->b));
+ } else {
+ _force_colour->SetValue (false);
+ _colour->SetColour (wxColour (255, 255, 255));
+ }
+
+ switch (_content->subtitle->effect()) {
+ case dcp::NONE:
+ _effect->SetSelection (NONE);
+ break;
+ case dcp::BORDER:
_effect->SetSelection (OUTLINE);
- } else if (_content->subtitle->shadow()) {
+ break;
+ case dcp::SHADOW:
_effect->SetSelection (SHADOW);
+ break;
+ }
+
+ optional<dcp::Colour> effect_colour = _content->subtitle->effect_colour();
+ if (effect_colour) {
+ _force_effect_colour->SetValue (true);
+ _effect_colour->SetColour (wxColour (effect_colour->r, effect_colour->g, effect_colour->b));
} else {
- _effect->SetSelection (NONE);
+ _force_effect_colour->SetValue (false);
+ _effect_colour->SetColour (wxColour (0, 0, 0));
}
- _effect_colour->SetColour (
- wxColour (_content->subtitle->effect_colour().r, _content->subtitle->effect_colour().g, _content->subtitle->effect_colour().b)
- );
+
_fade_in->set (_content->subtitle->fade_in(), _content->active_video_frame_rate ());
_fade_out->set (_content->subtitle->fade_out(), _content->active_video_frame_rate ());
_outline_width->SetValue (_content->subtitle->outline_width ());
+ _force_colour->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
+ _force_effect_colour->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
_effect->Bind (wxEVT_CHOICE, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
_content_connection = _content->Changed.connect (bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
void
SubtitleAppearanceDialog::apply ()
{
- wxColour const c = _colour->GetColour ();
- _content->subtitle->set_colour (dcp::Colour (c.Red(), c.Green(), c.Blue()));
- _content->subtitle->set_outline (_effect->GetSelection() == OUTLINE);
- _content->subtitle->set_shadow (_effect->GetSelection() == SHADOW);
- wxColour const ec = _effect_colour->GetColour ();
- _content->subtitle->set_effect_colour (dcp::Colour (ec.Red(), ec.Green(), ec.Blue()));
+ if (_force_colour->GetValue ()) {
+ wxColour const c = _colour->GetColour ();
+ _content->subtitle->set_colour (dcp::Colour (c.Red(), c.Green(), c.Blue()));
+ } else {
+ _content->subtitle->unset_colour ();
+ }
+ switch (_effect->GetSelection()) {
+ case NONE:
+ _content->subtitle->set_effect (dcp::NONE);
+ break;
+ case OUTLINE:
+ _content->subtitle->set_effect (dcp::BORDER);
+ break;
+ case SHADOW:
+ _content->subtitle->set_effect (dcp::SHADOW);
+ break;
+ }
+ if (_force_effect_colour->GetValue ()) {
+ wxColour const ec = _effect_colour->GetColour ();
+ _content->subtitle->set_effect_colour (dcp::Colour (ec.Red(), ec.Green(), ec.Blue()));
+ } else {
+ _content->subtitle->unset_effect_colour ();
+ }
_content->subtitle->set_fade_in (_fade_in->get (_content->active_video_frame_rate ()));
_content->subtitle->set_fade_out (_fade_out->get (_content->active_video_frame_rate ()));
_content->subtitle->set_outline_width (_outline_width->GetValue ());
- for (map<RGBA, RGBAColourPicker*>::const_iterator i = _pickers.begin(); i != _pickers.end(); ++i) {
- _stream->set_colour (i->first, i->second->colour ());
+ if (_stream) {
+ for (map<RGBA, RGBAColourPicker*>::const_iterator i = _pickers.begin(); i != _pickers.end(); ++i) {
+ _stream->set_colour (i->first, i->second->colour ());
+ }
}
shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (_content);
void
SubtitleAppearanceDialog::setup_sensitivity ()
{
- _effect_colour->Enable (_effect->GetSelection() != NONE);
+ _colour->Enable (_force_colour->GetValue ());
+ _effect_colour->Enable (_force_effect_colour->GetValue ());
bool const can_outline_width = _effect->GetSelection() == OUTLINE && _content->subtitle->burn ();
_outline_width->Enable (can_outline_width);
projects / dcpomatic.git / blobdiff