X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=739cf253dbfb35d9d287f902823006e386983a30;hb=f10e025eba54b0ab4dbe1b3611071b160ca89208;hp=25ea179f6c21c22b0bbce2007cd5cc1a947da8d4;hpb=54ef7357a87885ec329a25e758fb6b132816ec67;p=dcpomatic.git diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 25ea179f6..739cf253d 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -20,10 +20,12 @@ #include "timing_panel.h" #include "wx_util.h" -#include "control_film_viewer.h" +#include "film_viewer.h" #include "timecode.h" #include "content_panel.h" #include "move_to_dialog.h" +#include "static_text.h" +#include "dcpomatic_button.h" #include "lib/content.h" #include "lib/image_content.h" #include "lib/text_content.h" @@ -31,6 +33,8 @@ #include "lib/audio_content.h" #include "lib/string_text_file_content.h" #include "lib/video_content.h" +#include "lib/dcp_content.h" +#include "lib/ffmpeg_content.h" #include #include #include @@ -40,11 +44,13 @@ using std::cout; using std::string; using std::set; using boost::shared_ptr; +using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; using dcp::locale_convert; +using namespace dcpomatic; -TimingPanel::TimingPanel (ContentPanel* p, ControlFilmViewer* viewer) +TimingPanel::TimingPanel (ContentPanel* p, weak_ptr 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")) @@ -57,44 +63,44 @@ TimingPanel::TimingPanel (ContentPanel* p, ControlFilmViewer* viewer) } //// TRANSLATORS: this is an abbreviation for "hours" - _h_label = new wxStaticText (this, wxID_ANY, _("h"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); + _h_label = new StaticText (this, _("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(_h_label->GetHandle()), FALSE); #endif //// TRANSLATORS: this is an abbreviation for "minutes" - _m_label = new wxStaticText (this, wxID_ANY, _("m"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); + _m_label = new StaticText (this, _("m"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); #ifdef DCPOMATIC_LINUX gtk_label_set_line_wrap (GTK_LABEL (_m_label->GetHandle()), FALSE); #endif //// TRANSLATORS: this is an abbreviation for "seconds" - _s_label = new wxStaticText (this, wxID_ANY, _("s"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); + _s_label = new StaticText (this, _("s"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); #ifdef DCPOMATIC_LINUX gtk_label_set_line_wrap (GTK_LABEL(_s_label->GetHandle()), FALSE); #endif //// TRANSLATORS: this is an abbreviation for "frames" - _f_label = new wxStaticText (this, wxID_ANY, _("f"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); + _f_label = new StaticText (this, _("f"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); #ifdef DCPOMATIC_LINUX gtk_label_set_line_wrap (GTK_LABEL(_f_label->GetHandle()), FALSE); #endif _position_label = create_label (this, _("Position"), true); _position = new Timecode (this); - _move_to_start_of_reel = new wxButton (this, wxID_ANY, _("Move to start of reel")); + _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); _trim_start_label = create_label (this, _("Trim from start"), true); _trim_start = new Timecode (this); - _trim_start_to_playhead = new wxButton (this, wxID_ANY, _("Trim up to current position")); + _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 wxButton (this, wxID_ANY, _("Trim after current position")); + _trim_end_to_playhead = new Button (this, _("Trim after current position")); _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 wxButton (this, wxID_ANY, _("Set")); + _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: @@ -115,7 +121,7 @@ TimingPanel::TimingPanel (ContentPanel* p, ControlFilmViewer* viewer) } } - _tip = new wxStaticText (this, wxID_ANY, wxT ("")); + _tip = new StaticText (this, wxT ("")); _tip->SetLabelMarkup (out); #ifdef DCPOMATIC_OSX /* Hack to stop hidden text on some versions of OS X */ @@ -133,7 +139,9 @@ TimingPanel::TimingPanel (ContentPanel* p, ControlFilmViewer* viewer) _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)); + shared_ptr fv = _viewer.lock (); + DCPOMATIC_ASSERT (fv); + fv->ImageChanged.connect (boost::bind (&TimingPanel::setup_sensitivity, this)); setup_sensitivity (); add_to_grid (); @@ -164,12 +172,6 @@ TimingPanel::add_to_grid () _move_to_start_of_reel->Show (full); _full_length_label->Show (full); _full_length->Show (full); - _trim_start_label->Show (full); - _trim_start->Show (full); - _trim_start_to_playhead->Show (full); - _trim_end_label->Show (full); - _trim_end->Show (full); - _trim_end_to_playhead->Show (full); _play_length_label->Show (full); _play_length->Show (full); _video_frame_rate_label->Show (full); @@ -184,21 +186,23 @@ TimingPanel::add_to_grid () 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; + 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; + _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; + 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; + _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; @@ -224,11 +228,11 @@ TimingPanel::update_full_length () { set check; BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - check.insert (i->full_length ()); + 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 (); } @@ -239,11 +243,11 @@ TimingPanel::update_play_length () { set check; BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - check.insert (i->length_after_trim ()); + 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 (); } @@ -368,7 +372,7 @@ TimingPanel::position_changed () { DCPTime const pos = _position->get (_parent->film()->video_frame_rate ()); BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - i->set_position (pos); + i->set_position (_parent->film(), pos); } } @@ -388,18 +392,22 @@ TimingPanel::full_length_changed () void TimingPanel::trim_start_changed () { - DCPTime const ph = _viewer->position (); + shared_ptr fv = _viewer.lock (); + if (!fv) { + return; + } + + DCPTime const ph = fv->position (); - _viewer->set_coalesce_player_changes (true); + fv->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()) { + 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. @@ -409,32 +417,38 @@ TimingPanel::trim_start_changed () ref_ph = ph - i->position() + DCPTime (i->trim_start(), ref_frc.get()); } + ContentTime const trim = _trim_start->get (i->video_frame_rate().get_value_or(_parent->film()->video_frame_rate())); i->set_trim_start (trim); } if (ref) { - _viewer->set_position (max (DCPTime(), ref_ph.get() + ref->position() - DCPTime (ref->trim_start(), ref_frc.get()))); + fv->seek (max(DCPTime(), ref_ph.get() + ref->position() - DCPTime(ref->trim_start(), ref_frc.get())), true); } - _viewer->set_coalesce_player_changes (false); + fv->set_coalesce_player_changes (false); } void TimingPanel::trim_end_changed () { - _viewer->set_coalesce_player_changes (true); + shared_ptr fv = _viewer.lock (); + if (!fv) { + return; + } + + fv->set_coalesce_player_changes (true); - ContentTime const trim = _trim_end->get (_parent->film()->video_frame_rate ()); BOOST_FOREACH (shared_ptr 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 (fv->position() >= _parent->film()->length()) { + fv->seek (_parent->film()->length() - DCPTime::from_frames(1, _parent->film()->video_frame_rate()), true); } - _viewer->set_coalesce_player_changes (true); + fv->set_coalesce_player_changes (false); } void @@ -444,7 +458,7 @@ TimingPanel::play_length_changed () 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 () + ContentTime (max(DCPTime(), i->full_length(_parent->film()) - play_length), frc) - i->trim_start() ); } } @@ -452,7 +466,22 @@ TimingPanel::play_length_changed () void TimingPanel::video_frame_rate_changed () { - _set_video_frame_rate->Enable (true); + 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 @@ -497,36 +526,46 @@ TimingPanel::film_changed (Film::Property p) void TimingPanel::trim_start_to_playhead_clicked () { + shared_ptr fv = _viewer.lock (); + if (!fv) { + return; + } + shared_ptr film = _parent->film (); - DCPTime const ph = _viewer->position().floor (film->video_frame_rate ()); + DCPTime const ph = fv->position().floor (film->video_frame_rate ()); optional new_ph; - _viewer->set_coalesce_player_changes (true); + fv->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)); + 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)); new_ph = i->position (); } } if (new_ph) { - _viewer->set_position (new_ph.get()); + fv->seek (new_ph.get(), true); } - _viewer->set_coalesce_player_changes (false); + fv->set_coalesce_player_changes (false); } void TimingPanel::trim_end_to_playhead_clicked () { + shared_ptr fv = _viewer.lock (); + if (!fv) { + return; + } + shared_ptr film = _parent->film (); - DCPTime const ph = _viewer->position().floor (film->video_frame_rate ()); + DCPTime const ph = fv->position().floor (film->video_frame_rate ()); BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - if (i->position() < ph && ph < i->end ()) { + 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() - ph - DCPTime::from_frames (1, frc.dcp), frc) - i->trim_start()); + i->set_trim_end (ContentTime(i->position() + i->full_length(film) - ph - DCPTime::from_frames(1, frc.dcp), frc) - i->trim_start()); } } } @@ -544,10 +583,12 @@ TimingPanel::setup_sensitivity () _play_length->Enable (e); _video_frame_rate->Enable (e); - DCPTime const ph = _viewer->position (); + 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 ()) { - if (i->position() <= ph && ph < i->end()) { + if (i->position() <= ph && ph < i->end(_parent->film())) { any_over_ph = true; } } @@ -576,8 +617,8 @@ 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 ()) { - i->set_position (d->position ()); + BOOST_FOREACH (shared_ptr i, _parent->selected()) { + i->set_position (_parent->film(), d->position()); } } d->Destroy ();