X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=739cf253dbfb35d9d287f902823006e386983a30;hp=cbaed68709edf620adb37640949e82019a141705;hb=dde431cafbb20ed3356ad5592be56af1d4458f46;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5 diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index cbaed6870..739cf253d 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -24,6 +24,8 @@ #include "timecode.h" #include "content_panel.h" #include "move_to_dialog.h" +#include "static_text.h" +#include "dcpomatic_button.h" #include "lib/content.h" #include "lib/image_content.h" #include "lib/text_content.h" @@ -31,6 +33,8 @@ #include "lib/audio_content.h" #include "lib/string_text_file_content.h" #include "lib/video_content.h" +#include "lib/dcp_content.h" +#include "lib/ffmpeg_content.h" #include #include #include @@ -44,6 +48,7 @@ using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; using dcp::locale_convert; +using namespace dcpomatic; TimingPanel::TimingPanel (ContentPanel* p, weak_ptr viewer) /* horrid hack for apparent lack of context support with wxWidgets i18n code */ @@ -58,44 +63,44 @@ TimingPanel::TimingPanel (ContentPanel* p, weak_ptr viewer) } //// TRANSLATORS: this is an abbreviation for "hours" - _h_label = new wxStaticText (this, wxID_ANY, _("h"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); + _h_label = new StaticText (this, _("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(_h_label->GetHandle()), FALSE); #endif //// TRANSLATORS: this is an abbreviation for "minutes" - _m_label = new wxStaticText (this, wxID_ANY, _("m"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); + _m_label = new StaticText (this, _("m"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); #ifdef DCPOMATIC_LINUX gtk_label_set_line_wrap (GTK_LABEL (_m_label->GetHandle()), FALSE); #endif //// TRANSLATORS: this is an abbreviation for "seconds" - _s_label = new wxStaticText (this, wxID_ANY, _("s"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); + _s_label = new StaticText (this, _("s"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); #ifdef DCPOMATIC_LINUX gtk_label_set_line_wrap (GTK_LABEL(_s_label->GetHandle()), FALSE); #endif //// TRANSLATORS: this is an abbreviation for "frames" - _f_label = new wxStaticText (this, wxID_ANY, _("f"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); + _f_label = new StaticText (this, _("f"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); #ifdef DCPOMATIC_LINUX gtk_label_set_line_wrap (GTK_LABEL(_f_label->GetHandle()), FALSE); #endif _position_label = create_label (this, _("Position"), true); _position = new Timecode (this); - _move_to_start_of_reel = new wxButton (this, wxID_ANY, _("Move to start of reel")); + _move_to_start_of_reel = new Button (this, _("Move to start of reel")); _full_length_label = create_label (this, _("Full length"), true); _full_length = new Timecode (this); _trim_start_label = create_label (this, _("Trim from start"), true); _trim_start = new Timecode (this); - _trim_start_to_playhead = new wxButton (this, wxID_ANY, _("Trim up to current position")); + _trim_start_to_playhead = new Button (this, _("Trim up to current position")); _trim_end_label = create_label (this, _("Trim from end"), true); _trim_end = new Timecode (this); - _trim_end_to_playhead = new wxButton (this, wxID_ANY, _("Trim after current position")); + _trim_end_to_playhead = new Button (this, _("Trim after current position")); _play_length_label = create_label (this, _("Play length"), true); _play_length = new Timecode (this); _video_frame_rate_label = create_label (this, _("Video frame rate"), true); _video_frame_rate = new wxTextCtrl (this, wxID_ANY); - _set_video_frame_rate = new wxButton (this, wxID_ANY, _("Set")); + _set_video_frame_rate = new Button (this, _("Set")); _set_video_frame_rate->Enable (false); /* We can't use Wrap() here as it doesn't work with markup: @@ -116,7 +121,7 @@ TimingPanel::TimingPanel (ContentPanel* p, weak_ptr viewer) } } - _tip = new wxStaticText (this, wxID_ANY, wxT ("")); + _tip = new StaticText (this, wxT ("")); _tip->SetLabelMarkup (out); #ifdef DCPOMATIC_OSX /* Hack to stop hidden text on some versions of OS X */ @@ -167,12 +172,6 @@ TimingPanel::add_to_grid () _move_to_start_of_reel->Show (full); _full_length_label->Show (full); _full_length->Show (full); - _trim_start_label->Show (full); - _trim_start->Show (full); - _trim_start_to_playhead->Show (full); - _trim_end_label->Show (full); - _trim_end->Show (full); - _trim_end_to_playhead->Show (full); _play_length_label->Show (full); _play_length->Show (full); _video_frame_rate_label->Show (full); @@ -187,21 +186,23 @@ TimingPanel::add_to_grid () add_label_to_sizer (_grid, _full_length_label, true, wxGBPosition(r, 0)); _grid->Add (_full_length, wxGBPosition(r, 1)); ++r; + } - add_label_to_sizer (_grid, _trim_start_label, true, wxGBPosition(r, 0)); - _grid->Add (_trim_start, wxGBPosition(r, 1)); - ++r; + add_label_to_sizer (_grid, _trim_start_label, true, wxGBPosition(r, 0)); + _grid->Add (_trim_start, wxGBPosition(r, 1)); + ++r; - _grid->Add (_trim_start_to_playhead, wxGBPosition(r, 1)); - ++r; + _grid->Add (_trim_start_to_playhead, wxGBPosition(r, 1)); + ++r; - add_label_to_sizer (_grid, _trim_end_label, true, wxGBPosition(r, 0)); - _grid->Add (_trim_end, wxGBPosition(r, 1)); - ++r; + add_label_to_sizer (_grid, _trim_end_label, true, wxGBPosition(r, 0)); + _grid->Add (_trim_end, wxGBPosition(r, 1)); + ++r; - _grid->Add (_trim_end_to_playhead, wxGBPosition(r, 1)); - ++r; + _grid->Add (_trim_end_to_playhead, wxGBPosition(r, 1)); + ++r; + if (full) { add_label_to_sizer (_grid, _play_length_label, true, wxGBPosition(r, 0)); _grid->Add (_play_length, wxGBPosition(r, 1)); ++r; @@ -404,7 +405,6 @@ TimingPanel::trim_start_changed () optional ref_frc; optional ref_ph; - ContentTime const trim = _trim_start->get (_parent->film()->video_frame_rate ()); BOOST_FOREACH (shared_ptr i, _parent->selected ()) { if (i->position() <= ph && ph < i->end(_parent->film())) { @@ -417,6 +417,7 @@ TimingPanel::trim_start_changed () ref_ph = ph - i->position() + DCPTime (i->trim_start(), ref_frc.get()); } + ContentTime const trim = _trim_start->get (i->video_frame_rate().get_value_or(_parent->film()->video_frame_rate())); i->set_trim_start (trim); } @@ -437,8 +438,8 @@ TimingPanel::trim_end_changed () fv->set_coalesce_player_changes (true); - ContentTime const trim = _trim_end->get (_parent->film()->video_frame_rate ()); BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + ContentTime const trim = _trim_end->get (i->video_frame_rate().get_value_or(_parent->film()->video_frame_rate())); i->set_trim_end (trim); } @@ -447,7 +448,7 @@ TimingPanel::trim_end_changed () fv->seek (_parent->film()->length() - DCPTime::from_frames(1, _parent->film()->video_frame_rate()), true); } - fv->set_coalesce_player_changes (true); + fv->set_coalesce_player_changes (false); } void @@ -465,7 +466,22 @@ TimingPanel::play_length_changed () void TimingPanel::video_frame_rate_changed () { - _set_video_frame_rate->Enable (true); + bool enable = true; + if (_video_frame_rate->GetValue() == wxT("")) { + /* No frame rate has been entered; if the user clicks "set" now it would unset the video + frame rate in the selected content. This can't be allowed for some content types. + */ + BOOST_FOREACH (shared_ptr i, _parent->selected()) { + if ( + dynamic_pointer_cast(i) || + dynamic_pointer_cast(i) + ) { + enable = false; + } + } + } + + _set_video_frame_rate->Enable (enable); } void