FCL/sf/mw/qtextensions: comparison qtmobility/src/multimedia/qmediaplaylist.cpp

equal deleted inserted replaced

-:06b8e2af4411
+:6fbed849b4f4
 #include "qmediapluginloader_p.h"
 QT_BEGIN_NAMESPACE
 Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, playlistIOLoader,
-(QMediaPlaylistIOInterface_iid, QLatin1String("/playlistformats"), Qt::CaseInsensitive))
+(QMediaPlaylistIOInterface_iid, QLatin1String("playlistformats"), Qt::CaseInsensitive))
 /*!
 \class QMediaPlaylist
 \ingroup multimedia
 \preliminary
 \brief The QMediaPlaylist class provides a list of media content to play.
 QMediaPlaylist is intended to be used with other media objects,
 like QMediaPlayer or QMediaImageViewer.
 QMediaPlaylist allows to access the service intrinsic playlist functionality
 if available, otherwise it provides the the local memory playlist implementation.
 \code
 player = new QMediaPlayer;
 playlist = new QMediaPlaylist;
-playlist->setMediaObject(player);
 playlist->append(QUrl("http://example.com/movie1.mp4"));
 playlist->append(QUrl("http://example.com/movie2.mp4"));
 playlist->append(QUrl("http://example.com/movie3.mp4"));
 playlist->setCurrentIndex(1);
+player->setPlaylist(playlist);
 player->play();
 \endcode
-Depending on playlist source implementation,
+Depending on playlist source implementation, most of the playlist mutating
-most of playlist modifcation operations can be asynchronous.
+operations can be asynchronous.
 \sa QMediaContent
 */
 The QMediaPlaylist::PlaybackMode describes the order items in playlist are played.
 \value CurrentItemOnce    The current item is played only once.
-\value CurrentItemInLoop  The current item is played in the loop.
+\value CurrentItemInLoop  The current item is played repeatedly in a loop.
-\value Linear             Playback starts from the first to the last items and stops.
+\value Sequential         Playback starts from the current and moves through each successive item until the last is reached and then stops.
-next item is a null item when the last one is currently playing.
+The next item is a null item when the last one is currently playing.
-\value Loop               Playback continues from the first item after the last one finished playing.
+\value Loop               Playback restarts at the first item after the last has finished playing.
 \value Random             Play items in random order.
 */
 /*!
 If \a mediaObject is null or doesn't have an intrinsic playlist,
 internal local memory playlist source will be created.
 */
-void QMediaPlaylist::setMediaObject(QMediaObject *mediaObject)
+bool QMediaPlaylist::setMediaObject(QMediaObject *mediaObject)
 {
 Q_D(QMediaPlaylist);
 if (mediaObject && mediaObject == d->mediaObject)
-return;
+return true;
 QMediaService *service = mediaObject
 ? mediaObject->service() : 0;
 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;
 if (d->control != newControl) {
 this, SIGNAL(playbackModeChanged(QMediaPlaylist::PlaybackMode)));
 disconnect(d->control, SIGNAL(currentIndexChanged(int)),
 this, SIGNAL(currentIndexChanged(int)));
 disconnect(d->control, SIGNAL(currentMediaChanged(QMediaContent)),
 this, SIGNAL(currentMediaChanged(QMediaContent)));
+if (d->mediaObject)
+d->mediaObject->service()->releaseControl(d->control);
 }
 d->control = newControl;
 QMediaPlaylistProvider *playlist = d->control->playlistProvider();
 connect(playlist, SIGNAL(loadFailed(QMediaPlaylist::Error,QString)),
 emit mediaAboutToBeInserted(0,playlist->mediaCount()-1);
 emit mediaInserted(0,playlist->mediaCount()-1);
 }
 }
-if (d->mediaObject)
-d->mediaObject->unbind(this);
 d->mediaObject = mediaObject;
-if (d->mediaObject)
-d->mediaObject->bind(this);
+return true;
 }
 /*!
 \property QMediaPlaylist::playbackMode
 Q_D(QMediaPlaylist);
 d->control->setPlaybackMode(mode);
 }
 /*!
-Returns position of the current media source in the playlist.
+Returns position of the current media content in the playlist.
 */
 int QMediaPlaylist::currentIndex() const
 {
 return d_func()->control->currentIndex();
 }
 {
 return d_func()->playlist()->media(currentIndex());
 }
 /*!
-Returns the index of item, which were current after calling next()
+Returns the index of the item, which would be current after calling next()
 \a steps times.
 Returned value depends on the size of playlist, current position
 and playback mode.
 {
 return d_func()->control->nextIndex(steps);
 }
 /*!
-Returns the index of item, which were current after calling previous()
+Returns the index of the item, which would be current after calling previous()
 \a steps times.
 \sa QMediaPlaylist::playbackMode
 */
 return d_func()->playlist()->mediaCount();
 }
 /*!
 Returns true if the playlist contains no items; otherwise returns false.
 \sa size()
 */
 bool QMediaPlaylist::isEmpty() const
 {
 return mediaCount() == 0;
 }
 /*!
 Returns true if the playlist can be modified; otherwise returns false.
 \sa size()
 */
 bool QMediaPlaylist::isReadOnly() const
 {
 return d_func()->playlist()->isReadOnly();
 }
 /*!
 Append the media \a content to the playlist.
-Returns true if the operation is successfull, other wise return false.
+Returns true if the operation is successful, otherwise return false.
 */
 bool QMediaPlaylist::addMedia(const QMediaContent &content)
 {
 return d_func()->control->playlistProvider()->addMedia(content);
 }
 /*!
 Append multiple media content \a items to the playlist.
-Returns true if the operation is successfull, other wise return false.
+Returns true if the operation is successful, otherwise return false.
 */
 bool QMediaPlaylist::addMedia(const QList<QMediaContent> &items)
 {
 return d_func()->control->playlistProvider()->addMedia(items);
 }
 }
 /*!
 Remove the item from the playlist at position \a pos.
-Returns true if the operation is successfull, other wise return false.
+Returns true if the operation is successful, otherwise return false.
 */
 bool QMediaPlaylist::removeMedia(int pos)
 {
 Q_D(QMediaPlaylist);
 return d->playlist()->removeMedia(pos);
 }
 /*!
-Remove the items from the playlist from position \a start to \a end inclusive.
+Remove items in the playlist from \a start to \a end inclusive.
-Returns true if the operation is successfull, other wise return false.
+Returns true if the operation is successful, otherwise return false.
 */
 bool QMediaPlaylist::removeMedia(int start, int end)
 {
 Q_D(QMediaPlaylist);
 return d->playlist()->removeMedia(start, end);
 }
 /*!
 Remove all the items from the playlist.
-Returns true if the operation is successfull, other wise return false.
+Returns true if the operation is successful, otherwise return false.
 */
 bool QMediaPlaylist::clear()
 {
 Q_D(QMediaPlaylist);
 return d->playlist()->clear();
 Load playlist from \a location. If \a format is specified, it is used,
 otherwise format is guessed from location name and data.
 New items are appended to playlist.
-QMediaPlaylist::loaded() signal is emited if playlist was loaded succesfully,
+QMediaPlaylist::loaded() signal is emitted if playlist was loaded successfully,
 otherwise the playlist emits loadFailed().
 */
 void QMediaPlaylist::load(const QUrl &location, const char *format)
 {
 Q_D(QMediaPlaylist);
 Load playlist from QIODevice \a device. If \a format is specified, it is used,
 otherwise format is guessed from device data.
 New items are appended to playlist.
-QMediaPlaylist::loaded() signal is emited if playlist was loaded succesfully,
+QMediaPlaylist::loaded() signal is emitted if playlist was loaded successfully,
 otherwise the playlist emits loadFailed().
 */
 void QMediaPlaylist::load(QIODevice * device, const char *format)
 {
 Q_D(QMediaPlaylist);
 /*!
 Save playlist to \a location. If \a format is specified, it is used,
 otherwise format is guessed from location name.
-Returns true if playlist was saved succesfully, otherwise returns false.
+Returns true if playlist was saved successfully, otherwise returns false.
 */
 bool QMediaPlaylist::save(const QUrl &location, const char *format)
 {
 Q_D(QMediaPlaylist);
 }
 /*!
 Save playlist to QIODevice \a device using format \a format.
-Returns true if playlist was saved succesfully, otherwise returns false.
+Returns true if playlist was saved successfully, otherwise returns false.
 */
 bool QMediaPlaylist::save(QIODevice * device, const char *format)
 {
 Q_D(QMediaPlaylist);
 */
 /*!
 \fn void QMediaPlaylist::mediaAboutToBeInserted(int start, int end)
-Signal emitted when item to be inserted at \a start and ending at \a end.
+Signal emitted when items are to be inserted at \a start and ending at \a end.
 */
 /*!
 \fn void QMediaPlaylist::mediaAboutToBeRemoved(int start, int end)
-Signal emitted when item to de deleted ar \a start and ending at \a end.
+Signal emitted when item are to be deleted at \a start and ending at \a end.
 */
 /*!
 \fn void QMediaPlaylist::currentMediaChanged(const QMediaContent &content)

changeset 14	6fbed849b4f4
parent 11	06b8e2af4411