1 files changed, 24 insertions, 7 deletions

diff --git a/vrplayer/ourinterface.cpp b/vrplayer/ourinterface.cpp
index cee66691..e13e6e8b 100644
--- a/vrplayer/ourinterface.cpp
+++ b/vrplayer/ourinterface.cpp
@@ -1,3 +1,4 @@
+
 #include "ourinterface.h"
 
 OurInterface::OurInterface(QObject *parent) :
@@ -59,11 +60,11 @@ void OurInterface::initRemoteClient()
     /* LK_TODO this needs to be undone in deinitRemoteClient() */
     if (!demuxMedia)
     {
-        demuxMedia = new DemuxMedia(NULL, &audioQueue, &videoQueue, channel, stream_id);
+        demuxMedia = new DemuxMedia(NULL, &videoQueue, channel, stream_id);
         demuxMediaThread = new QThread(this);
         connect(demuxMediaThread, SIGNAL(started()), demuxMedia, SLOT(startDemuxing()));
         demuxMedia->moveToThread(demuxMediaThread);
-        playVideo = demuxMedia->getPlayVideoInstance();
+        //playVideo = demuxMedia->getPlayVideoInstance();
     }
 }
 
@@ -84,6 +85,7 @@ int OurInterface::openVirtualChannel()
     if (channel)
         return -1;
 
+    printf("OurInterface::openVirtualChannel:\n");
     /* open a virtual channel and connect to remote client */
     channel = WTSVirtualChannelOpenEx(WTS_CURRENT_SESSION, "xrdpvr", 0);
     if (channel == NULL)
@@ -116,37 +118,46 @@ int OurInterface::closeVirtualChannel()
  ******************************************************************************/
 int OurInterface::sendMetadataFile()
 {
+
+    if (xrdpvr_init_player(channel, 101, filename.toAscii().data()))
+    {
+        fprintf(stderr, "failed to initialize the player\n");
+        return -1;
+    }
+#if 0
     if (xrdpvr_create_metadata_file(channel, filename.toAscii().data()))
     {
         emit on_ErrorMsg("I/O Error",
                          "An error occurred while sending data to remote client");
         return -1;
     }
-
+#endif
     return 0;
 }
 
 int OurInterface::sendVideoFormat()
 {
+#if 0
     if (xrdpvr_set_video_format(channel, stream_id))
     {
         emit on_ErrorMsg("I/O Error",
                          "Error sending video format to remote client");
         return -1;
     }
-
+#endif
     return 0;
 }
 
 int OurInterface::sendAudioFormat()
 {
+#if 0
     if (xrdpvr_set_audio_format(channel, stream_id))
     {
         emit on_ErrorMsg("I/O Error",
                          "Error sending audio format to remote client");
         return -1;
     }
-
+#endif
     return 0;
 }
 
@@ -205,11 +216,17 @@ void OurInterface::playMedia()
     demuxMediaThread->start();
 }
 
-PlayVideo * OurInterface::getPlayVideoInstance()
+//PlayVideo * OurInterface::getPlayVideoInstance()
+//{
+//    return this->playVideo;
+//}
+
+DemuxMedia * OurInterface::getDemuxMediaInstance()
 {
-    return this->playVideo;
+    return this->demuxMedia;
 }
 
+
 void OurInterface::setVcrOp(int op)
 {
     if (demuxMedia)