summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2013-02-14 12:00:46 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-14 13:24:58 +0100
commit41dc5467bf0d611c33222d8385ca3331629fcfd9 (patch)
tree3011696c76993b909160ee81f6ae708fb39a823e
parentfc62718e983c945f013ebfd92b77155b38a04087 (diff)
Fix warnings about unused variables.
Change-Id: I147ff8624faa98396d6c48801c41a731fd02ac10 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
-rw-r--r--src/plugins/directshow/camera/dscameraservice.cpp1
-rw-r--r--src/plugins/directshow/camera/dscamerasession.cpp2
-rw-r--r--src/plugins/directshow/camera/dsimagecapturecontrol.h2
-rw-r--r--src/plugins/directshow/camera/dsvideowidgetcontrol.cpp1
-rw-r--r--src/plugins/directshow/player/directshowiosource.cpp1
-rw-r--r--src/plugins/directshow/player/directshowplayerservice.cpp6
-rw-r--r--src/plugins/directshow/player/videosurfacefilter.cpp3
7 files changed, 15 insertions, 1 deletions
diff --git a/src/plugins/directshow/camera/dscameraservice.cpp b/src/plugins/directshow/camera/dscameraservice.cpp
index fcbd1ef58..8d5d67d93 100644
--- a/src/plugins/directshow/camera/dscameraservice.cpp
+++ b/src/plugins/directshow/camera/dscameraservice.cpp
@@ -119,6 +119,7 @@ QMediaControl* DSCameraService::requestControl(const char *name)
void DSCameraService::releaseControl(QMediaControl *control)
{
+ Q_UNUSED(control)
// Implemented as a singleton, so we do nothing.
}
diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp
index c82e3006e..0b3a4d551 100644
--- a/src/plugins/directshow/camera/dscamerasession.cpp
+++ b/src/plugins/directshow/camera/dscamerasession.cpp
@@ -96,6 +96,8 @@ public:
STDMETHODIMP SampleCB(double Time, IMediaSample *pSample)
{
+ Q_UNUSED(Time)
+ Q_UNUSED(pSample)
return E_NOTIMPL;
}
diff --git a/src/plugins/directshow/camera/dsimagecapturecontrol.h b/src/plugins/directshow/camera/dsimagecapturecontrol.h
index ff8dc9bff..e15186c81 100644
--- a/src/plugins/directshow/camera/dsimagecapturecontrol.h
+++ b/src/plugins/directshow/camera/dsimagecapturecontrol.h
@@ -58,7 +58,7 @@ public:
int capture(const QString &fileName);
virtual QCameraImageCapture::DriveMode driveMode() const { return QCameraImageCapture::SingleImageCapture; }
- virtual void setDriveMode(QCameraImageCapture::DriveMode mode) { }
+ virtual void setDriveMode(QCameraImageCapture::DriveMode mode) { Q_UNUSED(mode) }
virtual void cancelCapture() {}
diff --git a/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp b/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp
index 9008ceff9..1f2996fab 100644
--- a/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp
+++ b/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp
@@ -107,6 +107,7 @@ void DSVideoWidgetSurface::updateVideoRect()
void DSVideoWidgetSurface::paint(QPainter *painter)
{
+ Q_UNUSED(painter)
}
diff --git a/src/plugins/directshow/player/directshowiosource.cpp b/src/plugins/directshow/player/directshowiosource.cpp
index 7dc5f648d..ee2ea869a 100644
--- a/src/plugins/directshow/player/directshowiosource.cpp
+++ b/src/plugins/directshow/player/directshowiosource.cpp
@@ -174,6 +174,7 @@ HRESULT DirectShowIOSource::GetClassID(CLSID *pClassID)
// IMediaFilter
HRESULT DirectShowIOSource::Run(REFERENCE_TIME tStart)
{
+ Q_UNUSED(tStart)
QMutexLocker locker(&m_mutex);
m_state = State_Running;
diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp
index 8b09d8109..94f439452 100644
--- a/src/plugins/directshow/player/directshowplayerservice.cpp
+++ b/src/plugins/directshow/player/directshowplayerservice.cpp
@@ -357,6 +357,7 @@ void DirectShowPlayerService::doSetUrlSource(QMutexLocker *locker)
void DirectShowPlayerService::doSetStreamSource(QMutexLocker *locker)
{
+ Q_UNUSED(locker)
DirectShowIOSource *source = new DirectShowIOSource(m_loop);
source->setDevice(m_stream);
@@ -512,6 +513,7 @@ void DirectShowPlayerService::doRender(QMutexLocker *locker)
void DirectShowPlayerService::doFinalizeLoad(QMutexLocker *locker)
{
+ Q_UNUSED(locker)
if (m_graphStatus != Loaded) {
if (IMediaEvent *event = com_cast<IMediaEvent>(m_graph, IID_IMediaEvent)) {
event->GetEventHandle(reinterpret_cast<OAEVENT *>(&m_eventHandle));
@@ -783,6 +785,7 @@ void DirectShowPlayerService::stop()
void DirectShowPlayerService::doStop(QMutexLocker *locker)
{
+ Q_UNUSED(locker)
if (m_executedTasks & (Play | Pause)) {
if (IMediaControl *control = com_cast<IMediaControl>(m_graph, IID_IMediaControl)) {
control->Stop();
@@ -1002,6 +1005,7 @@ void DirectShowPlayerService::setAudioOutput(IBaseFilter *filter)
void DirectShowPlayerService::doReleaseAudioOutput(QMutexLocker *locker)
{
+ Q_UNUSED(locker)
m_pendingTasks |= m_executedTasks & (Play | Pause);
if (IMediaControl *control = com_cast<IMediaControl>(m_graph, IID_IMediaControl)) {
@@ -1075,6 +1079,7 @@ void DirectShowPlayerService::setVideoOutput(IBaseFilter *filter)
void DirectShowPlayerService::doReleaseVideoOutput(QMutexLocker *locker)
{
+ Q_UNUSED(locker)
m_pendingTasks |= m_executedTasks & (Play | Pause);
if (IMediaControl *control = com_cast<IMediaControl>(m_graph, IID_IMediaControl)) {
@@ -1170,6 +1175,7 @@ void DirectShowPlayerService::videoOutputChanged()
void DirectShowPlayerService::graphEvent(QMutexLocker *locker)
{
+ Q_UNUSED(locker)
if (IMediaEvent *event = com_cast<IMediaEvent>(m_graph, IID_IMediaEvent)) {
long eventCode;
LONG_PTR param1;
diff --git a/src/plugins/directshow/player/videosurfacefilter.cpp b/src/plugins/directshow/player/videosurfacefilter.cpp
index bdc2c808b..13438857f 100644
--- a/src/plugins/directshow/player/videosurfacefilter.cpp
+++ b/src/plugins/directshow/player/videosurfacefilter.cpp
@@ -160,6 +160,7 @@ HRESULT VideoSurfaceFilter::Stop()
HRESULT VideoSurfaceFilter::GetState(DWORD dwMilliSecsTimeout, FILTER_STATE *pState)
{
+ Q_UNUSED(dwMilliSecsTimeout)
if (!pState)
return E_POINTER;
@@ -264,6 +265,8 @@ ULONG VideoSurfaceFilter::GetMiscFlags()
HRESULT VideoSurfaceFilter::Connect(IPin *pReceivePin, const AM_MEDIA_TYPE *pmt)
{
+ Q_UNUSED(pReceivePin)
+ Q_UNUSED(pmt)
// This is an input pin, you shouldn't be calling Connect on it.
return E_POINTER;
}