X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=f92505c333863e1e093e9496246ec3eea028fd34;hb=75cb27e8fc24c1b526802289dbddd67127142379;hp=0f86a3f3f2b720f21a8df9f7b38577f91d6a1537;hpb=f90d74f7a0382f0dc63eef81bd553d7a7b38edb2;p=dcpomatic.git diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 0f86a3f3f..f92505c33 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,28 +17,65 @@ */ -#include #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 +#include using std::cout; using std::string; using std::set; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using dcp::raw_convert; -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 + 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); grid->Add (_position); @@ -46,11 +83,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); @@ -66,15 +109,75 @@ TimingPanel::TimingPanel (ContentPanel* p) 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 it 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); + grid->Add (t, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 6); + _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)); } +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 ()); + } + + if (check.size() == 1) { + _full_length->set (cl.front()->full_length (), _parent->film()->video_frame_rate ()); + } else { + _full_length->clear (); + } +} + +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 ()); + } + + if (check.size() == 1) { + _play_length->set (cl.front()->length_after_trim (), _parent->film()->video_frame_rate ()); + } else { + _play_length->clear (); + } +} + void TimingPanel::film_content_changed (int property) { @@ -84,7 +187,7 @@ TimingPanel::film_content_changed (int property) /* 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; @@ -97,44 +200,35 @@ TimingPanel::film_content_changed (int property) } else { _position->clear (); } - + } else if ( property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_RATE || property == VideoContentProperty::VIDEO_FRAME_TYPE ) { - set check; - for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) { - check.insert ((*i)->full_length ()); - } - - if (check.size() == 1) { - _full_length->set (cl.front()->full_length (), film_video_frame_rate); - } else { - _full_length->clear (); - } + update_full_length (); } else if (property == ContentProperty::TRIM_START) { - set check; + set check; for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) { check.insert ((*i)->trim_start ()); } - + if (check.size() == 1) { _trim_start->set (cl.front()->trim_start (), film_video_frame_rate); } else { _trim_start->clear (); } - + } else if (property == ContentProperty::TRIM_END) { - set check; + set check; for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) { check.insert ((*i)->trim_end ()); } - + if (check.size() == 1) { _trim_end->set (cl.front()->trim_end (), film_video_frame_rate); } else { @@ -150,20 +244,11 @@ TimingPanel::film_content_changed (int property) property == VideoContentProperty::VIDEO_FRAME_TYPE ) { - set check; - for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) { - check.insert ((*i)->length_after_trim ()); - } - - if (check.size() == 1) { - _play_length->set (cl.front()->length_after_trim (), film_video_frame_rate); - } else { - _play_length->clear (); - } + update_play_length (); } if (property == VideoContentProperty::VIDEO_FRAME_RATE) { - set check; + set check; shared_ptr vc; for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) { shared_ptr t = dynamic_pointer_cast (*i); @@ -173,10 +258,10 @@ TimingPanel::film_content_changed (int property) } } if (check.size() == 1) { - _video_frame_rate->SetValue (std_to_wx (raw_convert (vc->video_frame_rate (), 5))); + checked_set (_video_frame_rate, raw_convert (vc->video_frame_rate (), 5)); _video_frame_rate->Enable (true); } else { - _video_frame_rate->SetValue (""); + checked_set (_video_frame_rate, wxT ("")); _video_frame_rate->Enable (false); } } @@ -210,8 +295,8 @@ TimingPanel::full_length_changed () for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { 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 (_parent->film()->video_frame_rate()), FrameRateChange (1, 1))); + int const vfr = _parent->film()->video_frame_rate (); + ic->set_video_length (_full_length->get (vfr).frames (vfr)); } } } @@ -240,7 +325,11 @@ 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()); + 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 () + ); } } @@ -257,7 +346,7 @@ TimingPanel::set_video_frame_rate () for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { shared_ptr vc = 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 ()))); } _set_video_frame_rate->Enable (false); } @@ -274,10 +363,44 @@ 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); } + +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 () +{ + 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()); + } + + } +}