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

32
src/plugins/avfoundation/mediaplayer/mediaplayer.pro
View File

@@ -20,28 +20,16 @@ HEADERS += \
avfmediaplayermetadatacontrol.h \ avfmediaplayermetadatacontrol.h \
avfmediaplayerservice.h \ avfmediaplayerservice.h \
avfmediaplayersession.h \ avfmediaplayersession.h \
avfmediaplayerserviceplugin.h avfmediaplayerserviceplugin.h \
avfvideooutput.h
OBJECTIVE_SOURCES += \ OBJECTIVE_SOURCES += \
avfmediaplayercontrol.mm \ avfmediaplayercontrol.mm \
avfmediaplayermetadatacontrol.mm \ avfmediaplayermetadatacontrol.mm \
avfmediaplayerservice.mm \ avfmediaplayerservice.mm \
avfmediaplayerserviceplugin.mm \ avfmediaplayerserviceplugin.mm \
avfmediaplayersession.mm avfmediaplayersession.mm \
avfvideooutput.mm
!ios {
HEADERS += \
avfvideorenderercontrol.h \
avfdisplaylink.h \
avfvideoframerenderer.h \
avfvideooutput.h
OBJECTIVE_SOURCES += \
avfvideorenderercontrol.mm \
avfdisplaylink.mm \
avfvideoframerenderer.mm \
avfvideooutput.mm
LIBS += -framework QuartzCore -framework AppKit
qtHaveModule(widgets) { qtHaveModule(widgets) {
QT += multimediawidgets-private QT += multimediawidgets-private
@@ -53,6 +41,18 @@ OBJECTIVE_SOURCES += \
avfvideowidgetcontrol.mm \ avfvideowidgetcontrol.mm \
avfvideowidget.mm avfvideowidget.mm
} }
!ios {
LIBS += -framework QuartzCore -framework AppKit
HEADERS += \
avfvideorenderercontrol.h \
avfdisplaylink.h \
avfvideoframerenderer.h
OBJECTIVE_SOURCES += \
avfvideorenderercontrol.mm \
avfdisplaylink.mm \
avfvideoframerenderer.mm
} }
OTHER_FILES += \ OTHER_FILES += \