X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=a29240f8dbaf3cd2eea395c133dc885ff0cc918b;hb=80400212e939dc2f3b987cb6df57709929aa5178;hp=f92505c333863e1e093e9496246ec3eea028fd34;hpb=75cb27e8fc24c1b526802289dbddd67127142379;p=dcpomatic.git diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index f92505c33..a29240f8d 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -17,22 +17,27 @@ */ -#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 "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/text_subtitle_content.h" #include #include +#include using std::cout; 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 */ @@ -142,20 +147,22 @@ 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 TimingPanel::update_full_length () { - ContentList cl = _parent->selected (); - set check; - for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) { - check.insert ((*i)->full_length ()); + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + check.insert (i->full_length ()); } if (check.size() == 1) { - _full_length->set (cl.front()->full_length (), _parent->film()->video_frame_rate ()); + _full_length->set (_parent->selected().front()->full_length (), _parent->film()->video_frame_rate ()); } else { _full_length->clear (); } @@ -164,15 +171,13 @@ TimingPanel::update_full_length () void TimingPanel::update_play_length () { - ContentList cl = _parent->selected (); - set check; - for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) { - check.insert ((*i)->length_after_trim ()); + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + check.insert (i->length_after_trim ()); } if (check.size() == 1) { - _play_length->set (cl.front()->length_after_trim (), _parent->film()->video_frame_rate ()); + _play_length->set (_parent->selected().front()->length_after_trim (), _parent->film()->video_frame_rate ()); } else { _play_length->clear (); } @@ -181,7 +186,6 @@ TimingPanel::update_play_length () void TimingPanel::film_content_changed (int property) { - ContentList cl = _parent->selected (); 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 @@ -191,12 +195,12 @@ TimingPanel::film_content_changed (int property) if (property == ContentProperty::POSITION) { set check; - for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) { - check.insert ((*i)->position ()); + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + check.insert (i->position ()); } if (check.size() == 1) { - _position->set (cl.front()->position(), film_video_frame_rate); + _position->set (_parent->selected().front()->position(), film_video_frame_rate); } else { _position->clear (); } @@ -204,7 +208,8 @@ TimingPanel::film_content_changed (int property) } else if ( property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_RATE || - property == VideoContentProperty::VIDEO_FRAME_TYPE + property == VideoContentProperty::VIDEO_FRAME_TYPE || + property == SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE ) { update_full_length (); @@ -212,12 +217,12 @@ TimingPanel::film_content_changed (int property) } else if (property == ContentProperty::TRIM_START) { set check; - for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) { - check.insert ((*i)->trim_start ()); + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + check.insert (i->trim_start ()); } if (check.size() == 1) { - _trim_start->set (cl.front()->trim_start (), film_video_frame_rate); + _trim_start->set (_parent->selected().front()->trim_start (), film_video_frame_rate); } else { _trim_start->clear (); } @@ -225,12 +230,12 @@ TimingPanel::film_content_changed (int property) } else if (property == ContentProperty::TRIM_END) { set check; - for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) { - check.insert ((*i)->trim_end ()); + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + check.insert (i->trim_end ()); } if (check.size() == 1) { - _trim_end->set (cl.front()->trim_end (), film_video_frame_rate); + _trim_end->set (_parent->selected().front()->trim_end (), film_video_frame_rate); } else { _trim_end->clear (); } @@ -241,24 +246,40 @@ TimingPanel::film_content_changed (int property) property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END || property == VideoContentProperty::VIDEO_FRAME_RATE || - property == VideoContentProperty::VIDEO_FRAME_TYPE + property == VideoContentProperty::VIDEO_FRAME_TYPE || + property == SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE ) { update_play_length (); } - if (property == VideoContentProperty::VIDEO_FRAME_RATE) { - set check; - shared_ptr vc; - for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) { - shared_ptr t = dynamic_pointer_cast (*i); - if (t) { - check.insert (t->video_frame_rate ()); - vc = t; + if (property == VideoContentProperty::VIDEO_FRAME_RATE || property == SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE) { + set check_vc; + shared_ptr vc; + 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; } + shared_ptr st = dynamic_pointer_cast (i); + if (st) { + ++count_sc; + sc = st; + } + } - if (check.size() == 1) { - checked_set (_video_frame_rate, raw_convert (vc->video_frame_rate (), 5)); + + 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) { + checked_set (_video_frame_rate, raw_convert (sc->subtitle_video_frame_rate (), 5)); + } _video_frame_rate->Enable (true); } else { checked_set (_video_frame_rate, wxT ("")); @@ -267,8 +288,8 @@ TimingPanel::film_content_changed (int property) } bool have_still = false; - for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) { - shared_ptr ic = dynamic_pointer_cast (*i); + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + shared_ptr ic = dynamic_pointer_cast (i); if (ic && ic->still ()) { have_still = true; } @@ -277,26 +298,25 @@ 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 () { - ContentList c = _parent->selected (); - for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { - (*i)->set_position (_position->get (_parent->film()->video_frame_rate ())); + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + i->set_position (_position->get (_parent->film()->video_frame_rate ())); } } void TimingPanel::full_length_changed () { - ContentList c = _parent->selected (); - for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { - shared_ptr ic = dynamic_pointer_cast (*i); + 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 (vfr)); + ic->set_video_length (_full_length->get (vfr).frames_round (vfr)); } } } @@ -304,31 +324,59 @@ TimingPanel::full_length_changed () void TimingPanel::trim_start_changed () { - ContentList c = _parent->selected (); - for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { - (*i)->set_trim_start (_trim_start->get (_parent->film()->video_frame_rate ())); + 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 () { - ContentList c = _parent->selected (); - for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { - (*i)->set_trim_end (_trim_end->get (_parent->film()->video_frame_rate ())); + _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 TimingPanel::play_length_changed () { - ContentList c = _parent->selected (); - for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { - 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 () + 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 () ); } } @@ -342,11 +390,16 @@ TimingPanel::video_frame_rate_changed () void TimingPanel::set_video_frame_rate () { - ContentList c = _parent->selected (); - for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { - shared_ptr vc = dynamic_pointer_cast (*i); + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + shared_ptr vc = dynamic_pointer_cast (i); + shared_ptr dsc = 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 (tsc) { + tsc->set_subtitle_video_frame_rate (raw_convert (wx_to_std (_video_frame_rate->GetValue ()))); } _set_video_frame_rate->Enable (false); } @@ -355,20 +408,14 @@ 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); 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); } void @@ -384,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 @@ -399,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); }