X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=93ac0278438bac6ff8932f4e0ecaa094fc123be3;hp=9a4551193e9672dfe2ed4468fe01678f5af556c5;hb=507a389e9c5f84ec1d51e7566e38fbf42f658537;hpb=f0edd6ab35c3c2b7800a26ec8206adab75e5f633 diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 9a4551193..93ac02784 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -1,56 +1,115 @@ /* - Copyright (C) 2012-2013 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 "timing_panel.h" #include "wx_util.h" +#include "film_viewer.h" #include "timecode.h" -#include "film_editor.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 using std::cout; using std::string; +using std::set; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using boost::lexical_cast; +using boost::optional; +using dcp::locale_convert; -TimingPanel::TimingPanel (FilmEditor* e) +TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer) /* horrid hack for apparent lack of context support with wxWidgets i18n code */ - : FilmEditorPanel (e, S_("Timing|Timing")) + /// TRANSLATORS: translate the word "Timing" here; do not include the "Timing|" prefix + : ContentSubPanel (p, S_("Timing|Timing")) + , _viewer (viewer) { wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4); _sizer->Add (grid, 0, wxALL, 8); + wxSize size = TimecodeBase::size (this); + + wxSizer* labels = new wxBoxSizer (wxHORIZONTAL); + //// 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); + //// 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); + //// 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); + //// 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); +#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 = new Timecode (this); + _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); + _full_length = new Timecode (this); grid->Add (_full_length); add_label_to_sizer (grid, this, _("Trim from start"), true); - _trim_start = new Timecode (this); + _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_end = new Timecode (this); + _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); - _play_length = new Timecode (this); + _play_length = new Timecode (this); grid->Add (_play_length); { @@ -64,100 +123,215 @@ TimingPanel::TimingPanel (FilmEditor* e) 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)); _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_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_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 -TimingPanel::film_content_changed (int property) +TimingPanel::update_full_length () +{ + set check; + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + check.insert (i->full_length ()); + } + + if (check.size() == 1) { + _full_length->set (_parent->selected().front()->full_length (), _parent->film()->video_frame_rate ()); + } else { + _full_length->clear (); + } +} + +void +TimingPanel::update_play_length () { - ContentList cl = _editor->selected_content (); - shared_ptr content; - if (cl.size() == 1) { - content = cl.front (); + set check; + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + check.insert (i->length_after_trim ()); + } + + if (check.size() == 1) { + _play_length->set (_parent->selected().front()->length_after_trim (), _parent->film()->video_frame_rate ()); + } else { + _play_length->clear (); } +} + +void +TimingPanel::film_content_changed (int property) +{ + 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 + properties, and fill the controls with that value if so. + */ - int const film_video_frame_rate = _editor->film()->video_frame_rate (); - if (property == ContentProperty::POSITION) { - if (content) { - _position->set (content->position (), film_video_frame_rate); + + set check; + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + check.insert (i->position ()); + } + + if (check.size() == 1) { + _position->set (_parent->selected().front()->position(), film_video_frame_rate); } else { - _position->set (DCPTime () , 24); + _position->clear (); } + } else if ( property == ContentProperty::LENGTH || - property == VideoContentProperty::VIDEO_FRAME_RATE || - property == VideoContentProperty::VIDEO_FRAME_TYPE + property == ContentProperty::VIDEO_FRAME_RATE || + property == VideoContentProperty::FRAME_TYPE ) { - if (content) { - _full_length->set (content->full_length (), film_video_frame_rate); - _play_length->set (content->length_after_trim (), film_video_frame_rate); - } else { - _full_length->set (DCPTime (), 24); - _play_length->set (DCPTime (), 24); - } + + update_full_length (); + } else if (property == ContentProperty::TRIM_START) { - if (content) { - _trim_start->set (content->trim_start (), film_video_frame_rate); - _play_length->set (content->length_after_trim (), film_video_frame_rate); + + set check; + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + check.insert (i->trim_start ()); + } + + if (check.size() == 1) { + _trim_start->set (_parent->selected().front()->trim_start (), film_video_frame_rate); } else { - _trim_start->set (DCPTime (), 24); - _play_length->set (DCPTime (), 24); + _trim_start->clear (); } + } else if (property == ContentProperty::TRIM_END) { - if (content) { - _trim_end->set (content->trim_end (), film_video_frame_rate); - _play_length->set (content->length_after_trim (), film_video_frame_rate); + + set check; + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + check.insert (i->trim_end ()); + } + + if (check.size() == 1) { + _trim_end->set (_parent->selected().front()->trim_end (), film_video_frame_rate); } else { - _trim_end->set (DCPTime (), 24); - _play_length->set (DCPTime (), 24); + _trim_end->clear (); } } - if (property == VideoContentProperty::VIDEO_FRAME_RATE) { - if (content) { - shared_ptr vc = dynamic_pointer_cast (content); - if (vc) { - _video_frame_rate->SetValue (std_to_wx (lexical_cast (vc->video_frame_rate ()))); - } else { - _video_frame_rate->SetValue ("24"); + if ( + property == ContentProperty::LENGTH || + property == ContentProperty::TRIM_START || + property == ContentProperty::TRIM_END || + property == ContentProperty::VIDEO_FRAME_RATE || + property == VideoContentProperty::FRAME_TYPE + ) { + + update_play_length (); + } + + 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 ()) { + 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; + } + + } + + 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 { - _video_frame_rate->SetValue ("24"); + checked_set (_video_frame_rate, wxT ("")); + _video_frame_rate->Enable (false); + } + } + + bool have_still = false; + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + shared_ptr ic = dynamic_pointer_cast (i); + if (ic && ic->still ()) { + have_still = true; } } - shared_ptr ic = dynamic_pointer_cast (content); - _full_length->set_editable (ic && ic->still ()); - _play_length->set_editable (!ic || !ic->still ()); - _video_frame_rate->Enable (ic && !ic->still ()); + _full_length->set_editable (have_still); + _play_length->set_editable (!have_still); _set_video_frame_rate->Enable (false); + setup_sensitivity (); } void TimingPanel::position_changed () { - ContentList c = _editor->selected_content (); - if (c.size() == 1) { - c.front()->set_position (_position->get (_editor->film()->video_frame_rate ())); + DCPTime const pos = _position->get (_parent->film()->video_frame_rate ()); + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + i->set_position (pos); } } void TimingPanel::full_length_changed () { - ContentList c = _editor->selected_content (); - if (c.size() == 1) { - shared_ptr ic = dynamic_pointer_cast (c.front ()); + 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 ()) { - /* XXX: No effective FRC here... is this right? */ - ic->set_video_length (ContentTime (_full_length->get (_editor->film()->video_frame_rate()), FrameRateChange (1, 1))); + ic->video->set_length (len); } } } @@ -165,28 +339,64 @@ TimingPanel::full_length_changed () void TimingPanel::trim_start_changed () { - ContentList c = _editor->selected_content (); - if (c.size() == 1) { - c.front()->set_trim_start (_trim_start->get (_editor->film()->video_frame_rate ())); + 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 ()) { + 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 () { - ContentList c = _editor->selected_content (); - if (c.size() == 1) { - c.front()->set_trim_end (_trim_end->get (_editor->film()->video_frame_rate ())); + _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); + } + + /* 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 () { - ContentList c = _editor->selected_content (); - if (c.size() == 1) { - c.front()->set_trim_end (c.front()->full_length() - _play_length->get (_editor->film()->video_frame_rate()) - c.front()->trim_start()); + 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 (max(DCPTime(), i->full_length() - play_length), frc) - i->trim_start () + ); } } @@ -199,33 +409,127 @@ TimingPanel::video_frame_rate_changed () void TimingPanel::set_video_frame_rate () { - ContentList c = _editor->selected_content (); - if (c.size() == 1) { - shared_ptr ic = dynamic_pointer_cast (c.front ()); - if (ic) { - ic->set_video_frame_rate (lexical_cast (wx_to_std (_video_frame_rate->GetValue ()))); + 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); } + + _set_video_frame_rate->Enable (false); } void TimingPanel::content_selection_changed () { - ContentList sel = _editor->selected_content (); - bool const single = sel.size() == 1; - - /* Things that are only allowed with single selections */ - _position->Enable (single); - _full_length->Enable (single); - _trim_start->Enable (single); - _trim_end->Enable (single); - _play_length->Enable (single); - _video_frame_rate->Enable (single); - + 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 +TimingPanel::film_changed (Film::Property p) +{ + if (p == Film::VIDEO_FRAME_RATE) { + update_full_length (); + update_play_length (); + } +} + +void +TimingPanel::trim_start_to_playhead_clicked () +{ + 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 = 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 () +{ + 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 = 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 (); }