Typo fix.
[dcpomatic.git] / src / wx / timeline.cc
index f68c98bda3241122da0522a1c1b5cec7b0d9f742..5a98c829ad8815d3c0cd512c6db09ffd89ebfe72 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
 #include "timeline_labels_view.h"
 #include "timeline_video_content_view.h"
 #include "timeline_audio_content_view.h"
-#include "timeline_subtitle_content_view.h"
+#include "timeline_text_content_view.h"
 #include "timeline_atmos_content_view.h"
 #include "content_panel.h"
 #include "wx_util.h"
+#include "film_viewer.h"
 #include "lib/film.h"
 #include "lib/playlist.h"
 #include "lib/image_content.h"
 #include "lib/timer.h"
 #include "lib/audio_content.h"
-#include "lib/subtitle_content.h"
+#include "lib/text_content.h"
 #include "lib/video_content.h"
 #include "lib/atmos_mxf_content.h"
 #include <wx/graphics.h>
-#include <boost/weak_ptr.hpp>
-#include <boost/foreach.hpp>
 #include <list>
+#include <iterator>
 #include <iostream>
 
 using std::list;
 using std::cout;
 using std::min;
 using std::max;
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+using std::abs;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::dynamic_pointer_cast;
+using std::make_shared;
 using boost::bind;
 using boost::optional;
+using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
+/* 3 hours in 640 pixels */
+double const Timeline::_minimum_pixels_per_second = 640.0 / (60 * 60 * 3);
+int const Timeline::_minimum_pixels_per_track = 16;
 
-Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film)
+Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
        : wxPanel (parent, wxID_ANY)
        , _labels_canvas (new wxScrolledCanvas (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE))
        , _main_canvas (new wxScrolledCanvas (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE))
        , _content_panel (cp)
        , _film (film)
+       , _viewer (viewer)
        , _time_axis_view (new TimelineTimeAxisView (*this, 64))
        , _reels_view (new TimelineReelsView (*this, 32))
        , _labels_view (new TimelineLabelsView (*this))
@@ -71,14 +82,16 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film)
        , _tool (SELECT)
        , _x_scroll_rate (16)
        , _y_scroll_rate (16)
-       , _track_height (48)
+       , _pixels_per_track (48)
+       , _first_resize (true)
+       , _timer (this)
 {
 #ifndef __WXOSX__
        _labels_canvas->SetDoubleBuffered (true);
        _main_canvas->SetDoubleBuffered (true);
 #endif
 
-       wxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
+       auto sizer = new wxBoxSizer (wxHORIZONTAL);
        sizer->Add (_labels_canvas, 0, wxEXPAND);
        _labels_canvas->SetMinSize (wxSize (_labels_view->bbox().width, -1));
        sizer->Add (_main_canvas, 1, wxEXPAND);
@@ -91,33 +104,53 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film)
        _main_canvas->Bind   (wxEVT_RIGHT_DOWN, boost::bind (&Timeline::right_down,   this, _1));
        _main_canvas->Bind   (wxEVT_MOTION,     boost::bind (&Timeline::mouse_moved,  this, _1));
        _main_canvas->Bind   (wxEVT_SIZE,       boost::bind (&Timeline::resized,      this));
+       _main_canvas->Bind   (wxEVT_SCROLLWIN_TOP,        boost::bind (&Timeline::scrolled,     this, _1));
+       _main_canvas->Bind   (wxEVT_SCROLLWIN_BOTTOM,     boost::bind (&Timeline::scrolled,     this, _1));
+       _main_canvas->Bind   (wxEVT_SCROLLWIN_LINEUP,     boost::bind (&Timeline::scrolled,     this, _1));
+       _main_canvas->Bind   (wxEVT_SCROLLWIN_LINEDOWN,   boost::bind (&Timeline::scrolled,     this, _1));
+       _main_canvas->Bind   (wxEVT_SCROLLWIN_PAGEUP,     boost::bind (&Timeline::scrolled,     this, _1));
+       _main_canvas->Bind   (wxEVT_SCROLLWIN_PAGEDOWN,   boost::bind (&Timeline::scrolled,     this, _1));
+       _main_canvas->Bind   (wxEVT_SCROLLWIN_THUMBTRACK, boost::bind (&Timeline::scrolled,     this, _1));
 
-       film_changed (Film::CONTENT);
+       film_change (ChangeType::DONE, Film::Property::CONTENT);
 
-       SetMinSize (wxSize (640, 4 * track_height() + 96));
+       SetMinSize (wxSize (640, 4 * pixels_per_track() + 96));
 
-       _film_changed_connection = film->Changed.connect (bind (&Timeline::film_changed, this, _1));
-       _film_content_changed_connection = film->ContentChanged.connect (bind (&Timeline::film_content_changed, this, _2, _3));
+       _film_changed_connection = film->Change.connect (bind (&Timeline::film_change, this, _1, _2));
+       _film_content_change_connection = film->ContentChange.connect (bind (&Timeline::film_content_change, this, _1, _3, _4));
 
-       _pixels_per_second = max (0.01, static_cast<double>(640) / film->length().seconds ());
+       Bind (wxEVT_TIMER, boost::bind(&Timeline::update_playhead, this));
+       _timer.Start (200, wxTIMER_CONTINUOUS);
 
        setup_scrollbars ();
        _labels_canvas->ShowScrollbars (wxSHOW_SB_NEVER, wxSHOW_SB_NEVER);
 }
 
+void
+Timeline::update_playhead ()
+{
+       Refresh ();
+}
+
+void
+Timeline::set_pixels_per_second (double pps)
+{
+       _pixels_per_second = max (_minimum_pixels_per_second, pps);
+}
+
 void
 Timeline::paint_labels ()
 {
        wxPaintDC dc (_labels_canvas);
 
-       wxGraphicsContext* gc = wxGraphicsContext::Create (dc);
+       auto gc = wxGraphicsContext::Create (dc);
        if (!gc) {
                return;
        }
 
        int vsx, vsy;
        _labels_canvas->GetViewStart (&vsx, &vsy);
-       gc->Translate (-vsx * _x_scroll_rate, -vsy * _y_scroll_rate);
+       gc->Translate (-vsx * _x_scroll_rate, -vsy * _y_scroll_rate + tracks_y_offset());
 
        _labels_view->paint (gc, list<dcpomatic::Rect<int> >());
 
@@ -130,7 +163,7 @@ Timeline::paint_main ()
        wxPaintDC dc (_main_canvas);
        _main_canvas->DoPrepareDC (dc);
 
-       wxGraphicsContext* gc = wxGraphicsContext::Create (dc);
+       auto gc = wxGraphicsContext::Create (dc);
        if (!gc) {
                return;
        }
@@ -141,20 +174,20 @@ Timeline::paint_main ()
 
        gc->SetAntialiasMode (wxANTIALIAS_DEFAULT);
 
-       BOOST_FOREACH (shared_ptr<TimelineView> i, _views) {
+       for (auto i: _views) {
 
-               shared_ptr<TimelineContentView> ic = dynamic_pointer_cast<TimelineContentView> (i);
+               auto ic = dynamic_pointer_cast<TimelineContentView> (i);
 
                /* Find areas of overlap with other content views, so that we can plot them */
-               list<dcpomatic::Rect<int> > overlaps;
-               BOOST_FOREACH (shared_ptr<TimelineView> j, _views) {
-                       shared_ptr<TimelineContentView> jc = dynamic_pointer_cast<TimelineContentView> (j);
-                       /* No overlap with non-content views, views no different tracks, audio views or non-active views */
+               list<dcpomatic::Rect<int>> overlaps;
+               for (auto j: _views) {
+                       auto jc = dynamic_pointer_cast<TimelineContentView> (j);
+                       /* No overlap with non-content views, views on different tracks, audio views or non-active views */
                        if (!ic || !jc || i == j || ic->track() != jc->track() || ic->track().get_value_or(2) >= 2 || !ic->active() || !jc->active()) {
                                continue;
                        }
 
-                       optional<dcpomatic::Rect<int> > r = j->bbox().intersection (i->bbox());
+                       auto r = j->bbox().intersection(i->bbox());
                        if (r) {
                                overlaps.push_back (r.get ());
                        }
@@ -171,21 +204,37 @@ Timeline::paint_main ()
                gc->DrawRectangle (
                        min (_down_point.x, _zoom_point->x),
                        min (_down_point.y, _zoom_point->y),
-                       fabs (_down_point.x - _zoom_point->x),
-                       fabs (_down_point.y - _zoom_point->y)
+                       abs (_down_point.x - _zoom_point->x),
+                       abs (_down_point.y - _zoom_point->y)
                        );
        }
 
+       /* Playhead */
+
+       auto vp = _viewer.lock ();
+       DCPOMATIC_ASSERT (vp);
+
+       gc->SetPen (*wxRED_PEN);
+       auto path = gc->CreatePath ();
+       double const ph = vp->position().seconds() * pixels_per_second().get_value_or(0);
+       path.MoveToPoint (ph, 0);
+       path.AddLineToPoint (ph, pixels_per_track() * _tracks + 32);
+       gc->StrokePath (path);
+
        delete gc;
 }
 
 void
-Timeline::film_changed (Film::Property p)
+Timeline::film_change (ChangeType type, Film::Property p)
 {
-       if (p == Film::CONTENT || p == Film::REEL_TYPE || p == Film::REEL_LENGTH) {
+       if (type != ChangeType::DONE) {
+               return;
+       }
+
+       if (p == Film::Property::CONTENT || p == Film::Property::REEL_TYPE || p == Film::Property::REEL_LENGTH) {
                ensure_ui_thread ();
                recreate_views ();
-       } else if (p == Film::CONTENT_ORDER) {
+       } else if (p == Film::Property::CONTENT_ORDER) {
                Refresh ();
        }
 }
@@ -193,7 +242,7 @@ Timeline::film_changed (Film::Property p)
 void
 Timeline::recreate_views ()
 {
-       shared_ptr<const Film> film = _film.lock ();
+       auto film = _film.lock ();
        if (!film) {
                return;
        }
@@ -202,21 +251,21 @@ Timeline::recreate_views ()
        _views.push_back (_time_axis_view);
        _views.push_back (_reels_view);
 
-       BOOST_FOREACH (shared_ptr<Content> i, film->content ()) {
+       for (auto i: film->content ()) {
                if (i->video) {
-                       _views.push_back (shared_ptr<TimelineView> (new TimelineVideoContentView (*this, i)));
+                       _views.push_back (make_shared<TimelineVideoContentView>(*this, i));
                }
 
                if (i->audio && !i->audio->mapping().mapped_output_channels().empty ()) {
-                       _views.push_back (shared_ptr<TimelineView> (new TimelineAudioContentView (*this, i)));
+                       _views.push_back (make_shared<TimelineAudioContentView>(*this, i));
                }
 
-               if (i->subtitle) {
-                       _views.push_back (shared_ptr<TimelineView> (new TimelineSubtitleContentView (*this, i)));
+               for (auto j: i->text) {
+                       _views.push_back (make_shared<TimelineTextContentView>(*this, i, j));
                }
 
-               if (dynamic_pointer_cast<AtmosMXFContent> (i)) {
-                       _views.push_back (shared_ptr<TimelineView> (new TimelineAtmosContentView (*this, i)));
+               if (i->atmos) {
+                       _views.push_back (make_shared<TimelineAtmosContentView>(*this, i));
                }
        }
 
@@ -226,12 +275,18 @@ Timeline::recreate_views ()
 }
 
 void
-Timeline::film_content_changed (int property, bool frequent)
+Timeline::film_content_change (ChangeType type, int property, bool frequent)
 {
+       if (type != ChangeType::DONE) {
+               return;
+       }
+
        ensure_ui_thread ();
 
-       if (property == AudioContentProperty::STREAMS) {
+       if (property == AudioContentProperty::STREAMS || property == VideoContentProperty::FRAME_TYPE) {
                recreate_views ();
+       } else if (property == ContentProperty::POSITION || property == ContentProperty::LENGTH) {
+               _reels_view->force_redraw ();
        } else if (!frequent) {
                setup_scrollbars ();
                Refresh ();
@@ -240,35 +295,35 @@ Timeline::film_content_changed (int property, bool frequent)
 
 template <class T>
 int
-place (TimelineViewList& views, int& tracks)
+place (shared_ptr<const Film> film, TimelineViewList& views, int& tracks)
 {
        int const base = tracks;
 
-       BOOST_FOREACH (shared_ptr<TimelineView> i, views) {
+       for (auto i: views) {
                if (!dynamic_pointer_cast<T>(i)) {
                        continue;
                }
 
-               shared_ptr<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView> (i);
+               auto cv = dynamic_pointer_cast<TimelineContentView> (i);
 
                int t = base;
 
-               shared_ptr<Content> content = cv->content();
-               DCPTimePeriod const content_period (content->position(), content->end());
+               auto content = cv->content();
+               DCPTimePeriod const content_period (content->position(), content->end(film));
 
                while (true) {
-                       TimelineViewList::iterator j = views.begin();
+                       auto j = views.begin();
                        while (j != views.end()) {
-                               shared_ptr<T> test = dynamic_pointer_cast<T> (*j);
+                               auto test = dynamic_pointer_cast<T> (*j);
                                if (!test) {
                                        ++j;
                                        continue;
                                }
 
-                               shared_ptr<Content> test_content = test->content();
+                               auto test_content = test->content();
                                if (
                                        test->track() && test->track().get() == t &&
-                                       content_period.overlap(DCPTimePeriod(test_content->position(), test_content->end()))) {
+                                       content_period.overlap(DCPTimePeriod(test_content->position(), test_content->end(film)))) {
                                        /* we have an overlap on track `t' */
                                        ++t;
                                        break;
@@ -290,25 +345,49 @@ place (TimelineViewList& views, int& tracks)
        return tracks - base;
 }
 
+/** Compare the mapped output channels of two TimelineViews, so we can into
+ *  order of first mapped DCP channel.
+ */
+struct AudioMappingComparator {
+       bool operator()(shared_ptr<TimelineView> a, shared_ptr<TimelineView> b) {
+               int la = -1;
+               auto cva = dynamic_pointer_cast<TimelineAudioContentView>(a);
+               if (cva) {
+                       auto oc = cva->content()->audio->mapping().mapped_output_channels();
+                       la = *min_element(boost::begin(oc), boost::end(oc));
+               }
+               int lb = -1;
+               auto cvb = dynamic_pointer_cast<TimelineAudioContentView>(b);
+               if (cvb) {
+                       auto oc = cvb->content()->audio->mapping().mapped_output_channels();
+                       lb = *min_element(boost::begin(oc), boost::end(oc));
+               }
+               return la < lb;
+       }
+};
+
 void
 Timeline::assign_tracks ()
 {
        /* Tracks are:
           Video (mono or left-eye)
           Video (right-eye)
-          Subtitle 1
-          Subtitle 2
-          Subtitle N
+          Text 1
+          Text 2
+          Text N
           Atmos
           Audio 1
           Audio 2
           Audio N
        */
 
+       auto film = _film.lock ();
+       DCPOMATIC_ASSERT (film);
+
        _tracks = 0;
 
-       for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
-               shared_ptr<TimelineContentView> c = dynamic_pointer_cast<TimelineContentView> (*i);
+       for (auto i: _views) {
+               auto c = dynamic_pointer_cast<TimelineContentView>(i);
                if (c) {
                        c->unset_track ();
                }
@@ -317,14 +396,14 @@ Timeline::assign_tracks ()
        /* Video */
 
        bool have_3d = false;
-       BOOST_FOREACH (shared_ptr<TimelineView> i, _views) {
-               shared_ptr<TimelineVideoContentView> cv = dynamic_pointer_cast<TimelineVideoContentView> (i);
+       for (auto i: _views) {
+               auto cv = dynamic_pointer_cast<TimelineVideoContentView>(i);
                if (!cv) {
                        continue;
                }
 
                /* Video on tracks 0 and maybe 1 (left and right eye) */
-               if (cv->content()->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
+               if (cv->content()->video->frame_type() == VideoFrameType::THREE_D_RIGHT) {
                        cv->set_track (1);
                        _tracks = max (_tracks, 2);
                        have_3d = true;
@@ -335,20 +414,17 @@ Timeline::assign_tracks ()
 
        _tracks = max (_tracks, 1);
 
-       /* Subtitle */
+       /* Texts */
 
-       int const subtitle_tracks = place<TimelineSubtitleContentView> (_views, _tracks);
+       int const text_tracks = place<TimelineTextContentView> (film, _views, _tracks);
 
        /* Atmos */
 
        bool have_atmos = false;
-       BOOST_FOREACH (shared_ptr<TimelineView> i, _views) {
-               shared_ptr<TimelineVideoContentView> cv = dynamic_pointer_cast<TimelineVideoContentView> (i);
-               if (!cv) {
-                       continue;
-               }
-               if (dynamic_pointer_cast<TimelineAtmosContentView> (i)) {
-                       cv->set_track (_tracks - 1);
+       for (auto i: _views) {
+               auto cv = dynamic_pointer_cast<TimelineAtmosContentView>(i);
+               if (cv) {
+                       cv->set_track (_tracks);
                        have_atmos = true;
                }
        }
@@ -357,15 +433,20 @@ Timeline::assign_tracks ()
                ++_tracks;
        }
 
-       /* Audio */
+       /* Audio.  We're sorting the views so that we get the audio views in order of increasing
+          DCP channel index.
+       */
 
-       place<TimelineAudioContentView> (_views, _tracks);
+       auto views = _views;
+       sort(views.begin(), views.end(), AudioMappingComparator());
+       int const audio_tracks = place<TimelineAudioContentView> (film, views, _tracks);
 
        _labels_view->set_3d (have_3d);
-       _labels_view->set_subtitle_tracks (subtitle_tracks);
+       _labels_view->set_audio_tracks (audio_tracks);
+       _labels_view->set_text_tracks (text_tracks);
        _labels_view->set_atmos (have_atmos);
 
-       _time_axis_view->set_y (tracks() * track_height() + 64);
+       _time_axis_view->set_y (tracks());
        _reels_view->set_y (8);
 }
 
@@ -378,13 +459,16 @@ Timeline::tracks () const
 void
 Timeline::setup_scrollbars ()
 {
-       shared_ptr<const Film> film = _film.lock ();
+       auto film = _film.lock ();
        if (!film || !_pixels_per_second) {
                return;
        }
-       _labels_canvas->SetVirtualSize (_labels_view->bbox().width, tracks() * track_height() + 96);
+
+       int const h = tracks() * pixels_per_track() + tracks_y_offset() + _time_axis_view->bbox().height;
+
+       _labels_canvas->SetVirtualSize (_labels_view->bbox().width, h);
        _labels_canvas->SetScrollRate (_x_scroll_rate, _y_scroll_rate);
-       _main_canvas->SetVirtualSize (*_pixels_per_second * film->length().seconds(), tracks() * track_height() + 96);
+       _main_canvas->SetVirtualSize (*_pixels_per_second * film->length().seconds(), h);
        _main_canvas->SetScrollRate (_x_scroll_rate, _y_scroll_rate);
 }
 
@@ -392,15 +476,19 @@ shared_ptr<TimelineView>
 Timeline::event_to_view (wxMouseEvent& ev)
 {
        /* Search backwards through views so that we find the uppermost one first */
-       TimelineViewList::reverse_iterator i = _views.rbegin();
-       Position<int> const p (ev.GetX(), ev.GetY());
+       auto i = _views.rbegin();
+
+       int vsx, vsy;
+       _main_canvas->GetViewStart (&vsx, &vsy);
+       Position<int> const p (ev.GetX() + vsx * _x_scroll_rate, ev.GetY() + vsy * _y_scroll_rate);
+
        while (i != _views.rend() && !(*i)->bbox().contains (p)) {
-               shared_ptr<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView> (*i);
+               auto cv = dynamic_pointer_cast<TimelineContentView>(*i);
                ++i;
        }
 
        if (i == _views.rend ()) {
-               return shared_ptr<TimelineView> ();
+               return {};
        }
 
        return *i;
@@ -417,6 +505,9 @@ Timeline::left_down (wxMouseEvent& ev)
                left_down_select (ev);
                break;
        case ZOOM:
+       case ZOOM_ALL:
+       case SNAP:
+       case SEQUENCE:
                /* Nothing to do */
                break;
        }
@@ -425,8 +516,8 @@ Timeline::left_down (wxMouseEvent& ev)
 void
 Timeline::left_down_select (wxMouseEvent& ev)
 {
-       shared_ptr<TimelineView> view = event_to_view (ev);
-       shared_ptr<TimelineContentView> content_view = dynamic_pointer_cast<TimelineContentView> (view);
+       auto view = event_to_view (ev);
+       auto content_view = dynamic_pointer_cast<TimelineContentView>(view);
 
        _down_view.reset ();
 
@@ -435,14 +526,14 @@ Timeline::left_down_select (wxMouseEvent& ev)
                _down_view_position = content_view->content()->position ();
        }
 
-       for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
-               shared_ptr<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView> (*i);
+       for (auto i: _views) {
+               auto cv = dynamic_pointer_cast<TimelineContentView>(i);
                if (!cv) {
                        continue;
                }
 
                if (!ev.ShiftDown ()) {
-                       cv->set_selected (view == *i);
+                       cv->set_selected (view == i);
                }
        }
 
@@ -454,18 +545,21 @@ Timeline::left_down_select (wxMouseEvent& ev)
 
        if (_down_view) {
                /* Pre-compute the points that we might snap to */
-               for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
-                       shared_ptr<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView> (*i);
+               for (auto i: _views) {
+                       auto cv = dynamic_pointer_cast<TimelineContentView>(i);
                        if (!cv || cv == _down_view || cv->content() == _down_view->content()) {
                                continue;
                        }
 
+                       auto film = _film.lock ();
+                       DCPOMATIC_ASSERT (film);
+
                        _start_snaps.push_back (cv->content()->position());
                        _end_snaps.push_back (cv->content()->position());
-                       _start_snaps.push_back (cv->content()->end());
-                       _end_snaps.push_back (cv->content()->end());
+                       _start_snaps.push_back (cv->content()->end(film));
+                       _end_snaps.push_back (cv->content()->end(film));
 
-                       BOOST_FOREACH (DCPTime i, cv->content()->reel_split_points()) {
+                       for (auto i: cv->content()->reel_split_points(film)) {
                                _start_snaps.push_back (i);
                        }
                }
@@ -487,6 +581,10 @@ Timeline::left_up (wxMouseEvent& ev)
        case ZOOM:
                left_up_zoom (ev);
                break;
+       case ZOOM_ALL:
+       case SNAP:
+       case SEQUENCE:
+               break;
        }
 }
 
@@ -498,7 +596,12 @@ Timeline::left_up_select (wxMouseEvent& ev)
        }
 
        _content_panel->set_selection (selected_content ());
-       set_position_from_event (ev);
+       /* Since we may have just set change signals back to `not-frequent', we have to
+          make sure this position change is signalled, even if the position value has
+          not changed since the last time it was set (with frequent=true).  This is
+          a bit of a hack.
+       */
+       set_position_from_event (ev, true);
 
        /* Clear up up the stuff we don't do during drag */
        assign_tracks ();
@@ -520,22 +623,34 @@ Timeline::left_up_zoom (wxMouseEvent& ev)
        wxPoint top_left(min(_down_point.x, _zoom_point->x), min(_down_point.y, _zoom_point->y));
        wxPoint bottom_right(max(_down_point.x, _zoom_point->x), max(_down_point.y, _zoom_point->y));
 
-       DCPTime const time_left = DCPTime::from_seconds((top_left.x + vsx) / *_pixels_per_second);
-       DCPTime const time_right = DCPTime::from_seconds((bottom_right.x + vsx) / *_pixels_per_second);
-       _pixels_per_second = GetSize().GetWidth() / (time_right.seconds() - time_left.seconds());
+       if ((bottom_right.x - top_left.x) < 8 || (bottom_right.y - top_left.y) < 8) {
+               /* Very small zoom rectangle: we assume it wasn't intentional */
+               return;
+       }
 
-       double const tracks_top = double(top_left.y) / _track_height;
-       double const tracks_bottom = double(bottom_right.y) / _track_height;
-       _track_height = GetSize().GetHeight() / (tracks_bottom - tracks_top);
+       auto const time_left = DCPTime::from_seconds((top_left.x + vsx) / *_pixels_per_second);
+       auto const time_right = DCPTime::from_seconds((bottom_right.x + vsx) / *_pixels_per_second);
+       set_pixels_per_second (double(GetSize().GetWidth()) / (time_right.seconds() - time_left.seconds()));
+
+       double const tracks_top = double(top_left.y - tracks_y_offset()) / _pixels_per_track;
+       double const tracks_bottom = double(bottom_right.y - tracks_y_offset()) / _pixels_per_track;
+       set_pixels_per_track (lrint(GetSize().GetHeight() / (tracks_bottom - tracks_top)));
 
        setup_scrollbars ();
-       _main_canvas->Scroll (time_left.seconds() * *_pixels_per_second / _x_scroll_rate, tracks_top * _track_height / _y_scroll_rate);
-       _labels_canvas->Scroll (0, tracks_top * _track_height / _y_scroll_rate);
+       int const y = (tracks_top * _pixels_per_track + tracks_y_offset()) / _y_scroll_rate;
+       _main_canvas->Scroll (time_left.seconds() * *_pixels_per_second / _x_scroll_rate, y);
+       _labels_canvas->Scroll (0, y);
 
        _zoom_point = optional<wxPoint> ();
        Refresh ();
 }
 
+void
+Timeline::set_pixels_per_track (int h)
+{
+       _pixels_per_track = max(_minimum_pixels_per_track, h);
+}
+
 void
 Timeline::mouse_moved (wxMouseEvent& ev)
 {
@@ -546,6 +661,10 @@ Timeline::mouse_moved (wxMouseEvent& ev)
        case ZOOM:
                mouse_moved_zoom (ev);
                break;
+       case ZOOM_ALL:
+       case SNAP:
+       case SEQUENCE:
+               break;
        }
 }
 
@@ -579,9 +698,14 @@ Timeline::right_down (wxMouseEvent& ev)
                break;
        case ZOOM:
                /* Zoom out */
-               _pixels_per_second = *_pixels_per_second / 2;
-               _track_height = max (8, _track_height / 2);
+               set_pixels_per_second (*_pixels_per_second / 2);
+               set_pixels_per_track (_pixels_per_track / 2);
                setup_scrollbars ();
+               Refresh ();
+               break;
+       case ZOOM_ALL:
+       case SNAP:
+       case SEQUENCE:
                break;
        }
 }
@@ -589,8 +713,8 @@ Timeline::right_down (wxMouseEvent& ev)
 void
 Timeline::right_down_select (wxMouseEvent& ev)
 {
-       shared_ptr<TimelineView> view = event_to_view (ev);
-       shared_ptr<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView> (view);
+       auto view = event_to_view (ev);
+       auto cv = dynamic_pointer_cast<TimelineContentView> (view);
        if (!cv) {
                return;
        }
@@ -606,14 +730,14 @@ Timeline::right_down_select (wxMouseEvent& ev)
 void
 Timeline::maybe_snap (DCPTime a, DCPTime b, optional<DCPTime>& nearest_distance) const
 {
-       DCPTime const d = a - b;
+       auto const d = a - b;
        if (!nearest_distance || d.abs() < nearest_distance.get().abs()) {
                nearest_distance = d;
        }
 }
 
 void
-Timeline::set_position_from_event (wxMouseEvent& ev)
+Timeline::set_position_from_event (wxMouseEvent& ev, bool force_emit)
 {
        if (!_pixels_per_second) {
                return;
@@ -621,7 +745,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
 
        double const pps = _pixels_per_second.get ();
 
-       wxPoint const p = ev.GetPosition();
+       auto const p = ev.GetPosition();
 
        if (!_first_move) {
                /* We haven't moved yet; in that case, we must move the mouse some reasonable distance
@@ -638,11 +762,13 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
                return;
        }
 
-       DCPTime new_position = _down_view_position + DCPTime::from_seconds ((p.x - _down_point.x) / pps);
+       auto new_position = _down_view_position + DCPTime::from_seconds ((p.x - _down_point.x) / pps);
 
-       if (_snap) {
+       auto film = _film.lock ();
+       DCPOMATIC_ASSERT (film);
 
-               DCPTime const new_end = new_position + _down_view->content()->length_after_trim();
+       if (_snap) {
+               auto const new_end = new_position + _down_view->content()->length_after_trim(film);
                /* Signed `distance' to nearest thing (i.e. negative is left on the timeline,
                   positive is right).
                */
@@ -650,11 +776,11 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
 
                /* Find the nearest snap point */
 
-               BOOST_FOREACH (DCPTime i, _start_snaps) {
+               for (auto i: _start_snaps) {
                        maybe_snap (i, new_position, nearest_distance);
                }
 
-               BOOST_FOREACH (DCPTime i, _end_snaps) {
+               for (auto i: _end_snaps) {
                        maybe_snap (i, new_end, nearest_distance);
                }
 
@@ -670,17 +796,15 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
                new_position = DCPTime ();
        }
 
-       _down_view->content()->set_position (new_position);
+       _down_view->content()->set_position (film, new_position, force_emit);
 
-       shared_ptr<Film> film = _film.lock ();
-       DCPOMATIC_ASSERT (film);
        film->set_sequence (false);
 }
 
 void
 Timeline::force_redraw (dcpomatic::Rect<int> const & r)
 {
-       RefreshRect (wxRect (r.x, r.y, r.width, r.height), false);
+       _main_canvas->RefreshRect (wxRect (r.x, r.y, r.width, r.height), false);
 }
 
 shared_ptr<const Film>
@@ -692,14 +816,18 @@ Timeline::film () const
 void
 Timeline::resized ()
 {
+       if (_main_canvas->GetSize().GetWidth() > 0 && _first_resize) {
+               zoom_all ();
+               _first_resize = false;
+       }
        setup_scrollbars ();
 }
 
 void
 Timeline::clear_selection ()
 {
-       for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
-               shared_ptr<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView> (*i);
+       for (auto i: _views) {
+               shared_ptr<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView>(i);
                if (cv) {
                        cv->set_selected (false);
                }
@@ -711,8 +839,8 @@ Timeline::selected_views () const
 {
        TimelineContentViewList sel;
 
-       for (TimelineViewList::const_iterator i = _views.begin(); i != _views.end(); ++i) {
-               shared_ptr<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView> (*i);
+       for (auto i: _views) {
+               auto cv = dynamic_pointer_cast<TimelineContentView>(i);
                if (cv && cv->selected()) {
                        sel.push_back (cv);
                }
@@ -725,10 +853,9 @@ ContentList
 Timeline::selected_content () const
 {
        ContentList sel;
-       TimelineContentViewList views = selected_views ();
 
-       for (TimelineContentViewList::const_iterator i = views.begin(); i != views.end(); ++i) {
-               sel.push_back ((*i)->content ());
+       for (auto i: selected_views()) {
+               sel.push_back(i->content());
        }
 
        return sel;
@@ -737,10 +864,63 @@ Timeline::selected_content () const
 void
 Timeline::set_selection (ContentList selection)
 {
-       for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
-               shared_ptr<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView> (*i);
+       for (auto i: _views) {
+               auto cv = dynamic_pointer_cast<TimelineContentView> (i);
                if (cv) {
                        cv->set_selected (find (selection.begin(), selection.end(), cv->content ()) != selection.end ());
                }
        }
 }
+
+int
+Timeline::tracks_y_offset () const
+{
+       return _reels_view->bbox().height + 4;
+}
+
+int
+Timeline::width () const
+{
+       return _main_canvas->GetVirtualSize().GetWidth();
+}
+
+void
+Timeline::scrolled (wxScrollWinEvent& ev)
+{
+       if (ev.GetOrientation() == wxVERTICAL) {
+               int x, y;
+               _main_canvas->GetViewStart (&x, &y);
+               _labels_canvas->Scroll (0, y);
+       }
+       ev.Skip ();
+}
+
+void
+Timeline::tool_clicked (Tool t)
+{
+       switch (t) {
+       case ZOOM:
+       case SELECT:
+               _tool = t;
+               break;
+       case ZOOM_ALL:
+               zoom_all ();
+               break;
+       case SNAP:
+       case SEQUENCE:
+               break;
+       }
+}
+
+void
+Timeline::zoom_all ()
+{
+       auto film = _film.lock ();
+       DCPOMATIC_ASSERT (film);
+       set_pixels_per_second ((_main_canvas->GetSize().GetWidth() - 32) / film->length().seconds());
+       set_pixels_per_track ((_main_canvas->GetSize().GetHeight() - tracks_y_offset() - _time_axis_view->bbox().height - 32) / _tracks);
+       setup_scrollbars ();
+       _main_canvas->Scroll (0, 0);
+       _labels_canvas->Scroll (0, 0);
+       Refresh ();
+}