diff options
author | Ling Hu <ling.hu@nokia.com> | 2011-09-09 11:25:53 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-30 04:51:42 +0200 |
commit | 989aefc5f1bd47646887e00c75279257482f2eae (patch) | |
tree | 2ba6b7b78c6bc827229aa0357ccac91fbfd18d5c /src | |
parent | ee0ea8c4424dc89e3bb44895a5510729f15eb0c3 (diff) |
Update background audio element to use new service name
Change-Id: I8f0480e4fb40b034f75dcd900f2d440fd0e7610d
Reviewed-on: http://codereview.qt-project.org/4493
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/multimedia/qdeclarativebackgroundaudio.cpp | 4 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativemediabase.cpp | 4 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativemediabase_p.h | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/imports/multimedia/qdeclarativebackgroundaudio.cpp b/src/imports/multimedia/qdeclarativebackgroundaudio.cpp index d56e9992f..dee32420d 100644 --- a/src/imports/multimedia/qdeclarativebackgroundaudio.cpp +++ b/src/imports/multimedia/qdeclarativebackgroundaudio.cpp @@ -48,7 +48,7 @@ void QDeclarativeBackgroundAudio::classBegin() void QDeclarativeBackgroundAudio::componentComplete() { - setObject(this, QMediaServiceProviderHint(QMediaServiceProviderHint::BackgroundPlayback)); + setObject(this, Q_MEDIASERVICE_BACKGROUNDMEDIAPLAYER); if (m_mediaService) { m_backgroundPlaybackControl = static_cast<QMediaBackgroundPlaybackControl*>( @@ -61,6 +61,8 @@ void QDeclarativeBackgroundAudio::componentComplete() } else { qWarning("can not get QMediaBackgroundPlaybackControl!"); } + } else { + qWarning("Unable to get any background mediaplayer!"); } QDeclarativeMediaBase::componentComplete(); } diff --git a/src/imports/multimedia/qdeclarativemediabase.cpp b/src/imports/multimedia/qdeclarativemediabase.cpp index a7435029b..5d562d074 100644 --- a/src/imports/multimedia/qdeclarativemediabase.cpp +++ b/src/imports/multimedia/qdeclarativemediabase.cpp @@ -260,12 +260,12 @@ void QDeclarativeMediaBase::shutdown() } -void QDeclarativeMediaBase::setObject(QObject *object, const QMediaServiceProviderHint& hint) +void QDeclarativeMediaBase::setObject(QObject *object, const QByteArray &type) { m_qmlObject = object; if ((m_mediaProvider = QMediaServiceProvider::defaultServiceProvider()) != 0) { - m_mediaService = m_mediaProvider->requestService(Q_MEDIASERVICE_MEDIAPLAYER, hint); + m_mediaService = m_mediaProvider->requestService(type); if (m_mediaService != 0) { m_playerControl = qobject_cast<QMediaPlayerControl *>( m_mediaService->requestControl(QMediaPlayerControl_iid)); diff --git a/src/imports/multimedia/qdeclarativemediabase_p.h b/src/imports/multimedia/qdeclarativemediabase_p.h index 70e349c97..964bb074d 100644 --- a/src/imports/multimedia/qdeclarativemediabase_p.h +++ b/src/imports/multimedia/qdeclarativemediabase_p.h @@ -123,7 +123,7 @@ public: protected: void shutdown(); - void setObject(QObject *object, const QMediaServiceProviderHint& hint = QMediaServiceProviderHint()); + void setObject(QObject *object, const QByteArray &type = Q_MEDIASERVICE_MEDIAPLAYER); virtual void sourceChanged() = 0; virtual void autoLoadChanged() = 0; |