X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=3304157e242abfe7ad8d697609110278008fcbfa;hb=00ec9baf93ff25e52ee81c0b17fe90190898793e;hp=d7ed46f467eca85192d6b6c355cf375830a72d9b;hpb=c8be0644833dce6ff39202430bba0ab358f3e096;p=dcpomatic.git diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index d7ed46f46..3304157e2 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -18,141 +18,102 @@ */ -#include "timing_panel.h" -#include "wx_util.h" -#include "film_viewer.h" -#include "timecode.h" + #include "content_panel.h" +#include "dcpomatic_button.h" +#include "film_viewer.h" #include "move_to_dialog.h" +#include "static_text.h" +#include "timecode.h" +#include "timing_panel.h" +#include "wx_util.h" +#include "lib/audio_content.h" #include "lib/content.h" -#include "lib/image_content.h" -#include "lib/subtitle_content.h" +#include "lib/dcp_content.h" #include "lib/dcp_subtitle_content.h" -#include "lib/audio_content.h" -#include "lib/text_subtitle_content.h" +#include "lib/ffmpeg_content.h" +#include "lib/film.h" +#include "lib/image_content.h" +#include "lib/string_text_file_content.h" +#include "lib/text_content.h" #include "lib/video_content.h" #include -#include +#include +#if defined(__WXGTK20__) && !defined(__WXGTK3__) +#define TIMING_PANEL_ALIGNMENT_HACK 1 +LIBDCP_DISABLE_WARNINGS +#include +LIBDCP_ENABLE_WARNINGS +#endif #include -#include -using std::cout; + using std::string; using std::set; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::weak_ptr; +using std::dynamic_pointer_cast; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::locale_convert; +using namespace dcpomatic; + -TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer) +TimingPanel::TimingPanel (ContentPanel* p, FilmViewer& viewer) /* horrid hack for apparent lack of context support with wxWidgets i18n code */ /// TRANSLATORS: translate the word "Timing" here; do not include the "Timing|" prefix : ContentSubPanel (p, S_("Timing|Timing")) , _viewer (viewer) + , _film_content_changed_suspender (boost::bind(&TimingPanel::film_content_changed, this, _1)) { - wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4); - _sizer->Add (grid, 0, wxALL, 8); +} + + +void +TimingPanel::create () +{ wxSize size = TimecodeBase::size (this); - wxSizer* labels = new wxBoxSizer (wxHORIZONTAL); + for (int i = 0; i < 3; ++i) { + _colon[i] = create_label (this, wxT(":"), false); + } + //// TRANSLATORS: this is an abbreviation for "hours" - wxStaticText* t = new wxStaticText (this, wxID_ANY, _("h"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); -#ifdef DCPOMATIC_LINUX - /* Hack to work around failure to centre text on GTK */ - gtk_label_set_line_wrap (GTK_LABEL (t->GetHandle()), FALSE); -#endif - labels->Add (t, 1, wxEXPAND); - add_label_to_sizer (labels, this, wxT (":"), false); + _label.push_back(new StaticText(this, _("h"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL)); //// TRANSLATORS: this is an abbreviation for "minutes" - t = new wxStaticText (this, wxID_ANY, _("m"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); -#ifdef DCPOMATIC_LINUX - gtk_label_set_line_wrap (GTK_LABEL (t->GetHandle()), FALSE); -#endif - labels->Add (t, 1, wxEXPAND); - add_label_to_sizer (labels, this, wxT (":"), false); + _label.push_back(new StaticText(this, _("m"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL)); //// TRANSLATORS: this is an abbreviation for "seconds" - t = new wxStaticText (this, wxID_ANY, _("s"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); -#ifdef DCPOMATIC_LINUX - gtk_label_set_line_wrap (GTK_LABEL (t->GetHandle()), FALSE); -#endif - labels->Add (t, 1, wxEXPAND); - add_label_to_sizer (labels, this, wxT (":"), false); + _label.push_back(new StaticText (this, _("s"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL)); //// TRANSLATORS: this is an abbreviation for "frames" - t = new wxStaticText (this, wxID_ANY, _("f"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); -#ifdef DCPOMATIC_LINUX - gtk_label_set_line_wrap (GTK_LABEL (t->GetHandle()), FALSE); + _label.push_back(new StaticText (this, _("f"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL)); + + if (GetLayoutDirection() == wxLayout_RightToLeft) { + std::reverse(_label.begin(), _label.end()); + } + +#ifdef TIMING_PANEL_ALIGNMENT_HACK + for (auto label: _label) { + /* Hack to work around failure to centre text on GTK */ + gtk_label_set_line_wrap(GTK_LABEL(label->GetHandle()), FALSE); + } #endif - labels->Add (t, 1, wxEXPAND); - grid->Add (new wxStaticText (this, wxID_ANY, wxT (""))); - grid->Add (labels); - add_label_to_sizer (grid, this, _("Position"), true); + _position_label = create_label (this, _("Position"), true); _position = new Timecode (this); - grid->Add (_position); - _move_to_start_of_reel = new wxButton (this, wxID_ANY, _("Move to start of reel")); - grid->AddSpacer (0); - grid->Add (_move_to_start_of_reel); - add_label_to_sizer (grid, this, _("Full length"), true); + _move_to_start_of_reel = new Button (this, _("Move to start of reel")); + _full_length_label = create_label (this, _("Full length"), true); _full_length = new Timecode (this); - grid->Add (_full_length); - add_label_to_sizer (grid, this, _("Trim from start"), true); + _trim_start_label = create_label (this, _("Trim from start"), true); _trim_start = new Timecode (this); - grid->Add (_trim_start); - _trim_start_to_playhead = new wxButton (this, wxID_ANY, _("Trim up to current position")); - grid->AddSpacer (0); - grid->Add (_trim_start_to_playhead); - add_label_to_sizer (grid, this, _("Trim from end"), true); + _trim_start_to_playhead = new Button (this, _("Trim up to current position")); + _trim_end_label = create_label (this, _("Trim from end"), true); _trim_end = new Timecode (this); - grid->Add (_trim_end); - _trim_end_to_playhead = new wxButton (this, wxID_ANY, _("Trim after current position")); - grid->AddSpacer (0); - grid->Add (_trim_end_to_playhead); - add_label_to_sizer (grid, this, _("Play length"), true); + _trim_end_to_playhead = new Button (this, _("Trim from current position to end")); + _play_length_label = create_label (this, _("Play length"), true); _play_length = new Timecode (this); - grid->Add (_play_length); - - { - add_label_to_sizer (grid, this, _("Video frame rate"), true); - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _video_frame_rate = new wxTextCtrl (this, wxID_ANY); - s->Add (_video_frame_rate, 1, wxEXPAND); - _set_video_frame_rate = new wxButton (this, wxID_ANY, _("Set")); - _set_video_frame_rate->Enable (false); - s->Add (_set_video_frame_rate, 0, wxLEFT | wxRIGHT, 8); - grid->Add (s, 1, wxEXPAND); - } - - grid->AddSpacer (0); - - /* We can't use Wrap() here as it doesn't work with markup: - * http://trac.wxwidgets.org/ticket/13389 - */ - - wxString in = _("Only change this if the content's frame rate has been read incorrectly."); - wxString out; - int const width = 20; - int current = 0; - for (size_t i = 0; i < in.Length(); ++i) { - if (in[i] == ' ' && current >= width) { - out += '\n'; - current = 0; - } else { - out += in[i]; - ++current; - } - } - - t = new wxStaticText (this, wxID_ANY, wxT ("")); - t->SetLabelMarkup (out); -#ifdef DCPOMATIC_OSX - /* Hack to stop hidden text on some versions of OS X */ - t->SetMinSize (wxSize (-1, 256)); -#endif - grid->Add (t, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 6); - - /* Completely speculative fix for #891 */ - grid->Layout (); _position->Changed.connect (boost::bind (&TimingPanel::position_changed, this)); _move_to_start_of_reel->Bind (wxEVT_BUTTON, boost::bind (&TimingPanel::move_to_start_of_reel_clicked, this)); @@ -162,24 +123,74 @@ TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer) _trim_end->Changed.connect (boost::bind (&TimingPanel::trim_end_changed, this)); _trim_end_to_playhead->Bind (wxEVT_BUTTON, boost::bind (&TimingPanel::trim_end_to_playhead_clicked, this)); _play_length->Changed.connect (boost::bind (&TimingPanel::play_length_changed, this)); - _video_frame_rate->Bind (wxEVT_TEXT, boost::bind (&TimingPanel::video_frame_rate_changed, this)); - _set_video_frame_rate->Bind (wxEVT_BUTTON, boost::bind (&TimingPanel::set_video_frame_rate, this)); - _viewer->ImageChanged.connect (boost::bind (&TimingPanel::setup_sensitivity, this)); + _viewer.ImageChanged.connect(boost::bind(&TimingPanel::setup_sensitivity, this)); setup_sensitivity (); + add_to_grid (); + + _sizer->Layout (); +} + +void +TimingPanel::add_to_grid () +{ + int r = 0; + + auto labels = new wxBoxSizer(wxHORIZONTAL); + int index = 0; + for (auto label: _label) { + labels->Add(label, 1, wxEXPAND); + if (index < 3) { + add_label_to_sizer(labels, _colon[index++], false); + } + } + _grid->Add (labels, wxGBPosition(r, 1)); + ++r; + + add_label_to_sizer (_grid, _position_label, true, wxGBPosition(r, 0)); + _grid->Add (_position, wxGBPosition(r, 1)); + ++r; + + _grid->Add (_move_to_start_of_reel, wxGBPosition(r, 1)); + ++r; + + add_label_to_sizer (_grid, _full_length_label, true, wxGBPosition(r, 0)); + _grid->Add (_full_length, wxGBPosition(r, 1)); + ++r; + + add_label_to_sizer (_grid, _trim_start_label, true, wxGBPosition(r, 0)); + _grid->Add (_trim_start, wxGBPosition(r, 1)); + ++r; + + _grid->Add (_trim_start_to_playhead, wxGBPosition(r, 1)); + ++r; + + add_label_to_sizer (_grid, _trim_end_label, true, wxGBPosition(r, 0)); + _grid->Add (_trim_end, wxGBPosition(r, 1)); + ++r; + + _grid->Add (_trim_end_to_playhead, wxGBPosition(r, 1)); + ++r; + + add_label_to_sizer (_grid, _play_length_label, true, wxGBPosition(r, 0)); + _grid->Add (_play_length, wxGBPosition(r, 1)); + ++r; + + /* Completely speculative fix for #891 */ + _grid->Layout (); } void TimingPanel::update_full_length () { set check; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - check.insert (i->full_length ()); + for (auto i: _parent->selected()) { + check.insert (i->full_length(_parent->film())); } if (check.size() == 1) { - _full_length->set (_parent->selected().front()->full_length (), _parent->film()->video_frame_rate ()); + _full_length->set (_parent->selected().front()->full_length(_parent->film()), _parent->film()->video_frame_rate()); } else { _full_length->clear (); } @@ -189,12 +200,12 @@ void TimingPanel::update_play_length () { set check; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - check.insert (i->length_after_trim ()); + for (auto i: _parent->selected()) { + check.insert (i->length_after_trim(_parent->film())); } if (check.size() == 1) { - _play_length->set (_parent->selected().front()->length_after_trim (), _parent->film()->video_frame_rate ()); + _play_length->set (_parent->selected().front()->length_after_trim(_parent->film()), _parent->film()->video_frame_rate()); } else { _play_length->clear (); } @@ -203,6 +214,10 @@ TimingPanel::update_play_length () void TimingPanel::film_content_changed (int property) { + if (_film_content_changed_suspender.check(property)) { + return; + } + int const film_video_frame_rate = _parent->film()->video_frame_rate (); /* Here we check to see if we have exactly one different value of various @@ -212,7 +227,7 @@ TimingPanel::film_content_changed (int property) if (property == ContentProperty::POSITION) { set check; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { check.insert (i->position ()); } @@ -233,7 +248,7 @@ TimingPanel::film_content_changed (int property) } else if (property == ContentProperty::TRIM_START) { set check; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { check.insert (i->trim_start ()); } @@ -246,7 +261,7 @@ TimingPanel::film_content_changed (int property) } else if (property == ContentProperty::TRIM_END) { set check; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { check.insert (i->trim_end ()); } @@ -271,37 +286,23 @@ TimingPanel::film_content_changed (int property) if (property == ContentProperty::VIDEO_FRAME_RATE) { set check_vc; shared_ptr content; - int count_ac = 0; - int count_sc = 0; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { if (i->video && i->video_frame_rate()) { check_vc.insert (i->video_frame_rate().get()); content = i; } if (i->audio && i->video_frame_rate()) { - ++count_ac; content = i; } - if (i->subtitle && i->video_frame_rate()) { - ++count_sc; + if (!i->text.empty() && i->video_frame_rate()) { content = i; } } - - bool const single_frame_image_content = content && dynamic_pointer_cast (content) && content->number_of_paths() == 1; - - if ((check_vc.size() == 1 || count_ac == 1 || count_sc == 1) && !single_frame_image_content) { - checked_set (_video_frame_rate, locale_convert (content->video_frame_rate().get(), 5)); - _video_frame_rate->Enable (true); - } else { - checked_set (_video_frame_rate, wxT ("")); - _video_frame_rate->Enable (false); - } } bool have_still = false; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { shared_ptr ic = dynamic_pointer_cast (i); if (ic && ic->still ()) { have_still = true; @@ -310,7 +311,6 @@ TimingPanel::film_content_changed (int property) _full_length->set_editable (have_still); _play_length->set_editable (!have_still); - _set_video_frame_rate->Enable (false); setup_sensitivity (); } @@ -318,8 +318,8 @@ void TimingPanel::position_changed () { DCPTime const pos = _position->get (_parent->film()->video_frame_rate ()); - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - i->set_position (pos); + for (auto i: _parent->selected()) { + i->set_position (_parent->film(), pos); } } @@ -328,7 +328,7 @@ TimingPanel::full_length_changed () { int const vfr = _parent->film()->video_frame_rate (); Frame const len = _full_length->get (vfr).frames_round (vfr); - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { shared_ptr ic = dynamic_pointer_cast (i); if (ic && ic->still ()) { ic->video->set_length (len); @@ -339,18 +339,17 @@ TimingPanel::full_length_changed () void TimingPanel::trim_start_changed () { - DCPTime const ph = _viewer->position (); + DCPTime const ph = _viewer.position(); - _viewer->set_coalesce_player_changes (true); + _viewer.set_coalesce_player_changes(true); shared_ptr ref; optional ref_frc; optional ref_ph; - ContentTime const trim = _trim_start->get (_parent->film()->video_frame_rate ()); - - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - if (i->position() <= ph && ph < i->end()) { + Suspender::Block bl = _film_content_changed_suspender.block (); + for (auto i: _parent->selected()) { + if (i->position() <= ph && ph < i->end(_parent->film())) { /* The playhead is in i. Use it as a reference to work out where to put the playhead post-trim; we're trying to keep the playhead at the same frame of content that we're looking at pre-trim. @@ -360,62 +359,48 @@ TimingPanel::trim_start_changed () ref_ph = ph - i->position() + DCPTime (i->trim_start(), ref_frc.get()); } - i->set_trim_start (trim); + ContentTime const trim = _trim_start->get (i->video_frame_rate().get_value_or(_parent->film()->video_frame_rate())); + i->set_trim_start(_parent->film(), trim); } if (ref) { - _viewer->set_position (max (DCPTime(), ref_ph.get() + ref->position() - DCPTime (ref->trim_start(), ref_frc.get()))); + _viewer.seek(max(DCPTime(), ref_ph.get() + ref->position() - DCPTime(ref->trim_start(), ref_frc.get())), true); } - _viewer->set_coalesce_player_changes (false); + _viewer.set_coalesce_player_changes(false); } void TimingPanel::trim_end_changed () { - _viewer->set_coalesce_player_changes (true); + _viewer.set_coalesce_player_changes(true); - ContentTime const trim = _trim_end->get (_parent->film()->video_frame_rate ()); - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + Suspender::Block bl = _film_content_changed_suspender.block (); + for (auto i: _parent->selected()) { + ContentTime const trim = _trim_end->get (i->video_frame_rate().get_value_or(_parent->film()->video_frame_rate())); i->set_trim_end (trim); } /* XXX: maybe playhead-off-the-end-of-the-film should be handled elsewhere */ - if (_viewer->position() >= _parent->film()->length()) { - _viewer->set_position (_parent->film()->length() - DCPTime::from_frames (1, _parent->film()->video_frame_rate())); + if (_viewer.position() >= _parent->film()->length()) { + _viewer.seek(_parent->film()->length() - DCPTime::from_frames(1, _parent->film()->video_frame_rate()), true); } - _viewer->set_coalesce_player_changes (true); + _viewer.set_coalesce_player_changes(false); } void TimingPanel::play_length_changed () { DCPTime const play_length = _play_length->get (_parent->film()->video_frame_rate()); - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + Suspender::Block bl = _film_content_changed_suspender.block (); + for (auto i: _parent->selected()) { FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ()); - i->set_trim_end ( - ContentTime (i->full_length() - play_length, frc) - i->trim_start () - ); + auto dcp = max(DCPTime(), i->full_length(_parent->film()) - play_length); + i->set_trim_end (max(ContentTime(), ContentTime(dcp, frc) - i->trim_start())); } } -void -TimingPanel::video_frame_rate_changed () -{ - _set_video_frame_rate->Enable (true); -} - -void -TimingPanel::set_video_frame_rate () -{ - double const fr = locale_convert (wx_to_std (_video_frame_rate->GetValue ())); - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - i->set_video_frame_rate (fr); - } - - _set_video_frame_rate->Enable (false); -} void TimingPanel::content_selection_changed () @@ -430,9 +415,9 @@ TimingPanel::content_selection_changed () } void -TimingPanel::film_changed (Film::Property p) +TimingPanel::film_changed(FilmProperty p) { - if (p == Film::VIDEO_FRAME_RATE) { + if (p == FilmProperty::VIDEO_FRAME_RATE) { update_full_length (); update_play_length (); } @@ -441,36 +426,36 @@ TimingPanel::film_changed (Film::Property p) void TimingPanel::trim_start_to_playhead_clicked () { - shared_ptr film = _parent->film (); - DCPTime const ph = _viewer->position().floor (film->video_frame_rate ()); + auto film = _parent->film (); + DCPTime const ph = _viewer.position().floor(film->video_frame_rate()); optional new_ph; - _viewer->set_coalesce_player_changes (true); + _viewer.set_coalesce_player_changes(true); - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - if (i->position() < ph && ph < i->end ()) { - FrameRateChange const frc = film->active_frame_rate_change (i->position ()); - i->set_trim_start (i->trim_start() + ContentTime (ph - i->position (), frc)); + for (auto i: _parent->selected()) { + if (i->position() < ph && ph < i->end(film)) { + FrameRateChange const frc = film->active_frame_rate_change (i->position()); + i->set_trim_start(film, i->trim_start() + ContentTime(ph - i->position(), frc)); new_ph = i->position (); } } + _viewer.set_coalesce_player_changes(false); + if (new_ph) { - _viewer->set_position (new_ph.get()); + _viewer.seek(new_ph.get(), true); } - - _viewer->set_coalesce_player_changes (false); } void TimingPanel::trim_end_to_playhead_clicked () { - shared_ptr film = _parent->film (); - DCPTime const ph = _viewer->position().floor (film->video_frame_rate ()); - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - if (i->position() < ph && ph < i->end ()) { + auto film = _parent->film (); + auto const ph = _viewer.position().floor(film->video_frame_rate()); + for (auto i: _parent->selected()) { + if (i->position() < ph && ph < i->end(film)) { FrameRateChange const frc = film->active_frame_rate_change (i->position ()); - i->set_trim_end (ContentTime (i->position() + i->full_length() - ph - DCPTime::from_frames (1, frc.dcp), frc) - i->trim_start()); + i->set_trim_end (ContentTime(i->position() + i->full_length(film) - ph, frc) - i->trim_start()); } } } @@ -486,12 +471,11 @@ TimingPanel::setup_sensitivity () _trim_start->Enable (e); _trim_end->Enable (e); _play_length->Enable (e); - _video_frame_rate->Enable (e); - DCPTime const ph = _viewer->position (); + auto const ph = _viewer.position(); bool any_over_ph = false; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - if (i->position() <= ph && ph < i->end()) { + for (auto i: _parent->selected()) { + if (i->position() <= ph && ph < i->end(_parent->film())) { any_over_ph = true; } } @@ -506,7 +490,7 @@ TimingPanel::move_to_start_of_reel_clicked () /* Find common position of all selected content, if it exists */ optional position; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { if (!position) { position = i->position(); } else { @@ -517,12 +501,11 @@ TimingPanel::move_to_start_of_reel_clicked () } } - MoveToDialog* d = new MoveToDialog (this, position, _parent->film()); + auto d = make_wx(this, position, _parent->film()); if (d->ShowModal() == wxID_OK) { - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - i->set_position (d->position ()); + for (auto i: _parent->selected()) { + i->set_position (_parent->film(), d->position()); } } - d->Destroy (); }