summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVal Doroshchuk <valentyn.doroshchuk@qt.io>2019-04-12 09:28:12 +0200
committerVaL Doroshchuk <valentyn.doroshchuk@qt.io>2019-05-20 11:16:21 +0200
commit1835a9f398c1400a254b5df8f8da2f1e357a45a0 (patch)
tree95e16a0745c07aa1d6d0229da13105f0a08abca6
parent7aeebc07b0566b2cf18f3f1f5656eac4d6386aaf (diff)
DirectShow: Report about an error for wrong urls
If wrong url is passed, no need to try it again. But report an error instead. Also there cannot be empty url, because if an url is empty, NoMedia should be emitted. Fixes tst_QMediaPlayerBackend::playlistObject() Task-number: QTBUG-65574 Change-Id: I658b16cfe7b96c202715651d6b20d01a9af6c746 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
-rw-r--r--src/plugins/directshow/player/directshowplayerservice.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp
index bf7cbbfe4..2eeb06159 100644
--- a/src/plugins/directshow/player/directshowplayerservice.cpp
+++ b/src/plugins/directshow/player/directshowplayerservice.cpp
@@ -403,8 +403,6 @@ void DirectShowPlayerService::doSetUrlSource(QMutexLocker *locker)
m_pendingTasks |= SetRate;
m_source = source;
- } else if (!m_resources.isEmpty()) {
- m_pendingTasks |= SetUrlSource;
} else {
m_graphStatus = InvalidMedia;