Display stream size and codecs on the playback page

[xinema.git] / remote / source / xinemacontrol.cpp

diff --git a/remote/source/xinemacontrol.cpp b/remote/source/xinemacontrol.cpp
index db349e73685a7d0472a9a9b7dd9cd0dba860389b..7a013dfd0ad0e0880b92b3b5122294d6cc0b710d 100644 (file)
--- a/remote/source/xinemacontrol.cpp
+++ b/remote/source/xinemacontrol.cpp
@@ -3,7 +3,10 @@
 XinemaControl::XinemaControl():
        playback_state(STOPPED),
        duration(0.0f),
-       position(0.0f)
+       position(0.0f),
+       framerate(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 +59,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 +83,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 +148,67 @@ void XinemaControl::process_reply(const QString &reply)
                position = args.toFloat();
                emit position_changed(position);
        }
+       else if(keyword=="video_size")
+       {
+               space = args.indexOf(' ');
+               video_size = QSize(args.mid(0, space).toInt(), args.mid(space+1).toInt());
+               emit size_changed(video_size);
+       }
+       else if(keyword=="framerate")
+       {
+               framerate = args.toFloat();
+               emit framerate_changed(framerate);
+       }
+       else if(keyword=="video_codec")
+       {
+               video_codec = args;
+               emit codecs_changed(video_codec, audio_codec);
+       }
+       else if(keyword=="audio_codec")
+       {
+               audio_codec = args;
+               emit codecs_changed(video_codec, audio_codec);
+       }
+       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());
 }