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

Fix compile issue when building with -no-widgets

Browse Source 
Change-Id: I49a9aa684b0dfbe0e3d9e576aad06d65d6c3ecdd
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
This commit is contained in:
Andy Shaw
2015-04-07 09:55:16 +02:00
committed by Yoann Lopes
parent 0cd222c9b4
commit 72a43cee90
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/directshow/camera/dscamerasession.cpp
View File

@@ -32,7 +32,6 @@
****************************************************************************/ ****************************************************************************/
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QWidget>
#include <QFile> #include <QFile>
#include <QtConcurrent/QtConcurrentRun> #include <QtConcurrent/QtConcurrentRun>
#include <QtMultimedia/qabstractvideobuffer.h> #include <QtMultimedia/qabstractvideobuffer.h>

4
src/plugins/wmf/player/mfplayerservice.cpp
View File

@@ -50,7 +50,7 @@
MFPlayerService::MFPlayerService(QObject *parent) MFPlayerService::MFPlayerService(QObject *parent)
: QMediaService(parent) : QMediaService(parent)
, m_session(0) , m_session(0)
#ifndef Q_WS_SIMULATOR #if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
, m_videoWindowControl(0) , m_videoWindowControl(0)
#endif #endif
, m_videoRendererControl(0) , m_videoRendererControl(0)
@@ -65,7 +65,7 @@ MFPlayerService::~MFPlayerService()
{ {
m_session->close(); m_session->close();
#ifndef Q_WS_SIMULATOR #if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
if (m_videoWindowControl) if (m_videoWindowControl)
delete m_videoWindowControl; delete m_videoWindowControl;
#endif #endif

8
src/plugins/wmf/player/mfplayersession.cpp
View File

@@ -43,7 +43,7 @@
#include <QtCore/qbuffer.h> #include <QtCore/qbuffer.h>
#include "mfplayercontrol.h" #include "mfplayercontrol.h"
#ifndef Q_WS_SIMULATOR #if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
#include "evr9videowindowcontrol.h" #include "evr9videowindowcontrol.h"
#endif #endif
#include "mfvideorenderercontrol.h" #include "mfvideorenderercontrol.h"
@@ -140,7 +140,7 @@ void MFPlayerSession::close()
if (m_playerService->videoRendererControl()) { if (m_playerService->videoRendererControl()) {
m_playerService->videoRendererControl()->releaseActivate(); m_playerService->videoRendererControl()->releaseActivate();
#ifndef Q_WS_SIMULATOR #if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
} else if (m_playerService->videoWindowControl()) { } else if (m_playerService->videoWindowControl()) {
m_playerService->videoWindowControl()->releaseActivate(); m_playerService->videoWindowControl()->releaseActivate();
#endif #endif
@@ -404,7 +404,7 @@ IMFTopologyNode* MFPlayerSession::addOutputNode(IMFStreamDescriptor *streamDesc,
mediaType = Video; mediaType = Video;
if (m_playerService->videoRendererControl()) { if (m_playerService->videoRendererControl()) {
activate = m_playerService->videoRendererControl()->createActivate(); activate = m_playerService->videoRendererControl()->createActivate();
#ifndef Q_WS_SIMULATOR #if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
} else if (m_playerService->videoWindowControl()) { } else if (m_playerService->videoWindowControl()) {
activate = m_playerService->videoWindowControl()->createActivate(); activate = m_playerService->videoWindowControl()->createActivate();
#endif #endif
@@ -1577,7 +1577,7 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent)
} }
updatePendingCommands(CmdStart); updatePendingCommands(CmdStart);
#ifndef Q_WS_SIMULATOR #if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
// playback started, we can now set again the procAmpValues if they have been // playback started, we can now set again the procAmpValues if they have been
// changed previously (these are lost when loading a new media) // changed previously (these are lost when loading a new media)
if (m_playerService->videoWindowControl()) { if (m_playerService->videoWindowControl()) {