X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=890049ae92826657d66e5a602c8e6aa4787ab04b;hb=e87f943433216d294b22853411eca5c582be1066;hp=8e253c0709742e31ca042adb6644a1d3655f3ca2;hpb=8008b81c0ccee843263e2a648707b71cc3ae081f;p=dcpomatic.git diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 8e253c070..890049ae9 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -1,171 +1,198 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ -#include "timing_panel.h" -#include "wx_util.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 "content_panel.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/raw_convert.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/image_content.h" +#include "lib/scope_guard.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 + _h_label = new StaticText (this, _("h"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); +#ifdef TIMING_PANEL_ALIGNMENT_HACK /* Hack to work around failure to centre text on GTK */ - gtk_label_set_line_wrap (GTK_LABEL (t->GetHandle()), FALSE); + gtk_label_set_line_wrap (GTK_LABEL(_h_label->GetHandle()), FALSE); #endif - labels->Add (t, 1, wxEXPAND); - add_label_to_sizer (labels, this, wxT (":"), false); //// 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); + _m_label = new StaticText (this, _("m"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); +#ifdef TIMING_PANEL_ALIGNMENT_HACK + gtk_label_set_line_wrap (GTK_LABEL (_m_label->GetHandle()), FALSE); #endif - labels->Add (t, 1, wxEXPAND); - add_label_to_sizer (labels, this, wxT (":"), false); //// 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); + _s_label = new StaticText (this, _("s"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); +#ifdef TIMING_PANEL_ALIGNMENT_HACK + gtk_label_set_line_wrap (GTK_LABEL(_s_label->GetHandle()), FALSE); #endif - labels->Add (t, 1, wxEXPAND); - add_label_to_sizer (labels, this, wxT (":"), false); //// 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); + _f_label = new StaticText (this, _("f"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); +#ifdef TIMING_PANEL_ALIGNMENT_HACK + gtk_label_set_line_wrap (GTK_LABEL(_f_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); - 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 it 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); - grid->Add (t, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 6); _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)); _trim_start->Changed.connect (boost::bind (&TimingPanel::trim_start_changed, this)); - _trim_start_to_playhead->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&TimingPanel::trim_start_to_playhead_clicked, this)); + _trim_start_to_playhead->Bind (wxEVT_BUTTON, boost::bind (&TimingPanel::trim_start_to_playhead_clicked, this)); _trim_end->Changed.connect (boost::bind (&TimingPanel::trim_end_changed, this)); - _trim_end_to_playhead->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&TimingPanel::trim_end_to_playhead_clicked, 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_COMMAND_TEXT_UPDATED, boost::bind (&TimingPanel::video_frame_rate_changed, this)); - _set_video_frame_rate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, 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; + + wxSizer* labels = new wxBoxSizer (wxHORIZONTAL); + labels->Add (_h_label, 1, wxEXPAND); + add_label_to_sizer (labels, _colon[0], false); + labels->Add (_m_label, 1, wxEXPAND); + add_label_to_sizer (labels, _colon[1], false); + labels->Add (_s_label, 1, wxEXPAND); + add_label_to_sizer (labels, _colon[2], false); + labels->Add (_f_label, 1, wxEXPAND); + _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 (); } @@ -175,12 +202,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 (); } @@ -189,6 +216,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 @@ -198,7 +229,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 ()); } @@ -210,10 +241,8 @@ TimingPanel::film_content_changed (int property) } else if ( property == ContentProperty::LENGTH || - property == VideoContentProperty::FRAME_RATE || - property == VideoContentProperty::FRAME_TYPE || - property == AudioContentProperty::VIDEO_FRAME_RATE || - property == SubtitleContentProperty::VIDEO_FRAME_RATE + property == ContentProperty::VIDEO_FRAME_RATE || + property == VideoContentProperty::FRAME_TYPE ) { update_full_length (); @@ -221,7 +250,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 ()); } @@ -234,7 +263,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 ()); } @@ -249,57 +278,37 @@ TimingPanel::film_content_changed (int property) property == ContentProperty::LENGTH || property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END || - property == VideoContentProperty::FRAME_RATE || - property == VideoContentProperty::FRAME_TYPE || - property == AudioContentProperty::VIDEO_FRAME_RATE || - property == SubtitleContentProperty::VIDEO_FRAME_RATE + property == ContentProperty::VIDEO_FRAME_RATE || + property == VideoContentProperty::FRAME_TYPE ) { update_play_length (); } - if (property == VideoContentProperty::FRAME_RATE || property == SubtitleContentProperty::VIDEO_FRAME_RATE) { + if (property == ContentProperty::VIDEO_FRAME_RATE) { set check_vc; - shared_ptr vc; + shared_ptr content; int count_ac = 0; - shared_ptr ac; int count_sc = 0; - shared_ptr sc; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - if (i->video) { - check_vc.insert (i->video->frame_rate ()); - vc = i; + 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) { + if (i->audio && i->video_frame_rate()) { ++count_ac; - ac = i; + content = i; } - if (i->subtitle) { + if (!i->text.empty() && i->video_frame_rate()) { ++count_sc; - sc = i; + content = i; } } - - bool const single_frame_image_content = vc && dynamic_pointer_cast (vc) && vc->number_of_paths() == 1; - - if ((check_vc.size() == 1 || count_ac == 1 || count_sc == 1) && !single_frame_image_content) { - if (vc) { - checked_set (_video_frame_rate, raw_convert (vc->video->frame_rate (), 5)); - } else if (ac) { - checked_set (_video_frame_rate, raw_convert (ac->audio->video_frame_rate (), 5)); - } else if (sc) { - checked_set (_video_frame_rate, raw_convert (sc->subtitle->video_frame_rate (), 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; @@ -308,26 +317,27 @@ 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 (); } void TimingPanel::position_changed () { - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - i->set_position (_position->get (_parent->film()->video_frame_rate ())); + DCPTime const pos = _position->get (_parent->film()->video_frame_rate ()); + for (auto i: _parent->selected()) { + i->set_position (_parent->film(), pos); } } void TimingPanel::full_length_changed () { - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + int const vfr = _parent->film()->video_frame_rate (); + Frame const len = _full_length->get (vfr).frames_round (vfr); + for (auto i: _parent->selected()) { shared_ptr ic = dynamic_pointer_cast (i); if (ic && ic->still ()) { - int const vfr = _parent->film()->video_frame_rate (); - ic->video->set_length (_full_length->get (vfr).frames_round (vfr)); + ic->video->set_length (len); } } } @@ -335,15 +345,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; - 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. @@ -353,71 +365,48 @@ TimingPanel::trim_start_changed () ref_ph = ph - i->position() + DCPTime (i->trim_start(), ref_frc.get()); } - i->set_trim_start (_trim_start->get (_parent->film()->video_frame_rate ())); + 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); - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - i->set_trim_end (_trim_end->get (_parent->film()->video_frame_rate ())); + 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 () { - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + DCPTime const play_length = _play_length->get (_parent->film()->video_frame_rate()); + 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->get (_parent->film()->video_frame_rate()), 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 () -{ - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - shared_ptr dsc = dynamic_pointer_cast (i); - shared_ptr tsc = dynamic_pointer_cast (i); - double const fr = raw_convert (wx_to_std (_video_frame_rate->GetValue ())); - if (i->video) { - i->video->set_frame_rate (fr); - } else if (i->audio) { - /* Audio but not video, i.e. SndfileContent */ - i->audio->set_video_frame_rate (fr); - } else if (dsc) { - dsc->subtitle->set_video_frame_rate (fr); - } else if (tsc) { - tsc->subtitle->set_video_frame_rate (fr); - } - _set_video_frame_rate->Enable (false); - } -} void TimingPanel::content_selection_changed () @@ -428,15 +417,13 @@ TimingPanel::content_selection_changed () film_content_changed (ContentProperty::LENGTH); film_content_changed (ContentProperty::TRIM_START); film_content_changed (ContentProperty::TRIM_END); - film_content_changed (VideoContentProperty::FRAME_RATE); - film_content_changed (SubtitleContentProperty::VIDEO_FRAME_RATE); - film_content_changed (AudioContentProperty::VIDEO_FRAME_RATE); + film_content_changed (ContentProperty::VIDEO_FRAME_RATE); } void TimingPanel::film_changed (Film::Property p) { - if (p == Film::VIDEO_FRAME_RATE) { + if (p == Film::Property::VIDEO_FRAME_RATE) { update_full_length (); update_play_length (); } @@ -445,34 +432,36 @@ TimingPanel::film_changed (Film::Property p) void TimingPanel::trim_start_to_playhead_clicked () { - DCPTime const ph = _viewer->position (); + 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 = _parent->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 () { - DCPTime const ph = _viewer->position (); - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - if (i->position() < ph && ph < i->end ()) { - FrameRateChange const frc = _parent->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()); + 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(film) - ph, frc) - i->trim_start()); } } } @@ -483,16 +472,16 @@ TimingPanel::setup_sensitivity () bool const e = !_parent->selected().empty (); _position->Enable (e); + _move_to_start_of_reel->Enable (e); _full_length->Enable (e); _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; } } @@ -500,3 +489,29 @@ TimingPanel::setup_sensitivity () _trim_start_to_playhead->Enable (any_over_ph); _trim_end_to_playhead->Enable (any_over_ph); } + +void +TimingPanel::move_to_start_of_reel_clicked () +{ + /* Find common position of all selected content, if it exists */ + + optional position; + for (auto i: _parent->selected()) { + if (!position) { + position = i->position(); + } else { + if (position.get() != i->position()) { + position.reset (); + break; + } + } + } + + auto d = make_wx(this, position, _parent->film()); + + if (d->ShowModal() == wxID_OK) { + for (auto i: _parent->selected()) { + i->set_position (_parent->film(), d->position()); + } + } +}