X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=d4df6d8b2be2b246005b6c543d3ec8d5eeab3f60;hb=40183875ff823b8981b4369eddfe9bbb13938b03;hp=87070b35edb485d0003f5a971590d349a38a87e3;hpb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;p=dcpomatic.git

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 87070b35e..d4df6d8b2 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -33,7 +33,9 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::bind;
+using boost::optional;
 
+/** Parent class for components of the timeline (e.g. a piece of content or an axis) */
 class View : public boost::noncopyable
 {
 public:
@@ -64,7 +66,7 @@ protected:
 	
 	int time_x (Time t) const
 	{
-		return _timeline.tracks_position().x + t * _timeline.pixels_per_time_unit();
+		return _timeline.tracks_position().x + t * _timeline.pixels_per_time_unit().get_value_or (0);
 	}
 	
 	Timeline& _timeline;
@@ -73,13 +75,14 @@ private:
 	dcpomatic::Rect<int> _last_paint_bbox;
 };
 
+
+/** Parent class for views of pieces of content */
 class ContentView : public View
 {
 public:
 	ContentView (Timeline& tl, shared_ptr<Content> c)
 		: View (tl)
 		, _content (c)
-		, _track (0)
 		, _selected (false)
 	{
 		_content_connection = c->Changed.connect (bind (&ContentView::content_changed, this, _2, _3));
@@ -87,6 +90,8 @@ public:
 
 	dcpomatic::Rect<int> bbox () const
 	{
+		assert (_track);
+
 		shared_ptr<const Film> film = _timeline.film ();
 		shared_ptr<const Content> content = _content.lock ();
 		if (!film || !content) {
@@ -95,8 +100,8 @@ public:
 		
 		return dcpomatic::Rect<int> (
 			time_x (content->position ()) - 8,
-			y_pos (_track) - 8,
-			content->length_after_trim () * _timeline.pixels_per_time_unit() + 16,
+			y_pos (_track.get()) - 8,
+			content->length_after_trim () * _timeline.pixels_per_time_unit().get_value_or(0) + 16,
 			_timeline.track_height() + 16
 			);
 	}
@@ -118,7 +123,7 @@ public:
 		_track = t;
 	}
 
-	int track () const {
+	optional<int> track () const {
 		return _track;
 	}
 
@@ -129,6 +134,8 @@ private:
 
 	void do_paint (wxGraphicsContext* gc)
 	{
+		assert (_track);
+
 		shared_ptr<const Film> film = _timeline.film ();
 		shared_ptr<const Content> cont = content ();
 		if (!film || !cont) {
@@ -150,23 +157,23 @@ private:
 		}
 
 		wxGraphicsPath path = gc->CreatePath ();
-		path.MoveToPoint    (time_x (position),	      y_pos (_track) + 4);
-		path.AddLineToPoint (time_x (position + len), y_pos (_track) + 4);
-		path.AddLineToPoint (time_x (position + len), y_pos (_track + 1) - 4);
-		path.AddLineToPoint (time_x (position),	      y_pos (_track + 1) - 4);
-		path.AddLineToPoint (time_x (position),	      y_pos (_track) + 4);
+		path.MoveToPoint    (time_x (position),	      y_pos (_track.get()) + 4);
+		path.AddLineToPoint (time_x (position + len), y_pos (_track.get()) + 4);
+		path.AddLineToPoint (time_x (position + len), y_pos (_track.get() + 1) - 4);
+		path.AddLineToPoint (time_x (position),	      y_pos (_track.get() + 1) - 4);
+		path.AddLineToPoint (time_x (position),	      y_pos (_track.get()) + 4);
 		gc->StrokePath (path);
 		gc->FillPath (path);
 
-		wxString name = wxString::Format (wxT ("%s [%s]"), std_to_wx (cont->path().filename().string()).data(), type().data());
+		wxString name = wxString::Format (wxT ("%s [%s]"), std_to_wx (cont->path_summary()).data(), type().data());
 		wxDouble name_width;
 		wxDouble name_height;
 		wxDouble name_descent;
 		wxDouble name_leading;
 		gc->GetTextExtent (name, &name_width, &name_height, &name_descent, &name_leading);
 		
-		gc->Clip (wxRegion (time_x (position), y_pos (_track), len * _timeline.pixels_per_time_unit(), _timeline.track_height()));
-		gc->DrawText (name, time_x (position) + 12, y_pos (_track + 1) - name_height - 4);
+		gc->Clip (wxRegion (time_x (position), y_pos (_track.get()), len * _timeline.pixels_per_time_unit().get_value_or(0), _timeline.track_height()));
+		gc->DrawText (name, time_x (position) + 12, y_pos (_track.get() + 1) - name_height - 4);
 		gc->ResetClip ();
 	}
 
@@ -190,7 +197,7 @@ private:
 	}
 
 	boost::weak_ptr<Content> _content;
-	int _track;
+	optional<int> _track;
 	bool _selected;
 
 	boost::signals2::scoped_connection _content_connection;
@@ -262,9 +269,15 @@ private:
 
 	void do_paint (wxGraphicsContext* gc)
 	{
+		if (!_timeline.pixels_per_time_unit()) {
+			return;
+		}
+
+		double const pptu = _timeline.pixels_per_time_unit().get ();
+		
 		gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID));
 		
-		int mark_interval = rint (128 / (TIME_HZ * _timeline.pixels_per_time_unit ()));
+		int mark_interval = rint (128 / (TIME_HZ * pptu));
 		if (mark_interval > 5) {
 			mark_interval -= mark_interval % 5;
 		}
@@ -288,7 +301,7 @@ private:
 		gc->StrokePath (path);
 
 		Time t = 0;
-		while ((t * _timeline.pixels_per_time_unit()) < _timeline.width()) {
+		while ((t * pptu) < _timeline.width()) {
 			wxGraphicsPath path = gc->CreatePath ();
 			path.MoveToPoint (time_x (t), _y - 4);
 			path.AddLineToPoint (time_x (t), _y + 4);
@@ -308,7 +321,7 @@ private:
 			wxDouble str_leading;
 			gc->GetTextExtent (str, &str_width, &str_height, &str_descent, &str_leading);
 			
-			int const tx = _timeline.x_offset() + t * _timeline.pixels_per_time_unit();
+			int const tx = _timeline.x_offset() + t * pptu;
 			if ((tx + str_width) < _timeline.width()) {
 				gc->DrawText (str, time_x (t), _y + 16);
 			}
@@ -321,17 +334,18 @@ private:
 	int _y;
 };
 
+
 Timeline::Timeline (wxWindow* parent, FilmEditor* ed, shared_ptr<Film> film)
 	: wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)
 	, _film_editor (ed)
 	, _film (film)
 	, _time_axis_view (new TimeAxisView (*this, 32))
 	, _tracks (0)
-	, _pixels_per_time_unit (0)
 	, _left_down (false)
 	, _down_view_position (0)
 	, _first_move (false)
-	, _menu (film, this)
+	, _menu (this)
+	, _snap (true)
 {
 #ifndef __WXOSX__
 	SetDoubleBuffered (true);
@@ -404,25 +418,17 @@ Timeline::assign_tracks ()
 {
 	for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
 		shared_ptr<ContentView> cv = dynamic_pointer_cast<ContentView> (*i);
-		if (cv) {
-			cv->set_track (0);
-			_tracks = 1;
-		}
-	}
-
-	for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
-		shared_ptr<AudioContentView> acv = dynamic_pointer_cast<AudioContentView> (*i);
-		if (!acv) {
+		if (!cv) {
 			continue;
 		}
 	
-		shared_ptr<Content> acv_content = acv->content();
+		shared_ptr<Content> content = cv->content();
 
-		int t = 1;
+		int t = 0;
 		while (1) {
 			ViewList::iterator j = _views.begin();
 			while (j != _views.end()) {
-				shared_ptr<AudioContentView> test = dynamic_pointer_cast<AudioContentView> (*j);
+				shared_ptr<ContentView> test = dynamic_pointer_cast<ContentView> (*j);
 				if (!test) {
 					++j;
 					continue;
@@ -430,10 +436,10 @@ Timeline::assign_tracks ()
 				
 				shared_ptr<Content> test_content = test->content();
 					
-				if (test && test->track() == t) {
+				if (test && test->track() && test->track().get() == t) {
 					bool const no_overlap =
-						(acv_content->position() < test_content->position() && acv_content->end() < test_content->position()) ||
-						(acv_content->position() > test_content->end()      && acv_content->end() > test_content->end());
+						(content->position() < test_content->position() && content->end() < test_content->position()) ||
+						(content->position() > test_content->end()      && content->end() > test_content->end());
 					
 					if (!no_overlap) {
 						/* we have an overlap on track `t' */
@@ -451,7 +457,7 @@ Timeline::assign_tracks ()
 			}
 		}
 
-		acv->set_track (t);
+		cv->set_track (t);
 		_tracks = max (_tracks, t + 1);
 	}
 
@@ -468,7 +474,7 @@ void
 Timeline::setup_pixels_per_time_unit ()
 {
 	shared_ptr<const Film> film = _film.lock ();
-	if (!film) {
+	if (!film || film->length() == 0) {
 		return;
 	}
 
@@ -568,15 +574,24 @@ Timeline::right_down (wxMouseEvent& ev)
 		cv->set_selected (true);
 	}
 
-	_menu.popup (selected_content (), ev.GetPosition ());
+	_menu.popup (_film, selected_content (), ev.GetPosition ());
 }
 
 void
 Timeline::set_position_from_event (wxMouseEvent& ev)
 {
+	if (!_pixels_per_time_unit) {
+		return;
+	}
+
+	double const pptu = _pixels_per_time_unit.get ();
+
 	wxPoint const p = ev.GetPosition();
 
 	if (!_first_move) {
+		/* We haven't moved yet; in that case, we must move the mouse some reasonable distance
+		   before the drag is considered to have started.
+		*/
 		int const dist = sqrt (pow (p.x - _down_point.x, 2) + pow (p.y - _down_point.y, 2));
 		if (dist < 8) {
 			return;
@@ -584,14 +599,63 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
 		_first_move = true;
 	}
 
-	Time const time_diff = (p.x - _down_point.x) / _pixels_per_time_unit;
-	if (_down_view) {
-		_down_view->content()->set_position (max (static_cast<Time> (0), _down_view_position + time_diff));
-
-		shared_ptr<Film> film = _film.lock ();
-		assert (film);
-		film->set_sequence_video (false);
+	if (!_down_view) {
+		return;
 	}
+	
+	Time new_position = _down_view_position + (p.x - _down_point.x) / pptu;
+	
+	if (_snap) {
+		
+		bool first = true;
+		Time nearest_distance = TIME_MAX;
+		Time nearest_new_position = TIME_MAX;
+		
+		/* Find the nearest content edge; this is inefficient */
+		for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
+			shared_ptr<ContentView> cv = dynamic_pointer_cast<ContentView> (*i);
+			if (!cv || cv == _down_view) {
+				continue;
+			}
+			
+			{
+				/* Snap starts to ends */
+				Time const d = abs (cv->content()->end() - new_position);
+				if (first || d < nearest_distance) {
+					nearest_distance = d;
+					nearest_new_position = cv->content()->end();
+				}
+			}
+			
+			{
+				/* Snap ends to starts */
+				Time const d = abs (cv->content()->position() - (new_position + _down_view->content()->length_after_trim()));
+				if (d < nearest_distance) {
+					nearest_distance = d;
+					nearest_new_position = cv->content()->position() - _down_view->content()->length_after_trim ();
+				}
+			}
+			
+			first = false;
+		}
+		
+		if (!first) {
+			/* Snap if it's close; `close' means within a proportion of the time on the timeline */
+			if (nearest_distance < (width() / pptu) / 32) {
+				new_position = nearest_new_position;
+			}
+		}
+	}
+	
+	if (new_position < 0) {
+		new_position = 0;
+	}
+	
+	_down_view->content()->set_position (new_position);
+	
+	shared_ptr<Film> film = _film.lock ();
+	assert (film);
+	film->set_sequence_video (false);
 }
 
 void