slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correctly clear the current media in Audio and MediaPlayer qml elements.

Browse Source 
When setting the source to an empty string in these elements, pass an
empty QMediaContent to the backend rather than an empty URL. The former
is the correct way to clear the current media.

Task-number: QTBUG-34125
Change-Id: I3dd7b07abc0bd23a1253c8c0e075b174c17a4d3f
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
This commit is contained in:
Yoann Lopes
2013-10-17 12:22:42 +02:00
committed by The Qt Project
parent 068169528c
commit d7dd22b995
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/imports/multimedia/qdeclarativeaudio.cpp
View File

@@ -183,8 +183,9 @@ void QDeclarativeAudio::setSource(const QUrl &url)
return; return;
m_source = url; m_source = url;
m_content = m_source.isEmpty() ? QMediaContent() : m_source;
m_loaded = false; m_loaded = false;
if (m_complete && (m_autoLoad || url.isEmpty() || m_autoPlay)) { if (m_complete && (m_autoLoad || m_content.isNull() || m_autoPlay)) {
if (m_error != QMediaPlayer::ServiceMissingError && m_error != QMediaPlayer::NoError) { if (m_error != QMediaPlayer::ServiceMissingError && m_error != QMediaPlayer::NoError) {
m_error = QMediaPlayer::NoError; m_error = QMediaPlayer::NoError;
m_errorString = QString(); m_errorString = QString();
@@ -192,7 +193,7 @@ void QDeclarativeAudio::setSource(const QUrl &url)
emit errorChanged(); emit errorChanged();
} }
m_player->setMedia(m_source, 0); m_player->setMedia(m_content, 0);
m_loaded = true; m_loaded = true;
} }
else else
@@ -245,7 +246,7 @@ void QDeclarativeAudio::setPlaybackState(QMediaPlayer::State playbackState)
switch (playbackState){ switch (playbackState){
case (QMediaPlayer::PlayingState): case (QMediaPlayer::PlayingState):
if (!m_loaded) { if (!m_loaded) {
m_player->setMedia(m_source, 0); m_player->setMedia(m_content, 0);
m_player->setPosition(m_position); m_player->setPosition(m_position);
m_loaded = true; m_loaded = true;
} }
@@ -254,7 +255,7 @@ void QDeclarativeAudio::setPlaybackState(QMediaPlayer::State playbackState)
case (QMediaPlayer::PausedState): case (QMediaPlayer::PausedState):
if (!m_loaded) { if (!m_loaded) {
m_player->setMedia(m_source, 0); m_player->setMedia(m_content, 0);
m_player->setPosition(m_position); m_player->setPosition(m_position);
m_loaded = true; m_loaded = true;
} }
@@ -681,8 +682,8 @@ void QDeclarativeAudio::componentComplete()
if (!qFuzzyCompare(m_playbackRate, qreal(1.0))) if (!qFuzzyCompare(m_playbackRate, qreal(1.0)))
m_player->setPlaybackRate(m_playbackRate); m_player->setPlaybackRate(m_playbackRate);
if (!m_source.isEmpty() && (m_autoLoad || m_autoPlay)) { if (!m_content.isNull() && (m_autoLoad || m_autoPlay)) {
m_player->setMedia(m_source, 0); m_player->setMedia(m_content, 0);
m_loaded = true; m_loaded = true;
if (m_position > 0) if (m_position > 0)
m_player->setPosition(m_position); m_player->setPosition(m_position);
@@ -691,7 +692,7 @@ void QDeclarativeAudio::componentComplete()
m_complete = true; m_complete = true;
if (m_autoPlay) { if (m_autoPlay) {
if (m_source.isEmpty()) { if (m_content.isNull()) {
m_player->stop(); m_player->stop();
} else { } else {
m_player->play(); m_player->play();

1
src/imports/multimedia/qdeclarativeaudio_p.h
View File

@@ -257,6 +257,7 @@ private:
QMediaPlayer::Error m_error; QMediaPlayer::Error m_error;
QString m_errorString; QString m_errorString;
QUrl m_source; QUrl m_source;
QMediaContent m_content;
QScopedPointer<QDeclarativeMediaMetaData> m_metaData; QScopedPointer<QDeclarativeMediaMetaData> m_metaData;