X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=a29240f8dbaf3cd2eea395c133dc885ff0cc918b;hb=80400212e939dc2f3b987cb6df57709929aa5178;hp=e416a671c10bedb74792fd35a86cfe658134a72b;hpb=a14d71f1aaac3054ed6a9042f91862082d9ea1b7;p=dcpomatic.git diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index e416a671c..a29240f8d 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -27,7 +27,7 @@ #include "lib/raw_convert.h" #include "lib/subtitle_content.h" #include "lib/dcp_subtitle_content.h" -#include "lib/subrip_content.h" +#include "lib/text_subtitle_content.h" #include #include #include @@ -37,6 +37,7 @@ using std::string; using std::set; using boost::shared_ptr; using boost::dynamic_pointer_cast; +using boost::optional; TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer) /* horrid hack for apparent lack of context support with wxWidgets i18n code */ @@ -146,6 +147,10 @@ TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer) _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)); + + setup_sensitivity (); } void @@ -267,7 +272,9 @@ TimingPanel::film_content_changed (int property) } - if (check_vc.size() == 1 || count_sc == 1) { + bool const single_frame_image_content = vc && dynamic_pointer_cast (vc) && vc->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) { @@ -291,6 +298,7 @@ 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 @@ -316,18 +324,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 @@ -354,13 +393,13 @@ TimingPanel::set_video_frame_rate () 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); + shared_ptr tsc = 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 ()))); + } else if (tsc) { + tsc->set_subtitle_video_frame_rate (raw_convert (wx_to_std (_video_frame_rate->GetValue ()))); } _set_video_frame_rate->Enable (false); } @@ -369,14 +408,7 @@ TimingPanel::set_video_frame_rate () 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); @@ -399,12 +431,23 @@ void TimingPanel::trim_start_to_playhead_clicked () { DCPTime const ph = _viewer->position (); + 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 ()); 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 @@ -414,8 +457,31 @@ TimingPanel::trim_end_to_playhead_clicked () 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()); + 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); + _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); }