X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=f4de5502838a53526e18c69da085d5d5546c5199;hb=73654117144c6de0ec4efe39ddc88485df546cc9;hp=9f5aa78ead191be6e0434205d20e0834fdb3a99d;hpb=294704d07de1fd6981362d85a26e4a83a6ef08fa;p=dcpomatic.git diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 9f5aa78ea..f4de55028 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2016 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 . */ @@ -22,12 +23,15 @@ #include "film_viewer.h" #include "timecode.h" #include "content_panel.h" +#include "move_to_dialog.h" #include "lib/content.h" #include "lib/image_content.h" -#include "lib/raw_convert.h" #include "lib/subtitle_content.h" #include "lib/dcp_subtitle_content.h" -#include "lib/subrip_content.h" +#include "lib/audio_content.h" +#include "lib/text_subtitle_content.h" +#include "lib/video_content.h" +#include #include #include #include @@ -38,9 +42,11 @@ using std::set; using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::optional; +using dcp::raw_convert; 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) { @@ -84,6 +90,9 @@ TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer) add_label_to_sizer (grid, 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); _full_length = new Timecode (this); grid->Add (_full_length); @@ -120,7 +129,7 @@ TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer) * http://trac.wxwidgets.org/ticket/13389 */ - wxString in = _("Only change this if it the content's frame rate has been read incorrectly."); + wxString in = _("Only change this if the content's frame rate has been read incorrectly."); wxString out; int const width = 20; int current = 0; @@ -138,7 +147,11 @@ TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer) t->SetLabelMarkup (out); 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_COMMAND_BUTTON_CLICKED, 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)); @@ -207,9 +220,8 @@ TimingPanel::film_content_changed (int property) } else if ( property == ContentProperty::LENGTH || - property == VideoContentProperty::VIDEO_FRAME_RATE || - property == VideoContentProperty::VIDEO_FRAME_TYPE || - property == SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE + property == ContentProperty::VIDEO_FRAME_RATE || + property == VideoContentProperty::FRAME_TYPE ) { update_full_length (); @@ -245,41 +257,38 @@ TimingPanel::film_content_changed (int property) property == ContentProperty::LENGTH || property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END || - property == VideoContentProperty::VIDEO_FRAME_RATE || - property == VideoContentProperty::VIDEO_FRAME_TYPE || - property == SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE + property == ContentProperty::VIDEO_FRAME_RATE || + property == VideoContentProperty::FRAME_TYPE ) { update_play_length (); } - if (property == VideoContentProperty::VIDEO_FRAME_RATE || property == SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE) { + if (property == ContentProperty::VIDEO_FRAME_RATE) { set check_vc; - shared_ptr vc; + shared_ptr content; + int count_ac = 0; int count_sc = 0; - shared_ptr sc; BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - shared_ptr vt = dynamic_pointer_cast (i); - if (vt) { - check_vc.insert (vt->video_frame_rate ()); - vc = vt; + if (i->video && i->video_frame_rate()) { + check_vc.insert (i->video_frame_rate().get()); + content = i; } - shared_ptr st = dynamic_pointer_cast (i); - if (st) { + if (i->audio && i->video_frame_rate()) { + ++count_ac; + content = i; + } + if (i->subtitle && i->video_frame_rate()) { ++count_sc; - sc = st; + content = i; } } - bool const single_frame_image_content = vc && dynamic_pointer_cast (vc) && vc->number_of_paths() == 1; + bool const single_frame_image_content = content && dynamic_pointer_cast (content) && content->number_of_paths() == 1; - if ((check_vc.size() == 1 || count_sc == 1) && !single_frame_image_content) { - if (vc) { - checked_set (_video_frame_rate, raw_convert (vc->video_frame_rate (), 5)); - } else if (sc) { - checked_set (_video_frame_rate, raw_convert (sc->subtitle_video_frame_rate (), 5)); - } + if ((check_vc.size() == 1 || count_ac == 1 || count_sc == 1) && !single_frame_image_content) { + checked_set (_video_frame_rate, raw_convert (content->video_frame_rate().get(), 5)); _video_frame_rate->Enable (true); } else { checked_set (_video_frame_rate, wxT ("")); @@ -316,7 +325,7 @@ TimingPanel::full_length_changed () shared_ptr ic = dynamic_pointer_cast (i); if (ic && ic->still ()) { int const vfr = _parent->film()->video_frame_rate (); - ic->set_video_length (_full_length->get (vfr).frames_round (vfr)); + ic->video->set_length (_full_length->get (vfr).frames_round (vfr)); } } } @@ -324,17 +333,49 @@ TimingPanel::full_length_changed () void TimingPanel::trim_start_changed () { + DCPTime const ph = _viewer->position (); + + _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()) { + /* 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. + */ + ref = i; + ref_frc = _parent->film()->active_frame_rate_change (i->position ()); + ref_ph = ph - i->position() + DCPTime (i->trim_start(), ref_frc.get()); + } + i->set_trim_start (_trim_start->get (_parent->film()->video_frame_rate ())); } + + if (ref) { + _viewer->set_position (max (DCPTime(), ref_ph.get() + ref->position() - DCPTime (ref->trim_start(), ref_frc.get()))); + } + + _viewer->set_coalesce_player_changes (false); } void TimingPanel::trim_end_changed () { + _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 ())); } + + /* 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())); + } + + _viewer->set_coalesce_player_changes (true); } void @@ -358,19 +399,12 @@ TimingPanel::video_frame_rate_changed () void TimingPanel::set_video_frame_rate () { + double const fr = raw_convert (wx_to_std (_video_frame_rate->GetValue ())); BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - shared_ptr vc = dynamic_pointer_cast (i); - shared_ptr dsc = dynamic_pointer_cast (i); - shared_ptr ssc = dynamic_pointer_cast (i); - if (vc) { - vc->set_video_frame_rate (raw_convert (wx_to_std (_video_frame_rate->GetValue ()))); - } else if (dsc) { - dsc->set_subtitle_video_frame_rate (raw_convert (wx_to_std (_video_frame_rate->GetValue ()))); - } else if (ssc) { - ssc->set_subtitle_video_frame_rate (raw_convert (wx_to_std (_video_frame_rate->GetValue ()))); - } - _set_video_frame_rate->Enable (false); + i->set_video_frame_rate (fr); } + + _set_video_frame_rate->Enable (false); } void @@ -382,8 +416,7 @@ 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::VIDEO_FRAME_RATE); - film_content_changed (SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE); + film_content_changed (ContentProperty::VIDEO_FRAME_RATE); } void @@ -401,7 +434,7 @@ TimingPanel::trim_start_to_playhead_clicked () DCPTime const ph = _viewer->position (); optional new_ph; - _viewer->set_ignore_player_changes (true); + _viewer->set_coalesce_player_changes (true); BOOST_FOREACH (shared_ptr i, _parent->selected ()) { if (i->position() < ph && ph < i->end ()) { @@ -411,11 +444,11 @@ TimingPanel::trim_start_to_playhead_clicked () } } - _viewer->set_ignore_player_changes (false); - if (new_ph) { _viewer->set_position (new_ph.get()); } + + _viewer->set_coalesce_player_changes (false); } void @@ -436,6 +469,7 @@ 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); @@ -453,3 +487,30 @@ 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; + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + if (!position) { + position = i->position(); + } else { + if (position.get() != i->position()) { + position.reset (); + break; + } + } + } + + MoveToDialog* d = new MoveToDialog (this, position, _parent->film()); + + if (d->ShowModal() == wxID_OK) { + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + i->set_position (d->position ()); + } + } + d->Destroy (); +}