summaryrefslogtreecommitdiffstats
path: root/src/plugins/directshow
diff options
context:
space:
mode:
authorLars Schmertmann <Lars.Schmertmann@governikus.de>2020-06-27 12:54:18 +0200
committerLars Schmertmann <Lars.Schmertmann@governikus.de>2020-06-28 17:09:06 +0200
commitf3d9409a8afe0ba805060aaebf5389c866807e72 (patch)
tree7f882a3bcc39b88b0a2c008156c50fea9a292c22 /src/plugins/directshow
parent1818334beafcf8668b30b8ee63031f871a0c8d03 (diff)
Add ; to Q_UNUSED
This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I5466906d759a7cc046d77a21e2c647a4b938d070 Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
Diffstat (limited to 'src/plugins/directshow')
-rw-r--r--src/plugins/directshow/common/directshowbasefilter.cpp2
-rw-r--r--src/plugins/directshow/common/directshowpin.cpp8
-rw-r--r--src/plugins/directshow/player/directshowiosource.cpp2
-rw-r--r--src/plugins/directshow/player/directshowplayerservice.cpp12
4 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/directshow/common/directshowbasefilter.cpp b/src/plugins/directshow/common/directshowbasefilter.cpp
index 3a13dce0e..6099981cf 100644
--- a/src/plugins/directshow/common/directshowbasefilter.cpp
+++ b/src/plugins/directshow/common/directshowbasefilter.cpp
@@ -76,7 +76,7 @@ HRESULT DirectShowBaseFilter::NotifyEvent(long eventCode, LONG_PTR eventParam1,
HRESULT DirectShowBaseFilter::Run(REFERENCE_TIME tStart)
{
- Q_UNUSED(tStart)
+ Q_UNUSED(tStart);
const std::lock_guard<QRecursiveMutex> locker(m_mutex);
m_startTime = tStart;
diff --git a/src/plugins/directshow/common/directshowpin.cpp b/src/plugins/directshow/common/directshowpin.cpp
index d8129748c..d80b0b08e 100644
--- a/src/plugins/directshow/common/directshowpin.cpp
+++ b/src/plugins/directshow/common/directshowpin.cpp
@@ -360,7 +360,7 @@ bool DirectShowPin::setMediaType(const AM_MEDIA_TYPE *type)
HRESULT DirectShowPin::completeConnection(IPin *pin)
{
- Q_UNUSED(pin)
+ Q_UNUSED(pin);
return S_OK;
}
@@ -371,7 +371,7 @@ HRESULT DirectShowPin::connectionEnded()
HRESULT DirectShowPin::setActive(bool active)
{
- Q_UNUSED(active)
+ Q_UNUSED(active);
return S_OK;
}
@@ -566,7 +566,7 @@ HRESULT DirectShowInputPin::GetAllocator(IMemAllocator **ppAllocator)
HRESULT DirectShowInputPin::NotifyAllocator(IMemAllocator *pAllocator, BOOL bReadOnly)
{
- Q_UNUSED(bReadOnly)
+ Q_UNUSED(bReadOnly);
if (!pAllocator)
return E_POINTER;
@@ -584,7 +584,7 @@ HRESULT DirectShowInputPin::NotifyAllocator(IMemAllocator *pAllocator, BOOL bRea
HRESULT DirectShowInputPin::GetAllocatorRequirements(ALLOCATOR_PROPERTIES *pProps)
{
- Q_UNUSED(pProps)
+ Q_UNUSED(pProps);
return E_NOTIMPL;
}
diff --git a/src/plugins/directshow/player/directshowiosource.cpp b/src/plugins/directshow/player/directshowiosource.cpp
index 5144710b7..54c043c17 100644
--- a/src/plugins/directshow/player/directshowiosource.cpp
+++ b/src/plugins/directshow/player/directshowiosource.cpp
@@ -180,7 +180,7 @@ HRESULT DirectShowIOSource::GetClassID(CLSID *pClassID)
// IMediaFilter
HRESULT DirectShowIOSource::Run(REFERENCE_TIME tStart)
{
- Q_UNUSED(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 3cc42dc21..ce5c9fe56 100644
--- a/src/plugins/directshow/player/directshowplayerservice.cpp
+++ b/src/plugins/directshow/player/directshowplayerservice.cpp
@@ -98,7 +98,7 @@ static QString comError(HRESULT hr)
_com_error error(hr);
return QString::fromWCharArray(error.ErrorMessage());
#else
- Q_UNUSED(hr)
+ Q_UNUSED(hr);
return QString();
#endif
}
@@ -408,7 +408,7 @@ void DirectShowPlayerService::doSetUrlSource(QMutexLocker *locker)
void DirectShowPlayerService::doSetStreamSource(QMutexLocker *locker)
{
- Q_UNUSED(locker)
+ Q_UNUSED(locker);
DirectShowIOSource *source = new DirectShowIOSource(m_loop);
source->setDevice(m_stream);
@@ -1015,7 +1015,7 @@ void DirectShowPlayerService::stop()
void DirectShowPlayerService::doStop(QMutexLocker *locker)
{
- Q_UNUSED(locker)
+ Q_UNUSED(locker);
if (m_executedTasks & (Play | Pause)) {
if (IMediaControl *control = com_cast<IMediaControl>(m_graph, IID_IMediaControl)) {
control->Stop();
@@ -1247,7 +1247,7 @@ void DirectShowPlayerService::setAudioOutput(IBaseFilter *filter)
void DirectShowPlayerService::doReleaseAudioOutput(QMutexLocker *locker)
{
- Q_UNUSED(locker)
+ Q_UNUSED(locker);
m_pendingTasks |= m_executedTasks & (Play | Pause);
if (IMediaControl *control = com_cast<IMediaControl>(m_graph, IID_IMediaControl)) {
@@ -1355,7 +1355,7 @@ void DirectShowPlayerService::updateVideoProbe()
void DirectShowPlayerService::doReleaseVideoOutput(QMutexLocker *locker)
{
- Q_UNUSED(locker)
+ Q_UNUSED(locker);
m_pendingTasks |= m_executedTasks & (Play | Pause);
if (IMediaControl *control = com_cast<IMediaControl>(m_graph, IID_IMediaControl)) {
@@ -1553,7 +1553,7 @@ QT_WARNING_POP
void DirectShowPlayerService::graphEvent(QMutexLocker *locker)
{
- Q_UNUSED(locker)
+ Q_UNUSED(locker);
if (IMediaEvent *event = com_cast<IMediaEvent>(m_graph, IID_IMediaEvent)) {
long eventCode;
LONG_PTR param1;