X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fclient.cpp;h=ba0be5b44da51b11af152c59e1c6255c584ac958;hb=a1e6d14ce3a5d5415333a4d3def6c5504f4bc49b;hp=dbe6091df0f6232c9bfb642663921d7505471297;hpb=8c7e5bd0d1f966af2b22293a3a0780c419fb9c95;p=xinema.git

diff --git a/source/client.cpp b/source/client.cpp
index dbe6091..ba0be5b 100644
--- a/source/client.cpp
+++ b/source/client.cpp
@@ -1,5 +1,6 @@
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
+#include <msp/strings/format.h>
 #include "client.h"
 #include "xinema.h"
 
@@ -13,12 +14,27 @@ Client::Client(Xinema &x, Net::StreamSocket *s):
 {
 	socket->signal_data_available.connect(sigc::mem_fun(this, &Client::data_available));
 	socket->signal_end_of_file.connect(sigc::mem_fun(this, &Client::end_of_stream));
+
+	xinema.signal_stream_created.connect(sigc::mem_fun(this, &Client::stream_created));
+	XineStream *stream = xinema.get_stream();
+	if(stream)
+		stream_created(*stream);
 }
 
 void Client::data_available()
 {
 	char rbuf[1024];
-	unsigned len = socket->read(rbuf, sizeof(rbuf));
+	unsigned len;
+	try
+	{
+		len = socket->read(rbuf, sizeof(rbuf));
+	}
+	catch(const std::exception &)
+	{
+		stale = true;
+		return;
+	}
+
 	buffer.append(rbuf, len);
 
 	string::size_type start = 0;
@@ -35,7 +51,6 @@ void Client::data_available()
 		catch(const exception &e)
 		{
 			send_reply(string("error ")+e.what());
-			return;
 		}
 
 		start = newline+1;
@@ -49,6 +64,15 @@ void Client::end_of_stream()
 	stale = true;
 }
 
+XineStream &Client::get_stream() const
+{
+	XineStream *stream = xinema.get_stream();
+	if(stream)
+		return *stream;
+
+	throw runtime_error("No stream");
+}
+
 void Client::process_command(const string &cmd)
 {
 	string::size_type space = cmd.find(' ');
@@ -56,18 +80,35 @@ void Client::process_command(const string &cmd)
 	string args;
 	if(space!=string::npos)
 		args = cmd.substr(space+1);
+
 	if(keyword=="list_directory")
 		list_directory(args);
 	else if(keyword=="play_file")
 		xinema.play_file(args);
+	else if(keyword=="play")
+		get_stream().play();
+	else if(keyword=="seek")
+		get_stream().seek(lexical_cast<float>(args)*Time::sec);
+	else if(keyword=="pause")
+		get_stream().pause();
+	else if(keyword=="stop")
+		get_stream().stop();
 	else
-		send_reply("error Invalid command");
+		throw runtime_error("Invalid command");
 }
 
 void Client::send_reply(const string &reply)
 {
-	socket->write(reply);
-	socket->put('\n');
+	Msp::MutexLock lock(mutex);
+	try
+	{
+		socket->write(reply);
+		socket->put('\n');
+	}
+	catch(const std::exception &)
+	{
+		stale = true;
+	}
 }
 
 void Client::list_directory(const FS::Path &dn)
@@ -83,3 +124,44 @@ void Client::list_directory(const FS::Path &dn)
 			send_reply("file "+*i);
 	}
 }
+
+void Client::stream_created(XineStream &stream)
+{
+	stream.signal_state_changed.connect(sigc::mem_fun(this, &Client::stream_state_changed));
+	stream.signal_title_changed.connect(sigc::mem_fun(this, &Client::stream_title_changed));
+	stream.signal_duration_changed.connect(sigc::mem_fun(this, &Client::stream_duration_changed));
+	stream.signal_position_changed.connect(sigc::mem_fun(this, &Client::stream_position_changed));
+
+	stream_state_changed(stream.get_state());
+
+	string title = stream.get_title();
+	if(!title.empty())
+		send_reply("title "+title);
+
+	if(const Time::TimeDelta &dur = stream.get_duration())
+		stream_duration_changed(dur);
+}
+
+void Client::stream_state_changed(XineStream::State state)
+{
+	send_reply(format("state %s", state));
+}
+
+void Client::stream_title_changed(const string &title)
+{
+	send_reply("title "+title);
+}
+
+void Client::stream_duration_changed(const Time::TimeDelta &dur)
+{
+	send_reply(format("duration %.3f", dur/Time::sec));
+}
+
+void Client::stream_position_changed(const Time::TimeDelta &pos)
+{
+	if(abs(pos-last_position)>=Time::sec)
+	{
+		send_reply(format("position %.3f", pos/Time::sec));
+		last_position = pos;
+	}
+}