X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=remote%2Fsource%2Fxinemacontrol.cpp;h=eb2ec47e5706b0a67016491cedde811468c31ede;hb=857fbdc12041b7f01f45d4dcf2208f9dccf29294;hp=db349e73685a7d0472a9a9b7dd9cd0dba860389b;hpb=4dd3070fa50882b7ec7a26f7d0994c064c6b29d6;p=xinema.git

diff --git a/remote/source/xinemacontrol.cpp b/remote/source/xinemacontrol.cpp
index db349e7..eb2ec47 100644
--- a/remote/source/xinemacontrol.cpp
+++ b/remote/source/xinemacontrol.cpp
@@ -3,7 +3,9 @@
 XinemaControl::XinemaControl():
 	playback_state(STOPPED),
 	duration(0.0f),
-	position(0.0f)
+	position(0.0f),
+	current_audio_channel(-1),
+	current_spu_channel(-1)
 {
 	QObject::connect(&socket, &QAbstractSocket::connected, this, &XinemaControl::connected);
 	QObject::connect(&socket, &QAbstractSocket::disconnected, this, &XinemaControl::disconnected);
@@ -56,6 +58,22 @@ void XinemaControl::stop()
 	send_request("stop");
 }
 
+void XinemaControl::select_audio_channel(int chan)
+{
+	if(chan<0)
+		send_request("select_audio off");
+	else
+		send_request(QString("select_audio %1").arg(chan));
+}
+
+void XinemaControl::select_spu_channel(int chan)
+{
+	if(chan<0)
+		send_request("select_spu off");
+	else
+		send_request(QString("select_spu %1").arg(chan));
+}
+
 void XinemaControl::send_request(const QString &req)
 {
 	socket.write(req.toUtf8());
@@ -64,12 +82,16 @@ void XinemaControl::send_request(const QString &req)
 
 void XinemaControl::data_available()
 {
-	char rbuf[1024];
-	int len = socket.read(rbuf, sizeof(rbuf));
-	if(len<0)
-		return;
+	while(socket.bytesAvailable())
+	{
+		char rbuf[1024];
+		int len = socket.read(rbuf, sizeof(rbuf));
+		if(len<0)
+			break;
+
+		buffer.append(rbuf, len);
+	}
 
-	buffer.append(rbuf, len);
 	unsigned start = 0;
 	while(1)
 	{
@@ -125,4 +147,46 @@ void XinemaControl::process_reply(const QString &reply)
 		position = args.toFloat();
 		emit position_changed(position);
 	}
+	else if(keyword=="audio_count")
+		resize_list(audio_channels, args.toInt());
+	else if(keyword=="audio")
+	{
+		space = args.indexOf(' ');
+		audio_channels[args.mid(0, space).toInt()] = args.mid(space+1);
+	}
+	else if(keyword=="spu_count")
+		resize_list(spu_channels, args.toInt());
+	else if(keyword=="spu")
+	{
+		space = args.indexOf(' ');
+		spu_channels[args.mid(0, space).toInt()] = args.mid(space+1);
+	}
+	else if(keyword=="channels_end")
+		emit channels_changed();
+	else if(keyword=="current_audio")
+	{
+		current_audio_channel = convert_channel(args);
+		emit current_audio_channel_changed(current_audio_channel);
+	}
+	else if(keyword=="current_spu")
+	{
+		current_spu_channel = convert_channel(args);
+		emit current_spu_channel_changed(current_spu_channel);
+	}
+}
+
+int XinemaControl::convert_channel(const QString &arg)
+{
+	if(arg=="off")
+		return OFF;
+	else
+		return arg.toInt();
+}
+
+void XinemaControl::resize_list(QStringList &list, int size)
+{
+	while(list.size()>size)
+		list.removeLast();
+	while(list.size()<size)
+		list.append(QString());
 }