diff options
Diffstat (limited to 'src/plugins/directshow/common/directshowutils.cpp')
| -rw-r--r-- | src/plugins/directshow/common/directshowutils.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/directshow/common/directshowutils.cpp b/src/plugins/directshow/common/directshowutils.cpp index 96fabd6da..8f3f321e7 100644 --- a/src/plugins/directshow/common/directshowutils.cpp +++ b/src/plugins/directshow/common/directshowutils.cpp @@ -150,7 +150,7 @@ bool DirectShowUtils::matchPin(IPin *pin, PIN_DIRECTION pinDirection, BOOL shoul if (isConnected == shouldBeConnected) return hasPinDirection(pin, pinDirection, hrOut); - return SUCCEEDED(*hrOut); + return false; } /** @@ -183,9 +183,6 @@ bool DirectShowUtils::findUnconnectedPin(IBaseFilter *filter, PIN_DIRECTION pinD (*pin)->AddRef(); return true; } - - if (FAILED(*hrOut)) - return false; } qCDebug(qtDirectShowPlugin, "No unconnected pins found"); @@ -285,7 +282,7 @@ bool DirectShowUtils::connectFilters(IGraphBuilder *graph, // Try to connect to the upstream filter first. if (findAndConnect(upstreamFilter)) - return S_OK; + return false; const auto getFilters = [graph, hrOut]() -> IEnumFilters * { IEnumFilters *f = nullptr; @@ -304,10 +301,10 @@ bool DirectShowUtils::connectFilters(IGraphBuilder *graph, while (S_OK == filters->Next(1, &nextFilter, 0)) { const ScopedSafeRelease<IBaseFilter> releaseNextFilter { &nextFilter }; if (nextFilter && findAndConnect(nextFilter)) - break; + return true; } - return SUCCEEDED(*hrOut); + return false; } QT_END_NAMESPACE |