X-Git-Url: http://git.tdb.fi/?p=xinema.git;a=blobdiff_plain;f=source%2Fclient.cpp;h=353694e6d6109f943cd05649c59324ed4ad39af9;hp=0130846f92c888a6838756a499f33df4357425d8;hb=60cd42dc4fdb1fdfa438402956e7342a01fc8677;hpb=afa557f5c0b0debaaaf6c4c777ccc2ba10965c50 diff --git a/source/client.cpp b/source/client.cpp index 0130846..353694e 100644 --- a/source/client.cpp +++ b/source/client.cpp @@ -146,6 +146,9 @@ void Client::stream_created(XineStream &stream) 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)); @@ -163,6 +166,10 @@ void Client::stream_created(XineStream &stream) 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()); @@ -197,6 +204,22 @@ void Client::stream_position_changed(const Time::TimeDelta &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();