X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_appearance_dialog.cc;h=e21093798646641ab390ddfeb43130f744996b19;hb=28111007e2e6fd62f5810be780706ae1618bd33f;hp=831afe757d880832ff517e4a16765089bca35112;hpb=d54c8291f83bd9f2cf964ca0372f74734ccb0ae2;p=dcpomatic.git diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc index 831afe757..e21093798 100644 --- a/src/wx/subtitle_appearance_dialog.cc +++ b/src/wx/subtitle_appearance_dialog.cc @@ -20,40 +20,61 @@ #include "subtitle_appearance_dialog.h" #include "rgba_colour_picker.h" -#include "lib/text_subtitle_content.h" -#include "lib/subtitle_content.h" +#include "static_text.h" +#include "check_box.h" +#include "dcpomatic_button.h" +#include "lib/string_text_file_content.h" +#include "lib/text_content.h" #include "lib/ffmpeg_subtitle_stream.h" #include "lib/ffmpeg_content.h" +#include "lib/examine_ffmpeg_subtitles_job.h" +#include "lib/job_manager.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include #include #include #include +DCPOMATIC_ENABLE_WARNINGS using std::map; -using boost::shared_ptr; +using std::string; +using std::shared_ptr; using boost::bind; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using boost::optional; +using namespace dcpomatic; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif int const SubtitleAppearanceDialog::NONE = 0; int const SubtitleAppearanceDialog::OUTLINE = 1; int const SubtitleAppearanceDialog::SHADOW = 2; -SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr content) - : wxDialog (parent, wxID_ANY, _("Subtitle appearance")) +SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr film, shared_ptr content, shared_ptr caption) + : wxDialog (parent, wxID_ANY, _("Caption appearance")) + , _film (film) + , _finding (0) , _content (content) + , _caption (caption) { shared_ptr ff = dynamic_pointer_cast (content); if (ff) { _stream = ff->subtitle_stream (); + /* XXX: assuming that all FFmpeg streams have bitmap subs */ + if (_stream->colours().empty()) { + _job_manager_connection = JobManager::instance()->ActiveJobsChanged.connect(boost::bind(&SubtitleAppearanceDialog::active_jobs_changed, this, _1)); + _job = JobManager::instance()->add(shared_ptr(new ExamineFFmpegSubtitlesJob(film, ff))); + } } - wxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); - SetSizer (overall_sizer); + _overall_sizer = new wxBoxSizer (wxVERTICAL); + SetSizer (_overall_sizer); _table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); - overall_sizer->Add (_table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER); + _overall_sizer->Add (_table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER); int r = 0; @@ -78,73 +99,74 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr _force_fade_out = set_to (_fade_out = new Timecode (this), r); if (_stream) { - wxScrolled* colours_panel = new wxScrolled (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 = new wxScrolled (this); + _colours_panel->EnableScrolling (false, true); + _colours_panel->ShowScrollbars (wxSHOW_SB_NEVER, wxSHOW_SB_ALWAYS); + _colours_panel->SetScrollRate (0, 16); - map colours = _stream->colours (); + _colour_table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + _colour_table->AddGrowableCol (1, 1); - wxStaticText* t = new wxStaticText (colours_panel, wxID_ANY, ""); + wxStaticText* t = new StaticText (_colours_panel, ""); t->SetLabelMarkup (_("Original colour")); - table->Add (t, 1, wxEXPAND); - t = new wxStaticText (colours_panel, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE_HORIZONTAL); + _colour_table->Add (t, 1, wxEXPAND); + t = new StaticText (_colours_panel, "", wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE_HORIZONTAL); t->SetLabelMarkup (_("New colour")); - table->Add (t, 1, wxALIGN_CENTER); - - for (map::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; + _colour_table->Add (t, 1, wxALIGN_CENTER); + + shared_ptr job = _job.lock (); + if (!job || job->finished()) { + add_colours (); } - colours_panel->SetSizer (table); + _colours_panel->SetSizer (_colour_table); - overall_sizer->Add (colours_panel, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER); + /* XXX: still assuming that all FFmpeg streams have bitmap subs */ + if (_stream->colours().empty()) { + _finding = new wxStaticText(this, wxID_ANY, _("Finding the colours in these subtitles...")); + _overall_sizer->Add (_finding, 0, wxALL, DCPOMATIC_DIALOG_BORDER); + _colours_panel->Show (false); + } - wxButton* restore = new wxButton (this, wxID_ANY, _("Restore to original colours")); + _overall_sizer->Add (_colours_panel, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER); + + wxButton* restore = new Button (this, _("Restore to original colours")); restore->Bind (wxEVT_BUTTON, bind (&SubtitleAppearanceDialog::restore, this)); - overall_sizer->Add (restore, 0, wxALL, DCPOMATIC_SIZER_X_GAP); + _overall_sizer->Add (restore, 0, wxALL, DCPOMATIC_SIZER_X_GAP); } wxSizer* buttons = CreateSeparatedButtonSizer (wxOK); if (buttons) { - overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); + _overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); } - overall_sizer->Layout (); - overall_sizer->SetSizeHints (this); + _overall_sizer->Layout (); + _overall_sizer->SetSizeHints (this); /* Keep these Appends() up to date with NONE/OUTLINE/SHADOW variables */ _effect->Append (_("None")); _effect->Append (_("Outline")); _effect->Append (_("Shadow"));; - optional colour = _content->subtitle->colour(); - _force_effect_colour->SetValue (static_cast(colour)); + optional colour = _caption->colour(); + _force_colour->SetValue (static_cast(colour)); if (colour) { _colour->SetColour (wxColour (colour->r, colour->g, colour->b)); } else { _colour->SetColour (wxColour (255, 255, 255)); } - optional effect = _content->subtitle->effect(); + optional effect = _caption->effect(); _force_effect->SetValue (static_cast(effect)); if (effect) { switch (*effect) { - case dcp::NONE: + case dcp::Effect::NONE: _effect->SetSelection (NONE); break; - case dcp::BORDER: + case dcp::Effect::BORDER: _effect->SetSelection (OUTLINE); break; - case dcp::SHADOW: + case dcp::Effect::SHADOW: _effect->SetSelection (SHADOW); break; } @@ -152,31 +174,31 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr _effect->SetSelection (NONE); } - optional effect_colour = _content->subtitle->effect_colour(); - _force_effect_colour->SetValue (static_cast(_force_effect_colour)); + optional effect_colour = _caption->effect_colour(); + _force_effect_colour->SetValue (static_cast(effect_colour)); if (effect_colour) { _effect_colour->SetColour (wxColour (effect_colour->r, effect_colour->g, effect_colour->b)); } else { _effect_colour->SetColour (wxColour (0, 0, 0)); } - optional fade_in = _content->subtitle->fade_in(); + optional fade_in = _caption->fade_in(); _force_fade_in->SetValue (static_cast(fade_in)); if (fade_in) { - _fade_in->set (*fade_in, _content->active_video_frame_rate()); + _fade_in->set (*fade_in, _content->active_video_frame_rate(film)); } else { - _fade_in->set (ContentTime(), _content->active_video_frame_rate()); + _fade_in->set (ContentTime(), _content->active_video_frame_rate(film)); } - optional fade_out = _content->subtitle->fade_out(); + optional fade_out = _caption->fade_out(); _force_fade_out->SetValue (static_cast(fade_out)); if (fade_out) { - _fade_out->set (*fade_out, _content->active_video_frame_rate ()); + _fade_out->set (*fade_out, _content->active_video_frame_rate(film)); } else { - _fade_out->set (ContentTime(), _content->active_video_frame_rate ()); + _fade_out->set (ContentTime(), _content->active_video_frame_rate(film)); } - _outline_width->SetValue (_content->subtitle->outline_width ()); + _outline_width->SetValue (_caption->outline_width ()); _force_colour->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this)); _force_effect_colour->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this)); @@ -184,16 +206,24 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr _force_fade_in->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this)); _force_fade_out->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)); + _content_connection = _content->Change.connect (bind (&SubtitleAppearanceDialog::content_change, this, _1)); setup_sensitivity (); } +void +SubtitleAppearanceDialog::content_change (ChangeType type) +{ + if (type == CHANGE_TYPE_DONE) { + setup_sensitivity (); + } +} + wxCheckBox* SubtitleAppearanceDialog::set_to (wxWindow* w, int& r) { wxSizer* s = new wxBoxSizer (wxHORIZONTAL); - wxCheckBox* set_to = new wxCheckBox (this, wxID_ANY, _("Set to")); + wxCheckBox* set_to = new CheckBox (this, _("Set to")); s->Add (set_to, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 8); s->Add (w, 0, wxALIGN_CENTER_VERTICAL); _table->Add (s, wxGBPosition (r, 1)); @@ -204,40 +234,46 @@ SubtitleAppearanceDialog::set_to (wxWindow* w, int& r) void SubtitleAppearanceDialog::apply () { + shared_ptr film = _film.lock (); + if (_force_colour->GetValue ()) { wxColour const c = _colour->GetColour (); - _content->subtitle->set_colour (dcp::Colour (c.Red(), c.Green(), c.Blue())); + _caption->set_colour (dcp::Colour (c.Red(), c.Green(), c.Blue())); } else { - _content->subtitle->unset_colour (); + _caption->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->GetValue()) { + switch (_effect->GetSelection()) { + case NONE: + _caption->set_effect (dcp::Effect::NONE); + break; + case OUTLINE: + _caption->set_effect (dcp::Effect::BORDER); + break; + case SHADOW: + _caption->set_effect (dcp::Effect::SHADOW); + break; + } + } else { + _caption->unset_effect (); } if (_force_effect_colour->GetValue ()) { wxColour const ec = _effect_colour->GetColour (); - _content->subtitle->set_effect_colour (dcp::Colour (ec.Red(), ec.Green(), ec.Blue())); + _caption->set_effect_colour (dcp::Colour (ec.Red(), ec.Green(), ec.Blue())); } else { - _content->subtitle->unset_effect_colour (); + _caption->unset_effect_colour (); } if (_force_fade_in->GetValue ()) { - _content->subtitle->set_fade_in (_fade_in->get (_content->active_video_frame_rate ())); + _caption->set_fade_in (_fade_in->get(_content->active_video_frame_rate(film))); } else { - _content->subtitle->unset_fade_in (); + _caption->unset_fade_in (); } if (_force_fade_out->GetValue ()) { - _content->subtitle->set_fade_out (_fade_out->get (_content->active_video_frame_rate ())); + _caption->set_fade_out (_fade_out->get(_content->active_video_frame_rate(film))); } else { - _content->subtitle->unset_fade_out (); + _caption->unset_fade_out (); } - _content->subtitle->set_outline_width (_outline_width->GetValue ()); + _caption->set_outline_width (_outline_width->GetValue ()); if (_stream) { for (map::const_iterator i = _pickers.begin(); i != _pickers.end(); ++i) { @@ -268,11 +304,39 @@ SubtitleAppearanceDialog::setup_sensitivity () _fade_in->Enable (_force_fade_in->GetValue ()); _fade_out->Enable (_force_fade_out->GetValue ()); - bool const can_outline_width = _effect->GetSelection() == OUTLINE && _content->subtitle->burn (); + bool const can_outline_width = _effect->GetSelection() == OUTLINE && _caption->burn (); _outline_width->Enable (can_outline_width); if (can_outline_width) { _outline_width->UnsetToolTip (); } else { - _outline_width->SetToolTip (_("Outline width cannot be set unless you are burning in subtitles")); + _outline_width->SetToolTip (_("Outline width cannot be set unless you are burning in captions")); + } +} + +void +SubtitleAppearanceDialog::active_jobs_changed (optional last) +{ + if (last && *last == "examine_subtitles") { + _colours_panel->Show (true); + if (_finding) { + _finding->Show (false); + } + add_colours (); + _overall_sizer->Layout (); + _overall_sizer->SetSizeHints (this); + } +} + +void +SubtitleAppearanceDialog::add_colours () +{ + map colours = _stream->colours (); + for (map::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)); + _colour_table->Add (from, 1, wxEXPAND); + RGBAColourPicker* to = new RGBAColourPicker (_colours_panel, i->second); + _colour_table->Add (to, 1, wxEXPAND); + _pickers[i->first] = to; } }