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

4 files changed, 46 insertions, 10 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;
 	}
 }