X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=e416a671c10bedb74792fd35a86cfe658134a72b;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hp=74c1756a5205221edc15dbec4fd585a07d833961;hpb=387304bc9147933b68eda2b38ba8cac0d250e87e;p=dcpomatic.git diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 74c1756a5..e416a671c 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -17,14 +17,20 @@ */ -#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/subrip_content.h" +#include #include +#include using std::cout; using std::string; @@ -32,43 +38,44 @@ using std::set; using boost::shared_ptr; using boost::dynamic_pointer_cast; -TimingPanel::TimingPanel (ContentPanel* p) +TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer) /* horrid hack for apparent lack of context support with wxWidgets i18n code */ : 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 +#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 +#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 +#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 +#endif labels->Add (t, 1, wxEXPAND); grid->Add (new wxStaticText (this, wxID_ANY, wxT (""))); grid->Add (labels); @@ -80,11 +87,17 @@ TimingPanel::TimingPanel (ContentPanel* p) _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); grid->Add (_play_length); @@ -119,7 +132,7 @@ TimingPanel::TimingPanel (ContentPanel* p) ++current; } } - + t = new wxStaticText (this, wxID_ANY, wxT ("")); t->SetLabelMarkup (out); grid->Add (t, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 6); @@ -127,7 +140,9 @@ TimingPanel::TimingPanel (ContentPanel* p) _position->Changed.connect (boost::bind (&TimingPanel::position_changed, 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_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)); _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)); @@ -136,15 +151,13 @@ TimingPanel::TimingPanel (ContentPanel* p) 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 (); } @@ -153,15 +166,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 (); } @@ -170,56 +181,56 @@ 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 properties, and fill the controls with that value if so. */ - + 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 (); } - + } 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 (); } else if (property == ContentProperty::TRIM_START) { - set check; - for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) { - check.insert ((*i)->trim_start ()); + set check; + 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 (); } - + } else if (property == ContentProperty::TRIM_END) { - set check; - for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) { - check.insert ((*i)->trim_end ()); + set check; + 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 (); } @@ -230,24 +241,38 @@ 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)); + + if (check_vc.size() == 1 || count_sc == 1) { + 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 ("")); @@ -256,8 +281,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; } @@ -271,21 +296,19 @@ TimingPanel::film_content_changed (int property) 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)); } } } @@ -293,9 +316,8 @@ 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 ())); + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + i->set_trim_start (_trim_start->get (_parent->film()->video_frame_rate ())); } } @@ -303,18 +325,20 @@ TimingPanel::trim_start_changed () 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 ())); + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + i->set_trim_end (_trim_end->get (_parent->film()->video_frame_rate ())); } } void TimingPanel::play_length_changed () { - ContentList c = _parent->selected (); - for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { - (*i)->set_trim_end ((*i)->full_length() - _play_length->get (_parent->film()->video_frame_rate()) - (*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 () + ); } } @@ -327,11 +351,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 ssc = dynamic_pointer_cast (i); if (vc) { - vc->set_video_frame_rate (raw_convert (wx_to_std (_video_frame_rate->GetValue ()))); + 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 ()))); } _set_video_frame_rate->Enable (false); } @@ -348,12 +377,13 @@ TimingPanel::content_selection_changed () _trim_end->Enable (e); _play_length->Enable (e); _video_frame_rate->Enable (e); - + 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 @@ -364,3 +394,28 @@ TimingPanel::film_changed (Film::Property p) update_play_length (); } } + +void +TimingPanel::trim_start_to_playhead_clicked () +{ + DCPTime const ph = _viewer->position (); + 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)); + } + } +} + +void +TimingPanel::trim_end_to_playhead_clicked () +{ + DCPTime const ph = _viewer->position (); + 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()); + } + + } +}