X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=31b1605421c6258e25a2de8bf6a6bb744d1eb40e;hb=d1213510dc70e579346e0c4c48a8bce9b5cd95b9;hp=c643d208044613a42d58d52a56fa587da4ba694a;hpb=4b91800c7de893ec1bbc5a00ab245fd6c01b8b25;p=dcpomatic.git diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index c643d2080..31b160542 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -43,16 +43,15 @@ DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS #endif -#include #include #include using std::cout; using std::string; using std::set; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::weak_ptr; +using std::dynamic_pointer_cast; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; @@ -66,6 +65,13 @@ TimingPanel::TimingPanel (ContentPanel* p, weak_ptr viewer) : ContentSubPanel (p, S_("Timing|Timing")) , _viewer (viewer) , _film_content_changed_suspender (boost::bind(&TimingPanel::film_content_changed, this, _1)) +{ + +} + + +void +TimingPanel::create () { wxSize size = TimecodeBase::size (this); @@ -124,13 +130,13 @@ TimingPanel::TimingPanel (ContentPanel* p, weak_ptr viewer) setup_sensitivity (); add_to_grid (); + + _sizer->Layout (); } void TimingPanel::add_to_grid () { - bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL; - int r = 0; wxSizer* labels = new wxBoxSizer (wxHORIZONTAL); @@ -148,20 +154,12 @@ TimingPanel::add_to_grid () _grid->Add (_position, wxGBPosition(r, 1)); ++r; - _move_to_start_of_reel->Show (full); - _full_length_label->Show (full); - _full_length->Show (full); - _play_length_label->Show (full); - _play_length->Show (full); - - if (full) { - _grid->Add (_move_to_start_of_reel, wxGBPosition(r, 1)); - ++r; + _grid->Add (_move_to_start_of_reel, wxGBPosition(r, 1)); + ++r; - 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, _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)); @@ -177,11 +175,9 @@ TimingPanel::add_to_grid () _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; - } + add_label_to_sizer (_grid, _play_length_label, true, wxGBPosition(r, 0)); + _grid->Add (_play_length, wxGBPosition(r, 1)); + ++r; /* Completely speculative fix for #891 */ _grid->Layout (); @@ -191,7 +187,7 @@ void TimingPanel::update_full_length () { set check; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { check.insert (i->full_length(_parent->film())); } @@ -206,7 +202,7 @@ void TimingPanel::update_play_length () { set check; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { check.insert (i->length_after_trim(_parent->film())); } @@ -233,7 +229,7 @@ TimingPanel::film_content_changed (int property) if (property == ContentProperty::POSITION) { set check; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { check.insert (i->position ()); } @@ -254,7 +250,7 @@ TimingPanel::film_content_changed (int property) } else if (property == ContentProperty::TRIM_START) { set check; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { check.insert (i->trim_start ()); } @@ -267,7 +263,7 @@ TimingPanel::film_content_changed (int property) } else if (property == ContentProperty::TRIM_END) { set check; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { check.insert (i->trim_end ()); } @@ -294,7 +290,7 @@ TimingPanel::film_content_changed (int property) shared_ptr content; int count_ac = 0; int count_sc = 0; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { if (i->video && i->video_frame_rate()) { check_vc.insert (i->video_frame_rate().get()); content = i; @@ -312,7 +308,7 @@ TimingPanel::film_content_changed (int property) } bool have_still = false; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { shared_ptr ic = dynamic_pointer_cast (i); if (ic && ic->still ()) { have_still = true; @@ -328,7 +324,7 @@ void TimingPanel::position_changed () { DCPTime const pos = _position->get (_parent->film()->video_frame_rate ()); - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { i->set_position (_parent->film(), pos); } } @@ -338,7 +334,7 @@ TimingPanel::full_length_changed () { int const vfr = _parent->film()->video_frame_rate (); Frame const len = _full_length->get (vfr).frames_round (vfr); - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { shared_ptr ic = dynamic_pointer_cast (i); if (ic && ic->still ()) { ic->video->set_length (len); @@ -363,7 +359,7 @@ TimingPanel::trim_start_changed () optional ref_ph; Suspender::Block bl = _film_content_changed_suspender.block (); - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { if (i->position() <= ph && ph < i->end(_parent->film())) { /* 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 @@ -396,7 +392,7 @@ TimingPanel::trim_end_changed () fv->set_coalesce_player_changes (true); Suspender::Block bl = _film_content_changed_suspender.block (); - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto 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); } @@ -414,11 +410,10 @@ TimingPanel::play_length_changed () { DCPTime const play_length = _play_length->get (_parent->film()->video_frame_rate()); Suspender::Block bl = _film_content_changed_suspender.block (); - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ()); - i->set_trim_end ( - ContentTime (max(DCPTime(), i->full_length(_parent->film()) - play_length), frc) - i->trim_start() - ); + auto dcp = max(DCPTime(), i->full_length(_parent->film()) - play_length); + i->set_trim_end (max(ContentTime(), ContentTime(dcp, frc) - i->trim_start())); } } @@ -438,7 +433,7 @@ TimingPanel::content_selection_changed () void TimingPanel::film_changed (Film::Property p) { - if (p == Film::VIDEO_FRAME_RATE) { + if (p == Film::Property::VIDEO_FRAME_RATE) { update_full_length (); update_play_length (); } @@ -458,7 +453,7 @@ TimingPanel::trim_start_to_playhead_clicked () fv->set_coalesce_player_changes (true); - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { if (i->position() < ph && ph < i->end(film)) { FrameRateChange const frc = film->active_frame_rate_change (i->position()); i->set_trim_start (i->trim_start() + ContentTime (ph - i->position(), frc)); @@ -483,7 +478,7 @@ TimingPanel::trim_end_to_playhead_clicked () shared_ptr film = _parent->film (); DCPTime const ph = fv->position().floor (film->video_frame_rate ()); - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { if (i->position() < ph && ph < i->end(film)) { FrameRateChange const frc = film->active_frame_rate_change (i->position ()); i->set_trim_end (ContentTime(i->position() + i->full_length(film) - ph, frc) - i->trim_start()); @@ -507,7 +502,7 @@ TimingPanel::setup_sensitivity () DCPOMATIC_ASSERT (fv); DCPTime const ph = fv->position (); bool any_over_ph = false; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { if (i->position() <= ph && ph < i->end(_parent->film())) { any_over_ph = true; } @@ -523,7 +518,7 @@ TimingPanel::move_to_start_of_reel_clicked () /* Find common position of all selected content, if it exists */ optional position; - BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + for (auto i: _parent->selected()) { if (!position) { position = i->position(); } else { @@ -537,7 +532,7 @@ TimingPanel::move_to_start_of_reel_clicked () MoveToDialog* d = new MoveToDialog (this, position, _parent->film()); if (d->ShowModal() == wxID_OK) { - BOOST_FOREACH (shared_ptr i, _parent->selected()) { + for (auto i: _parent->selected()) { i->set_position (_parent->film(), d->position()); } }