diff options
Diffstat (limited to 'vrplayer/ourinterface.cpp')
| -rw-r--r-- | vrplayer/ourinterface.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/vrplayer/ourinterface.cpp b/vrplayer/ourinterface.cpp index e617c305..e13e6e8b 100644 --- a/vrplayer/ourinterface.cpp +++ b/vrplayer/ourinterface.cpp @@ -60,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(); } } @@ -216,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) |
