Cleanup: use enum class.

[dcpomatic.git] / src / wx / timing_panel.cc

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 195887a298d3b69f5510ac81e520e9ccb869a285..1f2928e018c588c33f7bc0807ff692c62dda92c4 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -43,16 +43,15 @@ DCPOMATIC_DISABLE_WARNINGS
 #include <gtk/gtk.h>
 DCPOMATIC_ENABLE_WARNINGS
 #endif
-#include <boost/foreach.hpp>
 #include <set>
 #include <iostream>
 
 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<FilmViewer> 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,6 +130,8 @@ TimingPanel::TimingPanel (ContentPanel* p, weak_ptr<FilmViewer> viewer)
 
        setup_sensitivity ();
        add_to_grid ();
+
+       _sizer->Layout ();
 }
 
 void
@@ -179,7 +187,7 @@ void
 TimingPanel::update_full_length ()
 {
        set<DCPTime> check;
-       BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+       for (auto i: _parent->selected()) {
                check.insert (i->full_length(_parent->film()));
        }
 
@@ -194,7 +202,7 @@ void
 TimingPanel::update_play_length ()
 {
        set<DCPTime> check;
-       BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+       for (auto i: _parent->selected()) {
                check.insert (i->length_after_trim(_parent->film()));
        }
 
@@ -221,7 +229,7 @@ TimingPanel::film_content_changed (int property)
        if (property == ContentProperty::POSITION) {
 
                set<DCPTime> check;
-               BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+               for (auto i: _parent->selected()) {
                        check.insert (i->position ());
                }
 
@@ -242,7 +250,7 @@ TimingPanel::film_content_changed (int property)
        } else if (property == ContentProperty::TRIM_START) {
 
                set<ContentTime> check;
-               BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+               for (auto i: _parent->selected()) {
                        check.insert (i->trim_start ());
                }
 
@@ -255,7 +263,7 @@ TimingPanel::film_content_changed (int property)
        } else if (property == ContentProperty::TRIM_END) {
 
                set<ContentTime> check;
-               BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+               for (auto i: _parent->selected()) {
                        check.insert (i->trim_end ());
                }
 
@@ -282,7 +290,7 @@ TimingPanel::film_content_changed (int property)
                shared_ptr<const Content> content;
                int count_ac = 0;
                int count_sc = 0;
-               BOOST_FOREACH (shared_ptr<const Content> 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;
@@ -300,7 +308,7 @@ TimingPanel::film_content_changed (int property)
        }
 
        bool have_still = false;
-       BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+       for (auto i: _parent->selected()) {
                shared_ptr<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (i);
                if (ic && ic->still ()) {
                        have_still = true;
@@ -316,7 +324,7 @@ void
 TimingPanel::position_changed ()
 {
        DCPTime const pos = _position->get (_parent->film()->video_frame_rate ());
-       BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+       for (auto i: _parent->selected()) {
                i->set_position (_parent->film(), pos);
        }
 }
@@ -326,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<Content> i, _parent->selected ()) {
+       for (auto i: _parent->selected()) {
                shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (i);
                if (ic && ic->still ()) {
                        ic->video->set_length (len);
@@ -351,7 +359,7 @@ TimingPanel::trim_start_changed ()
        optional<DCPTime> ref_ph;
 
        Suspender::Block bl = _film_content_changed_suspender.block ();
-       BOOST_FOREACH (shared_ptr<Content> 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
@@ -384,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<Content> 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);
        }
@@ -402,7 +410,7 @@ 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<Content> 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()
@@ -426,7 +434,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 ();
        }
@@ -446,7 +454,7 @@ TimingPanel::trim_start_to_playhead_clicked ()
 
        fv->set_coalesce_player_changes (true);
 
-       BOOST_FOREACH (shared_ptr<Content> 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));
@@ -471,7 +479,7 @@ TimingPanel::trim_end_to_playhead_clicked ()
 
        shared_ptr<const Film> film = _parent->film ();
        DCPTime const ph = fv->position().floor (film->video_frame_rate ());
-       BOOST_FOREACH (shared_ptr<Content> 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());
@@ -495,7 +503,7 @@ TimingPanel::setup_sensitivity ()
        DCPOMATIC_ASSERT (fv);
        DCPTime const ph = fv->position ();
        bool any_over_ph = false;
-       BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+       for (auto i: _parent->selected()) {
                if (i->position() <= ph && ph < i->end(_parent->film())) {
                        any_over_ph = true;
                }
@@ -511,7 +519,7 @@ TimingPanel::move_to_start_of_reel_clicked ()
        /* Find common position of all selected content, if it exists */
 
        optional<DCPTime> position;
-       BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+       for (auto i: _parent->selected()) {
                if (!position) {
                        position = i->position();
                } else {
@@ -525,7 +533,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<Content> i, _parent->selected()) {
+               for (auto i: _parent->selected()) {
                        i->set_position (_parent->film(), d->position());
                }
        }