From 0a73b2e63a5cec80edc89cfefd7d86064d393c46 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 15 Apr 2016 09:38:19 +0200 Subject: Remove Windows CE. Remove #ifdef sections for Q_OS_WINCE and wince .pro file clauses. Task-number: QTBUG-51673 Change-Id: I07ea3a9522d5b6bd8cce6f5256d92e65a699e3f5 Reviewed-by: Yoann Lopes --- .../directshow/player/directshowplayerservice.cpp | 28 +--------------------- .../directshow/player/directshowplayerservice.h | 4 ---- src/plugins/directshow/player/player.pri | 19 +++++---------- 3 files changed, 7 insertions(+), 44 deletions(-) (limited to 'src/plugins/directshow/player') diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp index 7c2cd8a9a..f5691012c 100644 --- a/src/plugins/directshow/player/directshowplayerservice.cpp +++ b/src/plugins/directshow/player/directshowplayerservice.cpp @@ -47,11 +47,9 @@ #include "directshowplayerservice.h" -#ifndef Q_OS_WINCE #include "directshowaudioendpointcontrol.h" #include "directshowmetadatacontrol.h" #include "vmr9videowindowcontrol.h" -#endif #include "directshowiosource.h" #include "directshowplayercontrol.h" #include "directshowvideorenderercontrol.h" @@ -96,14 +94,10 @@ private: DirectShowPlayerService::DirectShowPlayerService(QObject *parent) : QMediaService(parent) , m_playerControl(0) -#ifndef Q_OS_WINCE , m_metaDataControl(0) -#endif , m_videoRendererControl(0) -#ifndef Q_OS_WINCE , m_videoWindowControl(0) , m_audioEndpointControl(0) -#endif , m_taskThread(0) , m_loop(qt_directShowEventLoop()) , m_pendingTasks(0) @@ -127,10 +121,8 @@ DirectShowPlayerService::DirectShowPlayerService(QObject *parent) , m_dontCacheNextSeekResult(false) { m_playerControl = new DirectShowPlayerControl(this); -#ifndef Q_OS_WINCE m_metaDataControl = new DirectShowMetaDataControl(this); m_audioEndpointControl = new DirectShowAudioEndpointControl(this); -#endif m_taskThread = new DirectShowPlayerServiceThread(this); m_taskThread->start(); @@ -161,14 +153,10 @@ DirectShowPlayerService::~DirectShowPlayerService() } delete m_playerControl; -#ifndef Q_OS_WINCE delete m_audioEndpointControl; delete m_metaDataControl; -#endif delete m_videoRendererControl; -#ifndef Q_OS_WINCE delete m_videoWindowControl; -#endif ::CloseHandle(m_taskHandle); } @@ -177,18 +165,12 @@ QMediaControl *DirectShowPlayerService::requestControl(const char *name) { if (qstrcmp(name, QMediaPlayerControl_iid) == 0) { return m_playerControl; -#ifndef Q_OS_WINCE } else if (qstrcmp(name, QAudioOutputSelectorControl_iid) == 0) { return m_audioEndpointControl; } else if (qstrcmp(name, QMetaDataReaderControl_iid) == 0) { return m_metaDataControl; -#endif } else if (qstrcmp(name, QVideoRendererControl_iid) == 0) { - if (!m_videoRendererControl -#ifndef Q_OS_WINCE - && !m_videoWindowControl -#endif - ){ + if (!m_videoRendererControl && !m_videoWindowControl) { m_videoRendererControl = new DirectShowVideoRendererControl(m_loop); connect(m_videoRendererControl, SIGNAL(filterChanged()), @@ -196,7 +178,6 @@ QMediaControl *DirectShowPlayerService::requestControl(const char *name) return m_videoRendererControl; } -#ifndef Q_OS_WINCE } else if (qstrcmp(name, QVideoWindowControl_iid) == 0) { if (!m_videoRendererControl && !m_videoWindowControl) { IBaseFilter *filter; @@ -219,7 +200,6 @@ QMediaControl *DirectShowPlayerService::requestControl(const char *name) return m_videoWindowControl; } -#endif } return 0; } @@ -235,14 +215,12 @@ void DirectShowPlayerService::releaseControl(QMediaControl *control) delete m_videoRendererControl; m_videoRendererControl = 0; -#ifndef Q_OS_WINCE } else if (control == m_videoWindowControl) { setVideoOutput(0); delete m_videoWindowControl; m_videoWindowControl = 0; -#endif } } @@ -268,9 +246,7 @@ void DirectShowPlayerService::load(const QMediaContent &media, QIODevice *stream m_seekable = false; m_atEnd = false; m_dontCacheNextSeekResult = false; -#ifndef Q_OS_WINCE m_metaDataControl->reset(); -#endif if (m_resources.isEmpty() && !stream) { m_pendingTasks = 0; @@ -1174,9 +1150,7 @@ void DirectShowPlayerService::customEvent(QEvent *event) QMutexLocker locker(&m_mutex); m_playerControl->updateMediaInfo(m_duration, m_streamTypes, m_seekable); -#ifndef Q_OS_WINCE m_metaDataControl->updateMetadata(m_graph, m_source, m_url.toString()); -#endif updateStatus(); } else if (event->type() == QEvent::Type(Error)) { diff --git a/src/plugins/directshow/player/directshowplayerservice.h b/src/plugins/directshow/player/directshowplayerservice.h index 9419a8a99..b8d30e79a 100644 --- a/src/plugins/directshow/player/directshowplayerservice.h +++ b/src/plugins/directshow/player/directshowplayerservice.h @@ -176,14 +176,10 @@ private: }; DirectShowPlayerControl *m_playerControl; -#ifndef Q_OS_WINCE DirectShowMetaDataControl *m_metaDataControl; -#endif DirectShowVideoRendererControl *m_videoRendererControl; -#ifndef Q_OS_WINCE QVideoWindowControl *m_videoWindowControl; DirectShowAudioEndpointControl *m_audioEndpointControl; -#endif QThread *m_taskThread; DirectShowEventLoop *m_loop; diff --git a/src/plugins/directshow/player/player.pri b/src/plugins/directshow/player/player.pri index c5fb8442a..0bc9c6d0a 100644 --- a/src/plugins/directshow/player/player.pri +++ b/src/plugins/directshow/player/player.pri @@ -1,7 +1,6 @@ INCLUDEPATH += $$PWD -LIBS += -lstrmiids -ldmoguids -luuid -lole32 -loleaut32 -!wince: LIBS += -lmsdmo -lgdi32 +LIBS += -lstrmiids -ldmoguids -luuid -lole32 -loleaut32 -lmsdmo -lgdi32 qtHaveModule(widgets): QT += widgets @@ -21,7 +20,10 @@ HEADERS += \ $$PWD/directshowsamplescheduler.h \ $$PWD/directshowvideorenderercontrol.h \ $$PWD/mediasamplevideobuffer.h \ - $$PWD/videosurfacefilter.h + $$PWD/videosurfacefilter.h \ + $$PWD/directshowaudioendpointcontrol.h \ + $$PWD/directshowmetadatacontrol.h \ + $$PWD/vmr9videowindowcontrol.h SOURCES += \ $$PWD/directshoweventloop.cpp \ @@ -35,19 +37,10 @@ SOURCES += \ $$PWD/directshowsamplescheduler.cpp \ $$PWD/directshowvideorenderercontrol.cpp \ $$PWD/mediasamplevideobuffer.cpp \ - $$PWD/videosurfacefilter.cpp - -!wince { -HEADERS += \ - $$PWD/directshowaudioendpointcontrol.h \ - $$PWD/directshowmetadatacontrol.h \ - $$PWD/vmr9videowindowcontrol.h - -SOURCES += \ + $$PWD/videosurfacefilter.cpp \ $$PWD/directshowaudioendpointcontrol.cpp \ $$PWD/directshowmetadatacontrol.cpp \ $$PWD/vmr9videowindowcontrol.cpp -} config_evr { DEFINES += HAVE_EVR -- cgit v1.2.3