From 303a2b6e6a7d8e058b9431e623701f99b7ae9f45 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Mon, 16 Apr 2018 14:48:38 +0200 Subject: DirectShowPlayerService: Proper check of DirectShowUtils::connectFilters's result The function returns a bool no HRESULT. Neither SUCCEEDED nor FAILED returns the proper result when fed with a bool. Change-Id: Ic46957f1f2c9098afac2e216fe5ef2dd1dee00a6 Reviewed-by: Friedemann Kleint Reviewed-by: VaL Doroshchuk --- src/plugins/directshow/player/directshowplayerservice.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp index 63f738bbe..d7d190c6a 100644 --- a/src/plugins/directshow/player/directshowplayerservice.cpp +++ b/src/plugins/directshow/player/directshowplayerservice.cpp @@ -723,7 +723,7 @@ void DirectShowPlayerService::doSetVideoProbe(QMutexLocker *locker) for (int i = 0; i != items; ++i) { mediaType->subtype = subtypes[i]; m_videoSampleGrabber->setMediaType(&mediaType); - if (SUCCEEDED(DirectShowUtils::connectFilters(m_graph, m_source, m_videoSampleGrabber->filter(), true))) { + if (DirectShowUtils::connectFilters(m_graph, m_source, m_videoSampleGrabber->filter(), true)) { connected = true; break; } @@ -760,7 +760,7 @@ void DirectShowPlayerService::doSetAudioProbe(QMutexLocker *locker) return; } - if (FAILED(DirectShowUtils::connectFilters(m_graph, m_source, m_audioSampleGrabber->filter(), true))) { + if (!DirectShowUtils::connectFilters(m_graph, m_source, m_audioSampleGrabber->filter(), true)) { qCWarning(qtDirectShowPlugin, "Failed to connect the audio sample grabber"); return; } -- cgit v1.2.3