X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=ecf55640dc3f7cd5655ea482cfe639c4920293c1;hp=739cf253dbfb35d9d287f902823006e386983a30;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hpb=dde431cafbb20ed3356ad5592be56af1d4458f46 diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 739cf253d..ecf55640d 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -36,17 +36,26 @@ #include "lib/dcp_content.h" #include "lib/ffmpeg_content.h" #include -#include +#include "lib/warnings.h" +#if defined(__WXGTK20__) && !defined(__WXGTK3__) +#define TIMING_PANEL_ALIGNMENT_HACK 1 +DCPOMATIC_DISABLE_WARNINGS +#include +DCPOMATIC_ENABLE_WARNINGS +#endif #include #include using std::cout; using std::string; using std::set; -using boost::shared_ptr; -using boost::weak_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; @@ -55,6 +64,7 @@ TimingPanel::TimingPanel (ContentPanel* p, weak_ptr viewer) /// 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)) { wxSize size = TimecodeBase::size (this); @@ -64,23 +74,23 @@ TimingPanel::TimingPanel (ContentPanel* p, weak_ptr viewer) //// TRANSLATORS: this is an abbreviation for "hours" _h_label = new StaticText (this, _("h"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); -#ifdef DCPOMATIC_LINUX +#ifdef TIMING_PANEL_ALIGNMENT_HACK /* Hack to work around failure to centre text on GTK */ gtk_label_set_line_wrap (GTK_LABEL(_h_label->GetHandle()), FALSE); #endif //// TRANSLATORS: this is an abbreviation for "minutes" _m_label = new StaticText (this, _("m"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); -#ifdef DCPOMATIC_LINUX +#ifdef TIMING_PANEL_ALIGNMENT_HACK gtk_label_set_line_wrap (GTK_LABEL (_m_label->GetHandle()), FALSE); #endif //// TRANSLATORS: this is an abbreviation for "seconds" _s_label = new StaticText (this, _("s"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); -#ifdef DCPOMATIC_LINUX +#ifdef TIMING_PANEL_ALIGNMENT_HACK gtk_label_set_line_wrap (GTK_LABEL(_s_label->GetHandle()), FALSE); #endif //// TRANSLATORS: this is an abbreviation for "frames" _f_label = new StaticText (this, _("f"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); -#ifdef DCPOMATIC_LINUX +#ifdef TIMING_PANEL_ALIGNMENT_HACK gtk_label_set_line_wrap (GTK_LABEL(_f_label->GetHandle()), FALSE); #endif @@ -94,40 +104,10 @@ TimingPanel::TimingPanel (ContentPanel* p, weak_ptr viewer) _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); - _trim_end_to_playhead = new Button (this, _("Trim after current position")); + _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); - _video_frame_rate_label = create_label (this, _("Video frame rate"), true); - _video_frame_rate = new wxTextCtrl (this, wxID_ANY); - _set_video_frame_rate = new Button (this, _("Set")); - _set_video_frame_rate->Enable (false); - - /* 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; - } - } - - _tip = new StaticText (this, wxT ("")); - _tip->SetLabelMarkup (out); -#ifdef DCPOMATIC_OSX - /* Hack to stop hidden text on some versions of OS X */ - _tip->SetMinSize (wxSize (-1, 256)); -#endif - _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)); _full_length->Changed.connect (boost::bind (&TimingPanel::full_length_changed, this)); @@ -136,8 +116,6 @@ TimingPanel::TimingPanel (ContentPanel* p, weak_ptr 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)); shared_ptr fv = _viewer.lock (); DCPOMATIC_ASSERT (fv); @@ -150,8 +128,6 @@ TimingPanel::TimingPanel (ContentPanel* p, weak_ptr viewer) void TimingPanel::add_to_grid () { - bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL; - int r = 0; wxSizer* labels = new wxBoxSizer (wxHORIZONTAL); @@ -169,24 +145,12 @@ TimingPanel::add_to_grid () _grid->Add (_position, wxGBPosition(r, 1)); ++r; - _move_to_start_of_reel->Show (full); - _full_length_label->Show (full); - _full_length->Show (full); - _play_length_label->Show (full); - _play_length->Show (full); - _video_frame_rate_label->Show (full); - _video_frame_rate->Show (full); - _set_video_frame_rate->Show (full); - _tip->Show (full); - - if (full) { - _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; - } + _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)); @@ -202,22 +166,9 @@ TimingPanel::add_to_grid () _grid->Add (_trim_end_to_playhead, wxGBPosition(r, 1)); ++r; - if (full) { - add_label_to_sizer (_grid, _play_length_label, true, wxGBPosition(r, 0)); - _grid->Add (_play_length, wxGBPosition(r, 1)); - ++r; - - { - add_label_to_sizer (_grid, _video_frame_rate_label, true, wxGBPosition(r, 0)); - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - s->Add (_video_frame_rate, 1, wxEXPAND); - s->Add (_set_video_frame_rate, 0, wxLEFT | wxRIGHT, 8); - _grid->Add (s, wxGBPosition(r, 1), wxGBSpan(1, 2)); - } - ++r; - - _grid->Add (_tip, wxGBPosition(r, 1), wxGBSpan(1, 2)); - } + 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 (); @@ -227,7 +178,7 @@ void TimingPanel::update_full_length () { set check; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { check.insert (i->full_length(_parent->film())); } @@ -242,7 +193,7 @@ void TimingPanel::update_play_length () { set check; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { check.insert (i->length_after_trim(_parent->film())); } @@ -256,6 +207,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 @@ -265,7 +220,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 ()); } @@ -286,7 +241,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 ()); } @@ -299,7 +254,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 ()); } @@ -326,7 +281,7 @@ TimingPanel::film_content_changed (int property) 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; @@ -341,20 +296,10 @@ TimingPanel::film_content_changed (int property) } } - - 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; @@ -363,7 +308,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 (); } @@ -371,7 +315,7 @@ void TimingPanel::position_changed () { DCPTime const pos = _position->get (_parent->film()->video_frame_rate ()); - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { i->set_position (_parent->film(), pos); } } @@ -381,7 +325,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); @@ -405,8 +349,8 @@ TimingPanel::trim_start_changed () optional ref_frc; optional ref_ph; - - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + 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 @@ -438,7 +382,8 @@ TimingPanel::trim_end_changed () fv->set_coalesce_player_changes (true); - 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); } @@ -455,7 +400,8 @@ 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 (max(DCPTime(), i->full_length(_parent->film()) - play_length), frc) - i->trim_start() @@ -463,44 +409,6 @@ TimingPanel::play_length_changed () } } -void -TimingPanel::video_frame_rate_changed () -{ - bool enable = true; - if (_video_frame_rate->GetValue() == wxT("")) { - /* No frame rate has been entered; if the user clicks "set" now it would unset the video - frame rate in the selected content. This can't be allowed for some content types. - */ - BOOST_FOREACH (shared_ptr i, _parent->selected()) { - if ( - dynamic_pointer_cast(i) || - dynamic_pointer_cast(i) - ) { - enable = false; - } - } - } - - _set_video_frame_rate->Enable (enable); -} - -void -TimingPanel::set_video_frame_rate () -{ - optional fr; - if (_video_frame_rate->GetValue() != wxT("")) { - fr = locale_convert (wx_to_std (_video_frame_rate->GetValue ())); - } - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - if (fr) { - i->set_video_frame_rate (*fr); - } else { - i->unset_video_frame_rate (); - } - } - - _set_video_frame_rate->Enable (false); -} void TimingPanel::content_selection_changed () @@ -537,7 +445,7 @@ TimingPanel::trim_start_to_playhead_clicked () fv->set_coalesce_player_changes (true); - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + 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 (i->trim_start() + ContentTime (ph - i->position(), frc)); @@ -545,11 +453,11 @@ TimingPanel::trim_start_to_playhead_clicked () } } + fv->set_coalesce_player_changes (false); + if (new_ph) { fv->seek (new_ph.get(), true); } - - fv->set_coalesce_player_changes (false); } void @@ -562,10 +470,10 @@ TimingPanel::trim_end_to_playhead_clicked () shared_ptr film = _parent->film (); DCPTime const ph = fv->position().floor (film->video_frame_rate ()); - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + 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(film) - 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()); } } } @@ -581,13 +489,12 @@ TimingPanel::setup_sensitivity () _trim_start->Enable (e); _trim_end->Enable (e); _play_length->Enable (e); - _video_frame_rate->Enable (e); shared_ptr fv = _viewer.lock (); DCPOMATIC_ASSERT (fv); DCPTime const ph = fv->position (); bool any_over_ph = false; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { if (i->position() <= ph && ph < i->end(_parent->film())) { any_over_ph = true; } @@ -603,7 +510,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 { @@ -617,7 +524,7 @@ TimingPanel::move_to_start_of_reel_clicked () MoveToDialog* d = new MoveToDialog (this, position, _parent->film()); if (d->ShowModal() == wxID_OK) { - BOOST_FOREACH (shared_ptr i, _parent->selected()) { + for (auto i: _parent->selected()) { i->set_position (_parent->film(), d->position()); } }