summaryrefslogtreecommitdiffstats
path: root/src/multimedia/qmediaplaylist.cpp
diff options
context:
space:
mode:
authorDmytro Poplavskiy <dmytro.poplavskiy@nokia.com>2010-05-13 13:19:02 +1000
committerDmytro Poplavskiy <dmytro.poplavskiy@nokia.com>2010-05-13 13:19:02 +1000
commit7ea7ea652b72b50ed309694e1e2dbb23e8789936 (patch)
tree4a5c92e4f29373797808f5eff4fa23a806265090 /src/multimedia/qmediaplaylist.cpp
parent70685adc1e8a041cc74420228edd4b3c2d6a1242 (diff)
Update QMediaPlaylist with request/releaseControl changes.
Diffstat (limited to 'src/multimedia/qmediaplaylist.cpp')
-rw-r--r--src/multimedia/qmediaplaylist.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/multimedia/qmediaplaylist.cpp b/src/multimedia/qmediaplaylist.cpp
index c52ec207e9..4ca1de52c5 100644
--- a/src/multimedia/qmediaplaylist.cpp
+++ b/src/multimedia/qmediaplaylist.cpp
@@ -166,7 +166,7 @@ void QMediaPlaylist::setMediaObject(QMediaObject *mediaObject)
QMediaPlaylistControl *newControl = 0;
if (service)
- newControl = qobject_cast<QMediaPlaylistControl*>(service->control(QMediaPlaylistControl_iid));
+ newControl = qobject_cast<QMediaPlaylistControl*>(service->requestControl(QMediaPlaylistControl_iid));
if (!newControl)
newControl = d->localPlaylistControl;
@@ -193,6 +193,8 @@ void QMediaPlaylist::setMediaObject(QMediaObject *mediaObject)
this, SIGNAL(currentIndexChanged(int)));
disconnect(d->control, SIGNAL(currentMediaChanged(QMediaContent)),
this, SIGNAL(currentMediaChanged(QMediaContent)));
+
+ d->mediaObject->service()->releaseControl(d->control);
}
d->control = newControl;