slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

AVFoundation: Enable QVideoWidget on iOS

Browse Source 
Change-Id: I88041e7a2ea052fe449542eeaada31c09d93d163
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
This commit is contained in:
Andy Nichols
2013-08-15 16:31:34 +02:00
committed by The Qt Project
parent 51d0f852b9
commit 94ccfbc132
2 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/avfoundation/mediaplayer/avfmediaplayerservice.mm
View File

@@ -46,10 +46,9 @@
#if defined(Q_OS_OSX)
# include "avfvideooutput.h"
# include "avfvideorenderercontrol.h"
# ifndef QT_NO_WIDGETS
# include "avfvideowidgetcontrol.h"
# endif
#endif
#ifndef QT_NO_WIDGETS
# include "avfvideowidgetcontrol.h"
#endif
QT_USE_NAMESPACE
@@ -93,7 +92,8 @@ QMediaControl *AVFMediaPlayerService::requestControl(const char *name)
m_session->setVideoOutput(qobject_cast<AVFVideoOutput*>(m_videoOutput));
return m_videoOutput;
}
# ifndef QT_NO_WIDGETS
#endif
#ifndef QT_NO_WIDGETS
if (qstrcmp(name, QVideoWidgetControl_iid) == 0) {
if (!m_videoOutput)
m_videoOutput = new AVFVideoWidgetControl(this);
@@ -101,7 +101,6 @@ QMediaControl *AVFMediaPlayerService::requestControl(const char *name)
m_session->setVideoOutput(qobject_cast<AVFVideoOutput*>(m_videoOutput));
return m_videoOutput;
}
# endif
#endif
return 0;
}