X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=9f71847f5c626dfb7e39690c91010e19d4f54252;hb=0802245c4c89b9a8557e5f9b238e8317a92ba51d;hp=2c510efb5bc2ebe08760e494c2cb8c057d0dd744;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566;p=dcpomatic.git

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 2c510efb5..9f71847f5 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -29,6 +29,7 @@
 #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"
@@ -60,12 +61,13 @@ using namespace dcpomatic;
 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))
@@ -80,6 +82,7 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film)
 	, _y_scroll_rate (16)
 	, _pixels_per_track (48)
 	, _first_resize (true)
+	, _timer (this)
 {
 #ifndef __WXOSX__
 	_labels_canvas->SetDoubleBuffered (true);
@@ -114,10 +117,19 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film)
 	_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)
 {
@@ -195,6 +207,18 @@ Timeline::paint_main ()
 			);
 	}
 
+	/* 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;
 }
 
@@ -454,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;