diff options
Diffstat (limited to 'src/plugins/directshow')
15 files changed, 35 insertions, 40 deletions
diff --git a/src/plugins/directshow/camera/dscameracontrol.h b/src/plugins/directshow/camera/dscameracontrol.h index 5c32f73f7..5c7661643 100644 --- a/src/plugins/directshow/camera/dscameracontrol.h +++ b/src/plugins/directshow/camera/dscameracontrol.h @@ -45,8 +45,6 @@ #include <QtCore/qobject.h> #include <qcameracontrol.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class DSCameraService; @@ -87,8 +85,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/plugins/directshow/camera/dscameraservice.cpp b/src/plugins/directshow/camera/dscameraservice.cpp index 306cd16bb..2c6ea0e94 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/dscameraservice.h b/src/plugins/directshow/camera/dscameraservice.h index 0f2d3182b..e39ea0adc 100644 --- a/src/plugins/directshow/camera/dscameraservice.h +++ b/src/plugins/directshow/camera/dscameraservice.h @@ -46,8 +46,6 @@ #include <qmediaservice.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class DSCameraControl; @@ -85,6 +83,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp index 71f0c07cf..f921dac20 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/dscamerasession.h b/src/plugins/directshow/camera/dscamerasession.h index 59277fa27..db0038813 100644 --- a/src/plugins/directshow/camera/dscamerasession.h +++ b/src/plugins/directshow/camera/dscamerasession.h @@ -56,11 +56,15 @@ #include <dshow.h> #include <objbase.h> #include <initguid.h> -#pragma comment(lib, "strmiids.lib") -#pragma comment(lib, "ole32.lib") +#ifdef Q_CC_MSVC +# pragma comment(lib, "strmiids.lib") +# pragma comment(lib, "ole32.lib") +#endif // Q_CC_MSVC #include <windows.h> -#pragma include_alias("dxtrans.h","qedit.h") +#ifdef Q_CC_MSVC +# pragma include_alias("dxtrans.h","qedit.h") +#endif // Q_CC_MSVC #define __IDxtCompositor_INTERFACE_DEFINED__ #define __IDxtAlphaSetter_INTERFACE_DEFINED__ #define __IDxtJpeg_INTERFACE_DEFINED__ @@ -70,8 +74,6 @@ struct ICaptureGraphBuilder2; struct ISampleGrabber; -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class DSVideoRenderer; @@ -202,7 +204,5 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/plugins/directshow/camera/dsimagecapturecontrol.h b/src/plugins/directshow/camera/dsimagecapturecontrol.h index b8bc1b31a..e39539191 100644 --- a/src/plugins/directshow/camera/dsimagecapturecontrol.h +++ b/src/plugins/directshow/camera/dsimagecapturecontrol.h @@ -45,8 +45,6 @@ #include <qcameraimagecapturecontrol.h> #include "dscamerasession.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class DSImageCaptureControl : public QCameraImageCaptureControl @@ -60,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() {} @@ -75,6 +73,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // DSCAPTURECONTROL_H diff --git a/src/plugins/directshow/camera/dsvideodevicecontrol.h b/src/plugins/directshow/camera/dsvideodevicecontrol.h index 29c18ad27..11ee550bc 100644 --- a/src/plugins/directshow/camera/dsvideodevicecontrol.h +++ b/src/plugins/directshow/camera/dsvideodevicecontrol.h @@ -45,8 +45,6 @@ #include <qvideodeviceselectorcontrol.h> #include <QStringList> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class DSCameraSession; @@ -80,6 +78,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/plugins/directshow/camera/dsvideorenderer.h b/src/plugins/directshow/camera/dsvideorenderer.h index 4c5576bc8..3621cc5a5 100644 --- a/src/plugins/directshow/camera/dsvideorenderer.h +++ b/src/plugins/directshow/camera/dsvideorenderer.h @@ -47,8 +47,6 @@ class CameraFormatConverter; -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -72,6 +70,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // DSVIDEORENDERER_H diff --git a/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp b/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp index db2ef1a54..fde9f554e 100644 --- a/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp +++ b/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp @@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE DSVideoWidgetSurface::DSVideoWidgetSurface(QLabel *pWidget, QObject *parent) + : QAbstractVideoSurface(parent) { widget = pWidget; myPixmap = 0; @@ -106,11 +107,13 @@ void DSVideoWidgetSurface::updateVideoRect() void DSVideoWidgetSurface::paint(QPainter *painter) { + Q_UNUSED(painter) } DSVideoWidgetControl::DSVideoWidgetControl(DSCameraSession* session, QObject *parent) : - m_session(session), QVideoWidgetControl(parent), + QVideoWidgetControl(parent), + m_session(session), m_widget(new QLabel()), m_fullScreen(false) { diff --git a/src/plugins/directshow/camera/dsvideowidgetcontrol.h b/src/plugins/directshow/camera/dsvideowidgetcontrol.h index aced707fa..ac40fbd7c 100644 --- a/src/plugins/directshow/camera/dsvideowidgetcontrol.h +++ b/src/plugins/directshow/camera/dsvideowidgetcontrol.h @@ -51,8 +51,6 @@ #include <qvideowidgetcontrol.h> #include "dscameracontrol.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class DSVideoWidgetSurface : public QAbstractVideoSurface @@ -149,6 +147,4 @@ private: // Data QT_END_NAMESPACE -QT_END_HEADER - #endif // DSVideoWidgetControl_H diff --git a/src/plugins/directshow/dsserviceplugin.cpp b/src/plugins/directshow/dsserviceplugin.cpp index 8b487674b..dca7430af 100644 --- a/src/plugins/directshow/dsserviceplugin.cpp +++ b/src/plugins/directshow/dsserviceplugin.cpp @@ -69,8 +69,10 @@ extern const CLSID CLSID_VideoInputDeviceCategory; #include <dshow.h> #include <objbase.h> #include <initguid.h> -#pragma comment(lib, "strmiids.lib") -#pragma comment(lib, "ole32.lib") +#ifdef Q_CC_MSVC +# pragma comment(lib, "strmiids.lib") +# pragma comment(lib, "ole32.lib") +#endif // Q_CC_MSVC #include <windows.h> #include <ocidl.h> #endif diff --git a/src/plugins/directshow/player/directshowiosource.cpp b/src/plugins/directshow/player/directshowiosource.cpp index b9fdd09e6..f382b3b9c 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; @@ -627,7 +628,7 @@ bool DirectShowRcSource::open(const QUrl &url) qDebug("qrc file %s", qPrintable(m_file.fileName())); if (m_file.open(QIODevice::ReadOnly)) { - qDebug("Size %d", m_file.size()); + qDebug("Size %d", int(m_file.size())); qDebug("Sequential %d", int(m_file.isSequential())); setDevice(&m_file); diff --git a/src/plugins/directshow/player/directshowmediatypelist.cpp b/src/plugins/directshow/player/directshowmediatypelist.cpp index 35eb34e27..1a6298e2b 100644 --- a/src/plugins/directshow/player/directshowmediatypelist.cpp +++ b/src/plugins/directshow/player/directshowmediatypelist.cpp @@ -198,7 +198,7 @@ HRESULT DirectShowMediaTypeList::nextMediaType( if (fetchedCount) *fetchedCount = boundedCount; - return boundedCount == count ? S_OK : S_FALSE; + return boundedCount == int(count) ? S_OK : S_FALSE; } } diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp index a06788e4f..d89ed7bdb 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 e31b270c1..b8a775bb7 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; } @@ -547,19 +550,20 @@ HRESULT VideoSurfaceFilter::cloneMediaType(int token, int index, IEnumMediaTypes void VideoSurfaceFilter::customEvent(QEvent *event) { - if (event->type() == StartSurface) { + const int type = event->type(); + if (type == StartSurface) { QMutexLocker locker(&m_mutex); m_startResult = start(); m_wait.wakeAll(); - } else if (event->type() == StopSurface) { + } else if (type == StopSurface) { QMutexLocker locker(&m_mutex); stop(); m_wait.wakeAll(); - } else if (event->type() == FlushSurface) { + } else if (type == FlushSurface) { QMutexLocker locker(&m_mutex); flush(); |