diff options
Diffstat (limited to 'src/multimedia/playback/qmedianetworkplaylistprovider.cpp')
-rw-r--r-- | src/multimedia/playback/qmedianetworkplaylistprovider.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp index 7de90d9a1..a4ad97251 100644 --- a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp +++ b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp @@ -41,7 +41,7 @@ #include "qmediaplaylistprovider_p.h" #include "qmediacontent.h" #include "qmediaobject_p.h" -#include "playlistfileparser_p.h" +#include "qplaylistfileparser_p.h" QT_BEGIN_NAMESPACE @@ -62,8 +62,8 @@ public: bool QMediaNetworkPlaylistProviderPrivate::load(const QNetworkRequest &request) { - parser.stop(); - parser.start(request, false); + parser.abort(); + parser.start(request); return true; } @@ -83,12 +83,14 @@ void QMediaNetworkPlaylistProviderPrivate::_q_handleParserError(QPlaylistFilePar case QPlaylistFileParser::FormatNotSupportedError: playlistError = QMediaPlaylist::FormatNotSupportedError; break; + case QPlaylistFileParser::ResourceError: + // fall through case QPlaylistFileParser::NetworkError: playlistError = QMediaPlaylist::NetworkError; break; } - parser.stop(); + parser.abort(); emit q->loadFailed(playlistError, errorMessage); } |