summaryrefslogtreecommitdiffstats
path: root/src/plugins/directshow/player/directshowplayerservice.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2016-04-15 09:38:19 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2016-04-28 14:24:55 +0000
commit0a73b2e63a5cec80edc89cfefd7d86064d393c46 (patch)
tree5e87330f468a13f5469cfbea43f97e1b6c610fd1 /src/plugins/directshow/player/directshowplayerservice.cpp
parentc3ea9be0d49ec1eecda9d07e933d5426ed52670a (diff)
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 <yoann.lopes@qt.io>
Diffstat (limited to 'src/plugins/directshow/player/directshowplayerservice.cpp')
-rw-r--r--src/plugins/directshow/player/directshowplayerservice.cpp28
1 files changed, 1 insertions, 27 deletions
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)) {