X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fclient.cpp;h=353694e6d6109f943cd05649c59324ed4ad39af9;hb=HEAD;hp=47f8186d7d2899c0457568abc13f590037585bc0;hpb=0ebb4044ca544358d6d944a89fd9f6e806528be4;p=xinema.git diff --git a/source/client.cpp b/source/client.cpp index 47f8186..353694e 100644 --- a/source/client.cpp +++ b/source/client.cpp @@ -3,7 +3,6 @@ #include #include "client.h" #include "xinema.h" -#include "xinestream.h" using namespace std; using namespace Msp; @@ -17,6 +16,7 @@ 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); @@ -25,7 +25,17 @@ Client::Client(Xinema &x, Net::StreamSocket *s): 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; @@ -42,7 +52,6 @@ void Client::data_available() catch(const exception &e) { send_reply(string("error ")+e.what()); - return; } start = newline+1; @@ -56,6 +65,23 @@ 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"); +} + +int Client::convert_channel(const string &arg) +{ + if(arg=="off") + return XineStream::OFF; + else + return lexical_cast(arg); +} + void Client::process_command(const string &cmd) { string::size_type space = cmd.find(' '); @@ -63,18 +89,39 @@ 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(args)*Time::sec); + else if(keyword=="pause") + get_stream().pause(); + else if(keyword=="stop") + get_stream().stop(); + else if(keyword=="select_audio") + get_stream().select_audio_channel(convert_channel(args)); + else if(keyword=="select_spu") + get_stream().select_spu_channel(convert_channel(args)); 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) @@ -89,18 +136,53 @@ void Client::list_directory(const FS::Path &dn) else send_reply("file "+*i); } + + send_reply("directory_end"); } 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.signal_video_size_changed.connect(sigc::mem_fun(this, &Client::stream_size_changed)); + stream.signal_framerate_changed.connect(sigc::mem_fun(this, &Client::stream_framerate_changed)); + stream.signal_codecs_changed.connect(sigc::mem_fun(this, &Client::stream_codecs_changed)); + stream.signal_channels_changed.connect(sigc::mem_fun(this, &Client::stream_channels_changed)); + stream.signal_current_audio_channel_changed.connect(sigc::mem_fun(this, &Client::stream_audio_channel_changed)); + stream.signal_current_spu_channel_changed.connect(sigc::mem_fun(this, &Client::stream_spu_channel_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); + stream_position_changed(stream.get_position()); + } + + stream_size_changed(stream.get_video_width(), stream.get_video_height()); + stream_framerate_changed(stream.get_framerate()); + stream_codecs_changed(stream.get_video_codec(), stream.get_audio_codec()); + + stream_channels_changed(); + stream_audio_channel_changed(stream.get_current_audio_channel()); + stream_spu_channel_changed(stream.get_current_spu_channel()); +} + +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) @@ -121,3 +203,52 @@ void Client::stream_position_changed(const Time::TimeDelta &pos) last_position = pos; } } + +void Client::stream_size_changed(unsigned w, unsigned h) +{ + send_reply(format("video_size %d %d", w, h)); +} + +void Client::stream_framerate_changed(float fps) +{ + send_reply(format("framerate %.2f", fps)); +} + +void Client::stream_codecs_changed(const string &vc, const string &ac) +{ + send_reply("video_codec "+vc); + send_reply("audio_codec "+ac); +} + +void Client::stream_channels_changed() +{ + XineStream &stream = get_stream(); + + const vector &audio_channels = stream.get_audio_channels(); + send_reply(format("audio_count %d", audio_channels.size())); + for(unsigned i=0; i &spu_channels = stream.get_spu_channels(); + send_reply(format("spu_count %d", spu_channels.size())); + for(unsigned i=0; i