X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fclient.cpp;h=8c84e26a7f371a1da9da0f9fdc7bb00488339382;hb=493b09323c6b07ea66ba3f4725c1f1831fd98222;hp=f042c66b020b70d31e0c0348c098c25a04540321;hpb=3bd92c1fa7a85b47356cd6f2bad23893955a0785;p=xinema.git

diff --git a/source/client.cpp b/source/client.cpp
index f042c66..8c84e26 100644
--- a/source/client.cpp
+++ b/source/client.cpp
@@ -3,7 +3,6 @@
 #include <msp/strings/format.h>
 #include "client.h"
 #include "xinema.h"
-#include "xinestream.h"
 
 using namespace std;
 using namespace Msp;
@@ -17,12 +16,26 @@ Client::Client(Xinema &x, Net::StreamSocket *s):
 	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));
+	xinema.signal_stream_destroyed.connect(sigc::mem_fun(this, &Client::stream_destroyed));
+	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;
@@ -39,7 +52,6 @@ void Client::data_available()
 		catch(const exception &e)
 		{
 			send_reply(string("error ")+e.what());
-			return;
 		}
 
 		start = newline+1;
@@ -53,6 +65,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(' ');
@@ -60,18 +81,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)
@@ -90,12 +128,30 @@ void Client::list_directory(const FS::Path &dn)
 
 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));
+
+	MutexLock lock(stream.get_mutex());
+	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_destroyed()
+{
+	send_reply("ejected");
+}
+
+void Client::stream_state_changed(XineStream::State state)
+{
+	send_reply(format("state %s", state));
 }
 
 void Client::stream_title_changed(const string &title)