X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fxinestream.cpp;h=6cc3d7546847af6593007ca746121e56ef856f64;hb=194033440e2552a820c3b8197198402acee67c5b;hp=d152f518e2cb34941d24521d0e205ed04d532e1e;hpb=ed777426d367df15a67082f5dae0911c21472b5f;p=xinema.git

diff --git a/source/xinestream.cpp b/source/xinestream.cpp
index d152f51..6cc3d75 100644
--- a/source/xinestream.cpp
+++ b/source/xinestream.cpp
@@ -1,4 +1,4 @@
-#include <msp/io/print.h>
+#include <msp/strings/format.h>
 #include "xineengine.h"
 #include "xinestream.h"
 
@@ -6,13 +6,16 @@ using namespace std;
 using namespace Msp;
 
 XineStream::XineStream(XineEngine &e, const string &mrl):
-	engine(e)
+	engine(e),
+	state(STOPPED)
 {
 	stream = xine_stream_new(engine.get_engine(), engine.get_audio_driver(), engine.get_video_driver());
 	xine_open(stream, mrl.c_str());
 
 	queue = xine_event_new_queue(stream);
 
+	update_info();
+
 	engine.add_stream(*this);
 }
 
@@ -25,20 +28,49 @@ XineStream::~XineStream()
 	xine_dispose(stream);
 }
 
-string XineStream::get_title() const
+void XineStream::play()
 {
-	const char *title = xine_get_meta_info(stream, XINE_META_INFO_TITLE);
-	return (title ? title : string());
+	if(state==STOPPED)
+		xine_play(stream, 0, 0);
+	else if(state==PAUSED)
+		xine_set_param(stream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL);
+
+	set_state(PLAYING);
 }
 
-void XineStream::play()
+void XineStream::seek(const Time::TimeDelta &time)
 {
-	xine_play(stream, 0, 0);
+	xine_play(stream, 0, time/Time::msec);
+	if(state!=PLAYING)
+	{
+		xine_set_param(stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
+		set_state(PAUSED);
+	}
+}
+
+void XineStream::pause()
+{
+	if(state==PLAYING)
+	{
+		xine_set_param(stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
+		set_state(PAUSED);
+	}
 }
 
 void XineStream::stop()
 {
 	xine_stop(stream);
+	set_state(STOPPED);
+}
+
+void XineStream::set_state(State s)
+{
+	if(s==state)
+		return;
+
+	MutexLock lock(mutex);
+	state = s;
+	signal_state_changed.emit(state);
 }
 
 void XineStream::tick()
@@ -49,17 +81,32 @@ void XineStream::tick()
 		xine_event_free(event);
 	}
 
+	update_info();
+}
+
+void XineStream::update_info()
+{
+	const char *xt = xine_get_meta_info(stream, XINE_META_INFO_TITLE);
+	if((xt && title.compare(xt)) || (!xt && !title.empty()))
+	{
+		MutexLock lock(mutex);
+		title = (xt ? xt : string());
+		signal_title_changed.emit(title);
+	}
+
 	int dur_msec, pos_msec;
 	xine_get_pos_length(stream, 0, &pos_msec, &dur_msec);
 	Time::TimeDelta dur = dur_msec*Time::msec;
 	Time::TimeDelta pos = pos_msec*Time::msec;
 	if(dur!=duration)
 	{
+		MutexLock lock(mutex);
 		duration = dur;
 		signal_duration_changed.emit(duration);
 	}
 	if(pos!=position)
 	{
+		MutexLock lock(mutex);
 		position = pos;
 		signal_position_changed.emit(position);
 	}
@@ -69,11 +116,34 @@ void XineStream::handle_event(const xine_event_t &event)
 {
 	switch(event.type)
 	{
-	case XINE_EVENT_PROGRESS:
-		{
-			xine_progress_data_t *data = reinterpret_cast<xine_progress_data_t *>(event.data);
-			IO::print("%s [%d%%]\n", data->description, data->percent);
-		}
+	case XINE_EVENT_UI_PLAYBACK_FINISHED:
+		set_state(STOPPED);
+		signal_finished.emit();
 		break;
 	}
 }
+
+
+void operator<<(LexicalConverter &conv, XineStream::State state)
+{
+	switch(state)
+	{
+	case XineStream::STOPPED: conv.result("STOPPED"); return;
+	case XineStream::PAUSED: conv.result("PAUSED"); return;
+	case XineStream::PLAYING: conv.result("PLAYING"); return;
+	default: conv.result(format("State(%d)", static_cast<int>(state))); return;
+	}
+}
+
+void operator>>(const LexicalConverter &conv, XineStream::State &state)
+{
+	const string &str = conv.get();
+	if(str=="STOPPED")
+		state = XineStream::STOPPED;
+	else if(str=="PAUSED")
+		state = XineStream::PAUSED;
+	else if(str=="PLAYING")
+		state = XineStream::PLAYING;
+	else
+		throw lexical_error(format("Conversion of '%s' to XineStream::State", str));
+}