X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=3fcb9b1753eeecc41d808ef2d27f7777196d1bbe;hp=08334da4bfef8142a8425e6ee88485b0de47bd4f;hb=e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160;hpb=ad10aea1d685e67e0e639f6303fc9c8f8f1f945c diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 08334da4b..3fcb9b175 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -25,8 +25,10 @@ #include "film_editor.h" using std::cout; +using std::string; using boost::shared_ptr; using boost::dynamic_pointer_cast; +using boost::lexical_cast; TimingPanel::TimingPanel (FilmEditor* e) : FilmEditorPanel (e, _("Timing")) @@ -35,26 +37,39 @@ TimingPanel::TimingPanel (FilmEditor* e) _sizer->Add (grid, 0, wxALL, 8); add_label_to_sizer (grid, this, _("Position"), true); - _position = new DCPTimecode (this); + _position = new Timecode (this); grid->Add (_position); add_label_to_sizer (grid, this, _("Full length"), true); - _full_length = new DCPTimecode (this); + _full_length = new Timecode (this); grid->Add (_full_length); add_label_to_sizer (grid, this, _("Trim from start"), true); - _trim_start = new DCPTimecode (this); + _trim_start = new Timecode (this); grid->Add (_trim_start); add_label_to_sizer (grid, this, _("Trim from end"), true); - _trim_end = new DCPTimecode (this); + _trim_end = new Timecode (this); grid->Add (_trim_end); add_label_to_sizer (grid, this, _("Play length"), true); - _play_length = new DCPTimecode (this); + _play_length = new Timecode (this); grid->Add (_play_length); + { + add_label_to_sizer (grid, this, _("Video frame rate"), true); + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _video_frame_rate = new wxTextCtrl (this, wxID_ANY); + s->Add (_video_frame_rate, 1, wxEXPAND); + _set_video_frame_rate = new wxButton (this, wxID_ANY, _("Set")); + _set_video_frame_rate->Enable (false); + s->Add (_set_video_frame_rate, 0, wxLEFT | wxRIGHT, 8); + grid->Add (s, 1, wxEXPAND); + } + _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_end->Changed.connect (boost::bind (&TimingPanel::trim_end_changed, 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 @@ -70,37 +85,56 @@ TimingPanel::film_content_changed (int property) if (content) { _position->set (content->position (), _editor->film()->video_frame_rate ()); } else { - _position->set (0, 24); + _position->set (DCPTime () , 24); } - } else if (property == ContentProperty::LENGTH) { + } else if ( + property == ContentProperty::LENGTH || + property == VideoContentProperty::VIDEO_FRAME_RATE || + property == VideoContentProperty::VIDEO_FRAME_TYPE + ) { if (content) { _full_length->set (content->full_length (), _editor->film()->video_frame_rate ()); _play_length->set (content->length_after_trim (), _editor->film()->video_frame_rate ()); } else { - _full_length->set (0, 24); - _play_length->set (0, 24); + _full_length->set (DCPTime (), 24); + _play_length->set (DCPTime (), 24); } } else if (property == ContentProperty::TRIM_START) { if (content) { _trim_start->set (content->trim_start (), _editor->film()->video_frame_rate ()); _play_length->set (content->length_after_trim (), _editor->film()->video_frame_rate ()); } else { - _trim_start->set (0, 24); - _play_length->set (0, 24); + _trim_start->set (DCPTime (), 24); + _play_length->set (DCPTime (), 24); } } else if (property == ContentProperty::TRIM_END) { if (content) { _trim_end->set (content->trim_end (), _editor->film()->video_frame_rate ()); _play_length->set (content->length_after_trim (), _editor->film()->video_frame_rate ()); } else { - _trim_end->set (0, 24); - _play_length->set (0, 24); + _trim_end->set (DCPTime (), 24); + _play_length->set (DCPTime (), 24); } - } + } + + if (property == VideoContentProperty::VIDEO_FRAME_RATE) { + if (content) { + shared_ptr vc = dynamic_pointer_cast (content); + if (vc) { + _video_frame_rate->SetValue (std_to_wx (lexical_cast (vc->video_frame_rate ()))); + } else { + _video_frame_rate->SetValue ("24"); + } + } else { + _video_frame_rate->SetValue ("24"); + } + } shared_ptr ic = dynamic_pointer_cast (content); _full_length->set_editable (ic && ic->still ()); _play_length->set_editable (!ic || !ic->still ()); + _video_frame_rate->Enable (ic && !ic->still ()); + _set_video_frame_rate->Enable (false); } void @@ -119,7 +153,8 @@ TimingPanel::full_length_changed () if (c.size() == 1) { shared_ptr ic = dynamic_pointer_cast (c.front ()); if (ic && ic->still ()) { - ic->set_video_length (rint (_full_length->get (_editor->film()->video_frame_rate()) * ic->video_frame_rate() / TIME_HZ)); + /* XXX: No effective FRC here... is this right? */ + ic->set_video_length (ContentTime (_full_length->get (_editor->film()->video_frame_rate()), FrameRateChange (1, 1))); } } } @@ -152,6 +187,25 @@ TimingPanel::play_length_changed () } } +void +TimingPanel::video_frame_rate_changed () +{ + _set_video_frame_rate->Enable (true); +} + +void +TimingPanel::set_video_frame_rate () +{ + ContentList c = _editor->selected_content (); + if (c.size() == 1) { + shared_ptr ic = dynamic_pointer_cast (c.front ()); + if (ic) { + ic->set_video_frame_rate (lexical_cast (wx_to_std (_video_frame_rate->GetValue ()))); + _set_video_frame_rate->Enable (false); + } + } +} + void TimingPanel::content_selection_changed () { @@ -164,9 +218,11 @@ TimingPanel::content_selection_changed () _trim_start->Enable (single); _trim_end->Enable (single); _play_length->Enable (single); + _video_frame_rate->Enable (single); 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); }