Allow drag of content; fix up some problems with timings.

7 files changed, 124 insertions, 18 deletions

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 395359fa7..c12a8a166 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -29,6 +29,8 @@ using std::string;
 using boost::shared_ptr;
 using boost::lexical_cast;
 
+int const ContentProperty::START = 400;
+
 Content::Content (shared_ptr<const Film> f, Time s)
 	: _film (f)
 	, _start (s)
@@ -84,3 +86,17 @@ Content::signal_changed (int p)
 {
 	Changed (shared_from_this (), p);
 }
+
+void
+Content::set_start (Time s)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_start = s;
+	}
+
+	signal_changed (ContentProperty::START);
+}
+
+	
+		
diff --git a/src/lib/content.h b/src/lib/content.h
index bcfbef7e3..321252c02 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -36,6 +36,12 @@ namespace cxml {
 class Job;
 class Film;
 
+class ContentProperty
+{
+public:
+	static int const START;
+};
+
 class Content : public boost::enable_shared_from_this<Content>
 {
 public:
@@ -61,6 +67,8 @@ public:
 		return _digest;
 	}
 
+	void set_start (Time);
+
 	Time start () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _start;
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index b45ba8585..799e89a38 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -473,7 +473,6 @@ void
 FFmpegDecoder::do_seek (Time t, bool backwards, bool accurate)
 {
 	int64_t const vt = t / (av_q2d (_format_context->streams[_video_stream]->time_base) * TIME_HZ);
-	cout << "seek-> " << t << "\n";
 	av_seek_frame (_format_context, _video_stream, vt, backwards ? AVSEEK_FLAG_BACKWARD : 0);
 
 	avcodec_flush_buffers (_video_codec_context);
@@ -617,5 +616,13 @@ FFmpegDecoder::decode_video_packet ()
 Time
 FFmpegDecoder::next () const
 {
-	return min (_next_video, _next_audio);
+	if (_decode_video && _decode_audio) {
+		return min (_next_video, _next_audio);
+	}
+
+	if (_decode_audio) {
+		return _next_audio;
+	}
+
+	return _next_video;
 }
diff --git a/src/lib/player.cc b/src/lib/player.cc
index c87e27ba3..dc802e220 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -116,7 +116,7 @@ Player::pass ()
 	if (!earliest) {
 		return true;
 	}
-	
+
 	earliest->decoder->pass ();
 
 	/* Move position to earliest active next emission */
@@ -199,11 +199,12 @@ Player::seek (Time t)
 	}
 
 	for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
-		if ((*i)->content->end() < t) {
+
+		if ((*i)->content->start() > t || (*i)->content->end() <= t) {
 			continue;
 		}
 
-		(*i)->decoder->seek (t);
+		(*i)->decoder->seek (t - (*i)->content->start());
 	}
 
 	_position = t;
@@ -296,18 +297,22 @@ Player::setup_pieces ()
 	list<shared_ptr<Piece> > pieces_copy = _pieces;
 	for (list<shared_ptr<Piece> >::iterator i = pieces_copy.begin(); i != pieces_copy.end(); ++i) {
 		if (dynamic_pointer_cast<VideoContent> ((*i)->content)) {
-			Time const diff = video_pos - (*i)->content->start();
+			Time const diff = (*i)->content->start() - video_pos;
 			if (diff > 0) {
 				shared_ptr<NullContent> nc (new NullContent (_film, video_pos, diff));
-				_pieces.push_back (shared_ptr<Piece> (new Piece (nc, shared_ptr<Decoder> (new BlackDecoder (_film, nc)))));
+				shared_ptr<BlackDecoder> bd (new BlackDecoder (_film, nc));
+				bd->Video.connect (bind (&Player::process_video, this, nc, _1, _2, _3, _4));
+				_pieces.push_back (shared_ptr<Piece> (new Piece (nc, bd)));
 			}
 						
 			video_pos = (*i)->content->end();
 		} else {
-			Time const diff = audio_pos - (*i)->content->start();
+			Time const diff = (*i)->content->start() - audio_pos;
 			if (diff > 0) {
 				shared_ptr<NullContent> nc (new NullContent (_film, audio_pos, diff));
-				_pieces.push_back (shared_ptr<Piece> (new Piece (nc, shared_ptr<Decoder> (new SilenceDecoder (_film, nc)))));
+				shared_ptr<SilenceDecoder> sd (new SilenceDecoder (_film, nc));
+				sd->Audio.connect (bind (&Player::process_audio, this, nc, _1, _2));
+				_pieces.push_back (shared_ptr<Piece> (new Piece (nc, sd)));
 			}
 			audio_pos = (*i)->content->end();
 		}
@@ -324,7 +329,7 @@ Player::content_changed (weak_ptr<Content> w, int p)
 		return;
 	}
 
-	if (p == VideoContentProperty::VIDEO_LENGTH) {
+	if (p == ContentProperty::START || p == VideoContentProperty::VIDEO_LENGTH) {
 		_have_valid_pieces = false;
 	}
 }
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 0857b780a..050b0c3e2 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -434,7 +434,7 @@ FilmEditor::make_subtitle_panel ()
 		grid->Add (s);
 	}
 
-	add_label_to_sizer (grid, _subtitle_panel, _("Subtitle stream"));
+	add_label_to_sizer (grid, _subtitle_panel, _("Subtitle Stream"));
 	_subtitle_stream = new wxChoice (_subtitle_panel, wxID_ANY);
 	grid->Add (_subtitle_stream, 1, wxEXPAND | wxALL, 6);
 	grid->AddSpacer (0);
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index eff686a35..de15635b6 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -21,6 +21,7 @@
 
 #include <list>
 #include <wx/graphics.h>
+#include <boost/weak_ptr.hpp>
 #include "film.h"
 #include "timeline.h"
 #include "wx_util.h"
@@ -30,6 +31,7 @@ using std::list;
 using std::cout;
 using std::max;
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::bind;
 
@@ -45,6 +47,11 @@ public:
 	virtual void paint (wxGraphicsContext *) = 0;
 	virtual Rect bbox () const = 0;
 
+	void force_redraw ()
+	{
+		_timeline.force_redraw (bbox ());
+	}
+
 protected:
 	int time_x (Time t) const
 	{
@@ -57,7 +64,7 @@ protected:
 class ContentView : public View
 {
 public:
-	ContentView (Timeline& tl, shared_ptr<const Content> c, int t)
+	ContentView (Timeline& tl, shared_ptr<Content> c, int t)
 		: View (tl)
 		, _content (c)
 		, _track (t)
@@ -77,19 +84,21 @@ public:
 		Time const start = content->start ();
 		Time const len = content->length ();
 
+		wxColour selected (colour().Red() / 2, colour().Green() / 2, colour().Blue() / 2);
+
 		gc->SetPen (*wxBLACK_PEN);
 		
 #if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9
 		gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 4, wxPENSTYLE_SOLID));
 		if (_selected) {
-			gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (wxColour (200, 200, 200), wxBRUSHSTYLE_SOLID));
+			gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (selected, wxBRUSHSTYLE_SOLID));
 		} else {
 			gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (colour(), wxBRUSHSTYLE_SOLID));
 		}
 #else			
 		gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 4, wxSOLID));
 		if (_selected) {
-			gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (wxColour (200, 200, 200), wxSOLID));
+			gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (selected, wxSOLID));
 		} else {
 			gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (colour(), wxSOLID));
 		}
@@ -134,13 +143,17 @@ public:
 
 	void set_selected (bool s) {
 		_selected = s;
-		_timeline.force_redraw (bbox ());
+		force_redraw ();
 	}
 	
 	bool selected () const {
 		return _selected;
 	}
 
+	weak_ptr<Content> content () const {
+		return _content;
+	}
+
 	virtual wxString type () const = 0;
 	virtual wxColour colour () const = 0;
 	
@@ -151,7 +164,7 @@ private:
 		return _timeline.tracks_position().y + t * _timeline.track_height();
 	}
 
-	boost::weak_ptr<const Content> _content;
+	boost::weak_ptr<Content> _content;
 	int _track;
 	bool _selected;
 };
@@ -159,7 +172,7 @@ private:
 class AudioContentView : public ContentView
 {
 public:
-	AudioContentView (Timeline& tl, shared_ptr<const Content> c, int t)
+	AudioContentView (Timeline& tl, shared_ptr<Content> c, int t)
 		: ContentView (tl, c, t)
 	{}
 	
@@ -178,7 +191,7 @@ private:
 class VideoContentView : public ContentView
 {
 public:
-	VideoContentView (Timeline& tl, shared_ptr<const Content> c, int t)
+	VideoContentView (Timeline& tl, shared_ptr<Content> c, int t)
 		: ContentView (tl, c, t)
 	{}
 
@@ -277,6 +290,9 @@ Timeline::Timeline (wxWindow* parent, shared_ptr<const Film> film)
 	: wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)
 	, _film (film)
 	, _pixels_per_time_unit (0)
+	, _left_down (false)
+	, _down_view_start (0)
+	, _first_move (false)
 {
 	SetDoubleBuffered (true);
 
@@ -284,6 +300,8 @@ Timeline::Timeline (wxWindow* parent, shared_ptr<const Film> film)
 	
 	Connect (wxID_ANY, wxEVT_PAINT, wxPaintEventHandler (Timeline::paint), 0, this);
 	Connect (wxID_ANY, wxEVT_LEFT_DOWN, wxMouseEventHandler (Timeline::left_down), 0, this);
+	Connect (wxID_ANY, wxEVT_LEFT_UP, wxMouseEventHandler (Timeline::left_up), 0, this);
+	Connect (wxID_ANY, wxEVT_MOTION, wxMouseEventHandler (Timeline::mouse_moved), 0, this);
 	Connect (wxID_ANY, wxEVT_SIZE, wxSizeEventHandler (Timeline::resized), 0, this);
 
 	SetMinSize (wxSize (640, tracks() * track_height() + 96));
@@ -366,12 +384,56 @@ Timeline::left_down (wxMouseEvent& ev)
 		++i;
 	}
 
+	_down_view.reset ();
+
 	for (list<shared_ptr<View> >::iterator j = _views.begin(); j != _views.end(); ++j) {
 		shared_ptr<ContentView> cv = dynamic_pointer_cast<ContentView> (*j);
 		if (cv) {
+			_down_view = cv;
+			shared_ptr<Content> c = cv->content().lock();
+			assert (c);
+			_down_view_start = c->start ();
 			cv->set_selected (i == j);
 		}
 	}
+
+	_left_down = true;
+	_down_point = ev.GetPosition ();
+	_first_move = false;
+}
+
+void
+Timeline::left_up (wxMouseEvent &)
+{
+	_left_down = false;
+}
+
+void
+Timeline::mouse_moved (wxMouseEvent& ev)
+{
+	if (!_left_down) {
+		return;
+	}
+
+	wxPoint const p = ev.GetPosition();
+
+	if (!_first_move) {
+		int const dist = sqrt (pow (p.x - _down_point.x, 2) + pow (p.y - _down_point.y, 2));
+		if (dist < 8) {
+			return;
+		}
+		_first_move = true;
+	}
+
+	Time const time_diff = (p.x - _down_point.x) / _pixels_per_time_unit;
+	if (_down_view) {
+		shared_ptr<Content> c = _down_view->content().lock();
+		if (c) {
+			_down_view->force_redraw ();
+			c->set_start (_down_view_start + time_diff);
+			_down_view->force_redraw ();
+		}
+	}
 }
 
 void
diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 5d7960be5..79ceceaa0 100644
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -26,6 +26,7 @@
 
 class Film;
 class View;
+class ContentView;
 
 class Timeline : public wxPanel
 {
@@ -61,6 +62,8 @@ public:
 private:
 	void paint (wxPaintEvent &);
 	void left_down (wxMouseEvent &);
+	void mouse_moved (wxMouseEvent &);
+	void left_up (wxMouseEvent &);
 	void playlist_changed ();
 	void setup_pixels_per_time_unit ();
 	void resized (wxSizeEvent &);
@@ -68,4 +71,9 @@ private:
 	boost::weak_ptr<const Film> _film;
 	std::list<boost::shared_ptr<View> > _views;
 	double _pixels_per_time_unit;
+	bool _left_down;
+	wxPoint _down_point;
+	boost::shared_ptr<ContentView> _down_view;
+	Time _down_view_start;
+	bool _first_move;
 };