X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=93ac0278438bac6ff8932f4e0ecaa094fc123be3;hp=6ebd83d73e332e4beb14b26487672f08645f3b69;hb=507a389e9c5f84ec1d51e7566e38fbf42f658537;hpb=1858190cff2f960f3d1f0a5cc02c69da86088f5b diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 6ebd83d73..93ac02784 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -1,30 +1,37 @@ /* - 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 . */ -#include "lib/content.h" -#include "lib/image_content.h" -#include "lib/raw_convert.h" #include "timing_panel.h" #include "wx_util.h" #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/text_content.h" +#include "lib/dcp_text_content.h" +#include "lib/audio_content.h" +#include "lib/plain_text_file_content.h" +#include "lib/video_content.h" +#include #include #include #include @@ -34,9 +41,12 @@ using std::string; using std::set; using boost::shared_ptr; using boost::dynamic_pointer_cast; +using boost::optional; +using dcp::locale_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) { @@ -80,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); @@ -116,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; @@ -132,17 +145,29 @@ TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer) 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)); _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)); + _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)); + + setup_sensitivity (); } void @@ -199,8 +224,8 @@ TimingPanel::film_content_changed (int property) } else if ( property == ContentProperty::LENGTH || - property == VideoContentProperty::VIDEO_FRAME_RATE || - property == VideoContentProperty::VIDEO_FRAME_TYPE + property == ContentProperty::VIDEO_FRAME_RATE || + property == VideoContentProperty::FRAME_TYPE ) { update_full_length (); @@ -236,25 +261,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 == ContentProperty::VIDEO_FRAME_RATE || + property == VideoContentProperty::FRAME_TYPE ) { update_play_length (); } - if (property == VideoContentProperty::VIDEO_FRAME_RATE) { - set check; - shared_ptr vc; + 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 ()) { - shared_ptr t = dynamic_pointer_cast (i); - if (t) { - check.insert (t->video_frame_rate ()); - vc = t; + 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; + content = i; + } + } - if (check.size() == 1) { - checked_set (_video_frame_rate, raw_convert (vc->video_frame_rate (), 5)); + + 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 ("")); @@ -273,24 +311,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 () { + DCPTime const pos = _position->get (_parent->film()->video_frame_rate ()); BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - i->set_position (_position->get (_parent->film()->video_frame_rate ())); + i->set_position (pos); } } void 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 ()) { 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 (len); } } } @@ -298,28 +339,63 @@ 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; + + ContentTime const trim = _trim_start->get (_parent->film()->video_frame_rate ()); + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - i->set_trim_start (_trim_start->get (_parent->film()->video_frame_rate ())); + 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); + } + + 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); + + ContentTime const trim = _trim_end->get (_parent->film()->video_frame_rate ()); BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - i->set_trim_end (_trim_end->get (_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())); + } + + _viewer->set_coalesce_player_changes (true); } void TimingPanel::play_length_changed () { + DCPTime const play_length = _play_length->get (_parent->film()->video_frame_rate()); BOOST_FOREACH (shared_ptr 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 () + ContentTime (max(DCPTime(), i->full_length() - play_length), frc) - i->trim_start () ); } } @@ -333,32 +409,31 @@ TimingPanel::video_frame_rate_changed () 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 ()) { - shared_ptr vc = dynamic_pointer_cast (i); - if (vc) { - vc->set_video_frame_rate (raw_convert (wx_to_std (_video_frame_rate->GetValue ()))); + if (fr) { + i->set_video_frame_rate (*fr); + } else { + i->unset_video_frame_rate (); } - _set_video_frame_rate->Enable (false); } + + _set_video_frame_rate->Enable (false); } void TimingPanel::content_selection_changed () { - bool const e = !_parent->selected().empty (); - - _position->Enable (e); - _full_length->Enable (e); - _trim_start->Enable (e); - _trim_end->Enable (e); - _play_length->Enable (e); - _video_frame_rate->Enable (e); + setup_sensitivity (); film_content_changed (ContentProperty::POSITION); 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 (ContentProperty::VIDEO_FRAME_RATE); } void @@ -373,24 +448,88 @@ TimingPanel::film_changed (Film::Property p) void TimingPanel::trim_start_to_playhead_clicked () { - DCPTime const ph = _viewer->position (); + shared_ptr film = _parent->film (); + DCPTime const ph = _viewer->position().floor (film->video_frame_rate ()); + optional new_ph; + + _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 ()); + FrameRateChange const frc = film->active_frame_rate_change (i->position ()); i->set_trim_start (i->trim_start() + ContentTime (ph - i->position (), frc)); + new_ph = i->position (); } } + + if (new_ph) { + _viewer->set_position (new_ph.get()); + } + + _viewer->set_coalesce_player_changes (false); } void TimingPanel::trim_end_to_playhead_clicked () { - DCPTime const ph = _viewer->position (); + 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 ()) { - FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ()); - i->set_trim_end (ContentTime (i->position() + i->full_length() - ph, frc) - i->trim_start()); + 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()); } + } +} + +void +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 (); + bool any_over_ph = false; + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + if (i->position() <= ph && ph < i->end()) { + any_over_ph = true; + } + } + + _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 (); }