Remove PositionChanged in favour of consumers having their own GUI-thread timers.
[dcpomatic.git] / src / wx / timeline.cc
index 2a0f96f05d1eedcbc3e7b09ebf20ead7f4328a0f..9f71847f5c626dfb7e39690c91010e19d4f54252 100644 (file)
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #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 std::abs;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::bind;
 using boost::optional;
+using namespace dcpomatic;
+
+/* 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)
-       : wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)
+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))
@@ -64,45 +77,106 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film)
        , _first_move (false)
        , _menu (this)
        , _snap (true)
+       , _tool (SELECT)
+       , _x_scroll_rate (16)
+       , _y_scroll_rate (16)
+       , _pixels_per_track (48)
+       , _first_resize (true)
+       , _timer (this)
 {
 #ifndef __WXOSX__
-       SetDoubleBuffered (true);
+       _labels_canvas->SetDoubleBuffered (true);
+       _main_canvas->SetDoubleBuffered (true);
 #endif
 
-       Bind (wxEVT_PAINT,      boost::bind (&Timeline::paint,       this));
-       Bind (wxEVT_LEFT_DOWN,  boost::bind (&Timeline::left_down,   this, _1));
-       Bind (wxEVT_LEFT_UP,    boost::bind (&Timeline::left_up,     this, _1));
-       Bind (wxEVT_RIGHT_DOWN, boost::bind (&Timeline::right_down,  this, _1));
-       Bind (wxEVT_MOTION,     boost::bind (&Timeline::mouse_moved, this, _1));
-       Bind (wxEVT_SIZE,       boost::bind (&Timeline::resized,     this));
+       wxSizer* 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);
+       SetSizer (sizer);
+
+       _labels_canvas->Bind (wxEVT_PAINT,      boost::bind (&Timeline::paint_labels, this));
+       _main_canvas->Bind   (wxEVT_PAINT,      boost::bind (&Timeline::paint_main,   this));
+       _main_canvas->Bind   (wxEVT_LEFT_DOWN,  boost::bind (&Timeline::left_down,    this, _1));
+       _main_canvas->Bind   (wxEVT_LEFT_UP,    boost::bind (&Timeline::left_up,      this, _1));
+       _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_change (CHANGE_TYPE_DONE, Film::CONTENT);
+
+       SetMinSize (wxSize (640, 4 * pixels_per_track() + 96));
+
+       _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));
+
+       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);
 
-       film_changed (Film::CONTENT);
+       wxGraphicsContext* gc = wxGraphicsContext::Create (dc);
+       if (!gc) {
+               return;
+       }
 
-       SetMinSize (wxSize (640, tracks() * track_height() + 96));
+       int vsx, vsy;
+       _labels_canvas->GetViewStart (&vsx, &vsy);
+       gc->Translate (-vsx * _x_scroll_rate, -vsy * _y_scroll_rate + tracks_y_offset());
 
-       _tracks_position = Position<int> (_labels_view->bbox().width, 32);
+       _labels_view->paint (gc, list<dcpomatic::Rect<int> >());
 
-       _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));
+       delete gc;
 }
 
 void
-Timeline::paint ()
+Timeline::paint_main ()
 {
-       wxPaintDC dc (this);
+       wxPaintDC dc (_main_canvas);
+       _main_canvas->DoPrepareDC (dc);
 
        wxGraphicsContext* gc = wxGraphicsContext::Create (dc);
        if (!gc) {
                return;
        }
 
+       int vsx, vsy;
+       _main_canvas->GetViewStart (&vsx, &vsy);
+       gc->Translate (-vsx * _x_scroll_rate, -vsy * _y_scroll_rate);
+
        gc->SetAntialiasMode (wxANTIALIAS_DEFAULT);
 
        BOOST_FOREACH (shared_ptr<TimelineView> i, _views) {
 
                shared_ptr<TimelineContentView> ic = dynamic_pointer_cast<TimelineContentView> (i);
 
-               /* Find areas of overlap */
+               /* 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);
@@ -120,12 +194,41 @@ Timeline::paint ()
                i->paint (gc, overlaps);
        }
 
+       if (_zoom_point) {
+               /* Translate back as _down_point and _zoom_point do not take scroll into account */
+               gc->Translate (vsx * _x_scroll_rate, vsy * _y_scroll_rate);
+               gc->SetPen (*wxBLACK_PEN);
+               gc->SetBrush (*wxTRANSPARENT_BRUSH);
+               gc->DrawRectangle (
+                       min (_down_point.x, _zoom_point->x),
+                       min (_down_point.y, _zoom_point->y),
+                       abs (_down_point.x - _zoom_point->x),
+                       abs (_down_point.y - _zoom_point->y)
+                       );
+       }
+
+       /* Playhead */
+
+       shared_ptr<FilmViewer> vp = _viewer.lock ();
+       DCPOMATIC_ASSERT (vp);
+
+       gc->SetPen (*wxRED_PEN);
+       wxGraphicsPath 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 (type != CHANGE_TYPE_DONE) {
+               return;
+       }
+
        if (p == Film::CONTENT || p == Film::REEL_TYPE || p == Film::REEL_LENGTH) {
                ensure_ui_thread ();
                recreate_views ();
@@ -145,7 +248,6 @@ Timeline::recreate_views ()
        _views.clear ();
        _views.push_back (_time_axis_view);
        _views.push_back (_reels_view);
-       _views.push_back (_labels_view);
 
        BOOST_FOREACH (shared_ptr<Content> i, film->content ()) {
                if (i->video) {
@@ -156,8 +258,8 @@ Timeline::recreate_views ()
                        _views.push_back (shared_ptr<TimelineView> (new TimelineAudioContentView (*this, i)));
                }
 
-               if (i->subtitle) {
-                       _views.push_back (shared_ptr<TimelineView> (new TimelineSubtitleContentView (*this, i)));
+               BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
+                       _views.push_back (shared_ptr<TimelineView> (new TimelineTextContentView (*this, i, j)));
                }
 
                if (dynamic_pointer_cast<AtmosMXFContent> (i)) {
@@ -166,26 +268,122 @@ Timeline::recreate_views ()
        }
 
        assign_tracks ();
-       setup_pixels_per_second ();
+       setup_scrollbars ();
        Refresh ();
 }
 
 void
-Timeline::film_content_changed (int property, bool frequent)
+Timeline::film_content_change (ChangeType type, int property, bool frequent)
 {
+       if (type != CHANGE_TYPE_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_pixels_per_second ();
+               setup_scrollbars ();
                Refresh ();
        }
 }
 
+template <class T>
+int
+place (shared_ptr<const Film> film, TimelineViewList& views, int& tracks)
+{
+       int const base = tracks;
+
+       BOOST_FOREACH (shared_ptr<TimelineView> i, views) {
+               if (!dynamic_pointer_cast<T>(i)) {
+                       continue;
+               }
+
+               shared_ptr<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView> (i);
+
+               int t = base;
+
+               shared_ptr<Content> content = cv->content();
+               DCPTimePeriod const content_period (content->position(), content->end(film));
+
+               while (true) {
+                       TimelineViewList::iterator j = views.begin();
+                       while (j != views.end()) {
+                               shared_ptr<T> test = dynamic_pointer_cast<T> (*j);
+                               if (!test) {
+                                       ++j;
+                                       continue;
+                               }
+
+                               shared_ptr<Content> test_content = test->content();
+                               if (
+                                       test->track() && test->track().get() == t &&
+                                       content_period.overlap(DCPTimePeriod(test_content->position(), test_content->end(film)))) {
+                                       /* we have an overlap on track `t' */
+                                       ++t;
+                                       break;
+                               }
+
+                               ++j;
+                       }
+
+                       if (j == views.end ()) {
+                               /* no overlap on `t' */
+                               break;
+                       }
+               }
+
+               cv->set_track (t);
+               tracks = max (tracks, t + 1);
+       }
+
+       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;
+               shared_ptr<TimelineAudioContentView> cva = dynamic_pointer_cast<TimelineAudioContentView>(a);
+               if (cva) {
+                       list<int> oc = cva->content()->audio->mapping().mapped_output_channels();
+                       la = *min_element(boost::begin(oc), boost::end(oc));
+               }
+               int lb = -1;
+               shared_ptr<TimelineAudioContentView> cvb = dynamic_pointer_cast<TimelineAudioContentView>(b);
+               if (cvb) {
+                       list<int> 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)
+          Text 1
+          Text 2
+          Text N
+          Atmos
+          Audio 1
+          Audio 2
+          Audio N
+       */
+
+       shared_ptr<const Film> 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);
                if (c) {
@@ -193,95 +391,63 @@ Timeline::assign_tracks ()
                }
        }
 
-       /* See if we have any subtitle / atmos / right-eye views */
+       /* Video */
+
        bool have_3d = false;
-       bool have_subtitle = false;
-       bool have_atmos = false;
        BOOST_FOREACH (shared_ptr<TimelineView> i, _views) {
-               shared_ptr<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView> (i);
+               shared_ptr<TimelineVideoContentView> cv = dynamic_pointer_cast<TimelineVideoContentView> (i);
                if (!cv) {
                        continue;
                }
 
-               if (dynamic_pointer_cast<TimelineVideoContentView> (i)) {
-                       if (cv->content()->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
-                               have_3d = true;
-                       }
-               } else if (dynamic_pointer_cast<TimelineSubtitleContentView> (i)) {
-                       have_subtitle = true;
-               } else if (dynamic_pointer_cast<TimelineAtmosContentView> (i)) {
-                       have_atmos = true;
+               /* Video on tracks 0 and maybe 1 (left and right eye) */
+               if (cv->content()->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
+                       cv->set_track (1);
+                       _tracks = max (_tracks, 2);
+                       have_3d = true;
+               } else {
+                       cv->set_track (0);
                }
        }
 
-       _labels_view->set_3d (have_3d);
-       _labels_view->set_subtitle (have_subtitle);
-       _labels_view->set_atmos (have_atmos);
+       _tracks = max (_tracks, 1);
 
-       /* Hence decide where to start subtitle, atmos and audio tracks */
-       int const subtitle = have_3d ? 2 : 1;
-       int const atmos = have_subtitle ? subtitle + 1 : subtitle;
-       int const audio = have_atmos ? atmos + 1: atmos;
+       /* Texts */
 
-       for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
-               shared_ptr<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView> (*i);
+       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<TimelineVideoContentView> (*i)) {
-                       /* Video on tracks 0 and maybe 1 (left and right eye) */
-                       cv->set_track (cv->content()->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT ? 1 : 0);
-                       _tracks = max (_tracks, have_3d ? 2 : 1);
-                       continue;
-               } else if (dynamic_pointer_cast<TimelineSubtitleContentView> (*i)) {
-                       cv->set_track (subtitle);
-                       _tracks = max (_tracks, subtitle + 1);
-                       continue;
-               } else if (dynamic_pointer_cast<TimelineAtmosContentView> (*i)) {
-                       cv->set_track (atmos);
-                       _tracks = max (_tracks, atmos + 1);
-                       continue;
+               if (dynamic_pointer_cast<TimelineAtmosContentView> (i)) {
+                       cv->set_track (_tracks - 1);
+                       have_atmos = true;
                }
+       }
 
-               int t = audio;
-
-               shared_ptr<Content> content = cv->content();
-               DCPTimePeriod content_period (content->position(), content->end());
-
-               while (true) {
-                       TimelineViewList::iterator j = _views.begin();
-                       while (j != _views.end()) {
-                               shared_ptr<TimelineAudioContentView> test = dynamic_pointer_cast<TimelineAudioContentView> (*j);
-                               if (!test) {
-                                       ++j;
-                                       continue;
-                               }
-
-                               shared_ptr<Content> test_content = test->content();
-
-                               if (test && test->track() && test->track().get() == t) {
-                                       if (content_period.overlaps (DCPTimePeriod(test_content->position(), test_content->end()))) {
-                                               /* we have an overlap on track `t' */
-                                               ++t;
-                                               break;
-                                       }
-                               }
+       if (have_atmos) {
+               ++_tracks;
+       }
 
-                               ++j;
-                       }
+       /* Audio.  We're sorting the views so that we get the audio views in order of increasing
+          DCP channel index.
+       */
 
-                       if (j == _views.end ()) {
-                               /* no overlap on `t' */
-                               break;
-                       }
-               }
+       TimelineViewList views = _views;
+       sort(views.begin(), views.end(), AudioMappingComparator());
+       int const audio_tracks = place<TimelineAudioContentView> (film, views, _tracks);
 
-               cv->set_track (t);
-               _tracks = max (_tracks, t + 1);
-       }
+       _labels_view->set_3d (have_3d);
+       _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);
 }
 
@@ -292,14 +458,19 @@ Timeline::tracks () const
 }
 
 void
-Timeline::setup_pixels_per_second ()
+Timeline::setup_scrollbars ()
 {
        shared_ptr<const Film> film = _film.lock ();
-       if (!film || film->length() == DCPTime ()) {
+       if (!film || !_pixels_per_second) {
                return;
        }
 
-       _pixels_per_second = static_cast<double>(width() - tracks_position().x * 2) / film->length().seconds ();
+       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(), h);
+       _main_canvas->SetScrollRate (_x_scroll_rate, _y_scroll_rate);
 }
 
 shared_ptr<TimelineView>
@@ -307,7 +478,11 @@ 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());
+
+       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);
                ++i;
@@ -322,6 +497,25 @@ Timeline::event_to_view (wxMouseEvent& ev)
 
 void
 Timeline::left_down (wxMouseEvent& ev)
+{
+       _left_down = true;
+       _down_point = ev.GetPosition ();
+
+       switch (_tool) {
+       case SELECT:
+               left_down_select (ev);
+               break;
+       case ZOOM:
+       case ZOOM_ALL:
+       case SNAP:
+       case SEQUENCE:
+               /* Nothing to do */
+               break;
+       }
+}
+
+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);
@@ -348,8 +542,6 @@ Timeline::left_down (wxMouseEvent& ev)
                content_view->set_selected (!content_view->selected ());
        }
 
-       _left_down = true;
-       _down_point = ev.GetPosition ();
        _first_move = false;
 
        if (_down_view) {
@@ -360,12 +552,15 @@ Timeline::left_down (wxMouseEvent& ev)
                                continue;
                        }
 
+                       shared_ptr<Film> 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()) {
+                       BOOST_FOREACH (DCPTime i, cv->content()->reel_split_points(film)) {
                                _start_snaps.push_back (i);
                        }
                }
@@ -380,24 +575,102 @@ Timeline::left_up (wxMouseEvent& ev)
 {
        _left_down = false;
 
+       switch (_tool) {
+       case SELECT:
+               left_up_select (ev);
+               break;
+       case ZOOM:
+               left_up_zoom (ev);
+               break;
+       case ZOOM_ALL:
+       case SNAP:
+       case SEQUENCE:
+               break;
+       }
+}
+
+void
+Timeline::left_up_select (wxMouseEvent& ev)
+{
        if (_down_view) {
                _down_view->content()->set_change_signals_frequent (false);
-               _content_panel->set_selection (_down_view->content ());
        }
 
-       set_position_from_event (ev);
+       _content_panel->set_selection (selected_content ());
+       /* 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 ();
-       setup_pixels_per_second ();
+       setup_scrollbars ();
        Refresh ();
 
        _start_snaps.clear ();
        _end_snaps.clear ();
 }
 
+void
+Timeline::left_up_zoom (wxMouseEvent& ev)
+{
+       _zoom_point = ev.GetPosition ();
+
+       int vsx, vsy;
+       _main_canvas->GetViewStart (&vsx, &vsy);
+
+       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));
+
+       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;
+       }
+
+       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);
+       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 ();
+       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)
+{
+       switch (_tool) {
+       case SELECT:
+               mouse_moved_select (ev);
+               break;
+       case ZOOM:
+               mouse_moved_zoom (ev);
+               break;
+       case ZOOM_ALL:
+       case SNAP:
+       case SEQUENCE:
+               break;
+       }
+}
+
+void
+Timeline::mouse_moved_select (wxMouseEvent& ev)
 {
        if (!_left_down) {
                return;
@@ -406,8 +679,40 @@ Timeline::mouse_moved (wxMouseEvent& ev)
        set_position_from_event (ev);
 }
 
+void
+Timeline::mouse_moved_zoom (wxMouseEvent& ev)
+{
+       if (!_left_down) {
+               return;
+       }
+
+       _zoom_point = ev.GetPosition ();
+       Refresh ();
+}
+
 void
 Timeline::right_down (wxMouseEvent& ev)
+{
+       switch (_tool) {
+       case SELECT:
+               right_down_select (ev);
+               break;
+       case ZOOM:
+               /* Zoom out */
+               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;
+       }
+}
+
+void
+Timeline::right_down_select (wxMouseEvent& ev)
 {
        shared_ptr<TimelineView> view = event_to_view (ev);
        shared_ptr<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView> (view);
@@ -433,7 +738,7 @@ Timeline::maybe_snap (DCPTime a, DCPTime b, optional<DCPTime>& nearest_distance)
 }
 
 void
-Timeline::set_position_from_event (wxMouseEvent& ev)
+Timeline::set_position_from_event (wxMouseEvent& ev, bool force_emit)
 {
        if (!_pixels_per_second) {
                return;
@@ -460,9 +765,11 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
 
        DCPTime new_position = _down_view_position + DCPTime::from_seconds ((p.x - _down_point.x) / pps);
 
-       if (_snap) {
+       shared_ptr<Film> film = _film.lock ();
+       DCPOMATIC_ASSERT (film);
 
-               DCPTime const new_end = new_position + _down_view->content()->length_after_trim();
+       if (_snap) {
+               DCPTime 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).
                */
@@ -490,17 +797,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>
@@ -512,7 +817,11 @@ Timeline::film () const
 void
 Timeline::resized ()
 {
-       setup_pixels_per_second ();
+       if (_main_canvas->GetSize().GetWidth() > 0 && _first_resize) {
+               zoom_all ();
+               _first_resize = false;
+       }
+       setup_scrollbars ();
 }
 
 void
@@ -564,3 +873,56 @@ Timeline::set_selection (ContentList selection)
                }
        }
 }
+
+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 ()
+{
+       shared_ptr<Film> 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 ();
+}