X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fxinestream.cpp;h=a702b28b335e66ce0ed840c1d11f68da83aa22aa;hb=a4982bb4d3fd9908aa01c824ac6202ac8618ac24;hp=619ec5800872e7d1c843f4eddde41c50178c1193;hpb=e9e15ac445100aee25fb3314a3ad89e7142c33fb;p=xinema.git

diff --git a/source/xinestream.cpp b/source/xinestream.cpp
index 619ec58..a702b28 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"
 
@@ -7,14 +7,16 @@ using namespace Msp;
 
 XineStream::XineStream(XineEngine &e, const string &mrl):
 	engine(e),
-	state(STOPPED)
+	state(STOPPED),
+	channels_changed(false)
 {
 	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);
 
-	check_info();
+	update_info();
+	update_channels();
 
 	engine.add_stream(*this);
 }
@@ -28,6 +30,32 @@ XineStream::~XineStream()
 	xine_dispose(stream);
 }
 
+void XineStream::set_audio_channel(unsigned i)
+{
+	if(i>=audio_channels.size())
+		throw out_of_range("XineStream::set_audio_channel");
+
+	xine_set_param(stream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL, i);
+}
+
+void XineStream::set_audio_off()
+{
+	xine_set_param(stream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL, -2);
+}
+
+void XineStream::set_spu_channel(unsigned i)
+{
+	if(i>=spu_channels.size())
+		throw out_of_range("XineStream::set_spu_channel");
+
+	xine_set_param(stream, XINE_PARAM_SPU_CHANNEL, i);
+}
+
+void XineStream::set_spu_off()
+{
+	xine_set_param(stream, XINE_PARAM_SPU_CHANNEL, -2);
+}
+
 void XineStream::play()
 {
 	if(state==STOPPED)
@@ -68,6 +96,7 @@ void XineStream::set_state(State s)
 	if(s==state)
 		return;
 
+	MutexLock lock(mutex);
 	state = s;
 	signal_state_changed.emit(state);
 }
@@ -80,23 +109,22 @@ void XineStream::tick()
 		xine_event_free(event);
 	}
 
-	check_info();
+	update_info();
+
+	if(channels_changed)
+	{
+		channels_changed = false;
+		update_channels();
+	}
 }
 
-void XineStream::check_info()
+void XineStream::update_info()
 {
 	const char *xt = xine_get_meta_info(stream, XINE_META_INFO_TITLE);
-	if(xt)
-	{
-		if(title.compare(xt))
-		{
-			title = xt;
-			signal_title_changed.emit(title);
-		}
-	}
-	else if(!title.empty())
+	if((xt && title.compare(xt)) || (!xt && !title.empty()))
 	{
-		title.clear();
+		MutexLock lock(mutex);
+		title = (xt ? xt : string());
 		signal_title_changed.emit(title);
 	}
 
@@ -106,28 +134,52 @@ void XineStream::check_info()
 	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);
 	}
 }
 
+void XineStream::update_channels()
+{
+	MutexLock lock(mutex);
+	char langbuf[XINE_LANG_MAX];
+
+	unsigned n_audio = xine_get_stream_info(stream, XINE_STREAM_INFO_MAX_AUDIO_CHANNEL);
+	audio_channels.resize(n_audio);
+	for(unsigned i=0; i<n_audio; ++i)
+	{
+		xine_get_audio_lang(stream, i, langbuf);
+		audio_channels[i].assign(langbuf);
+	}
+
+	unsigned n_spu = xine_get_stream_info(stream, XINE_STREAM_INFO_MAX_SPU_CHANNEL);
+	spu_channels.resize(n_spu);
+	for(unsigned i=0; i<n_spu; ++i)
+	{
+		xine_get_spu_lang(stream, i, langbuf);
+		spu_channels[i].assign(langbuf);
+	}
+
+	signal_channels_changed.emit();
+}
+
 void XineStream::handle_event(const xine_event_t &event)
 {
 	switch(event.type)
 	{
 	case XINE_EVENT_UI_PLAYBACK_FINISHED:
 		set_state(STOPPED);
+		signal_finished.emit();
 		break;
-	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_CHANNELS_CHANGED:
+		channels_changed = true;
 		break;
 	}
 }