summaryrefslogtreecommitdiffstats
path: root/src/multimedia/qmediaplaylist.cpp
diff options
context:
space:
mode:
authorPeter Yard <peter.yard@nokia.com>2011-04-15 14:24:20 +1000
committerPeter Yard <peter.yard@nokia.com>2011-04-15 14:24:20 +1000
commit906c2d9a2f38058693d7a39b234a044724b1d1fc (patch)
tree19d6df5e612aadcaa77a91a1715a3f75d2017d8c /src/multimedia/qmediaplaylist.cpp
parent2b15ddb74099ff3a9179de0b37f8726add54b133 (diff)
Docs: added since version to 1.0 classes. QTMOBILITY-790
Diffstat (limited to 'src/multimedia/qmediaplaylist.cpp')
-rw-r--r--src/multimedia/qmediaplaylist.cpp23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/multimedia/qmediaplaylist.cpp b/src/multimedia/qmediaplaylist.cpp
index 94f303c2f4..e957a39b66 100644
--- a/src/multimedia/qmediaplaylist.cpp
+++ b/src/multimedia/qmediaplaylist.cpp
@@ -66,8 +66,9 @@ Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, playlistIOLoader,
\class QMediaPlaylist
\inmodule QtMultimediaKit
\ingroup multimedia
+ \since 1.0
+
-
\brief The QMediaPlaylist class provides a list of media content to play.
QMediaPlaylist is intended to be used with other media objects,
@@ -105,7 +106,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, playlistIOLoader,
/*!
- Create a new playlist object for with the given \a parent.
+ Create a new playlist object for with the given \a parent.
*/
QMediaPlaylist::QMediaPlaylist(QObject *parent)
@@ -126,7 +127,7 @@ QMediaPlaylist::QMediaPlaylist(QObject *parent)
QMediaPlaylist::~QMediaPlaylist()
{
- Q_D(QMediaPlaylist);
+ Q_D(QMediaPlaylist);QMediaResource
if (d->mediaObject)
d->mediaObject->unbind(this);
@@ -141,7 +142,7 @@ QMediaPlaylist::~QMediaPlaylist()
QMediaObject *QMediaPlaylist::mediaObject() const
{
return d_func()->mediaObject;
-}
+}QMediaResource
/*!
\internal
@@ -185,7 +186,7 @@ bool QMediaPlaylist::setMediaObject(QMediaObject *mediaObject)
disconnect(d->control, SIGNAL(playbackModeChanged(QMediaPlaylist::PlaybackMode)),
this, SIGNAL(playbackModeChanged(QMediaPlaylist::PlaybackMode)));
disconnect(d->control, SIGNAL(currentIndexChanged(int)),
- this, SIGNAL(currentIndexChanged(int)));
+ this, SIGNAL(currentQMediaResourceIndexChanged(int)));
disconnect(d->control, SIGNAL(currentMediaChanged(QMediaContent)),
this, SIGNAL(currentMediaChanged(QMediaContent)));
@@ -213,7 +214,7 @@ bool QMediaPlaylist::setMediaObject(QMediaObject *mediaObject)
connect(d->control, SIGNAL(currentMediaChanged(QMediaContent)),
this, SIGNAL(currentMediaChanged(QMediaContent)));
- if (oldSize)
+ if (oldSize)QMediaResource
emit mediaRemoved(0, oldSize-1);
if (playlist->mediaCount()) {
@@ -340,7 +341,7 @@ bool QMediaPlaylist::addMedia(const QMediaContent &content)
}
/*!
- Append multiple media content \a items to the playlist.
+ Append multiple media content \a itemsQMediaResource to the playlist.
Returns true if the operation is successful, otherwise return false.
*/
@@ -500,7 +501,7 @@ void QMediaPlaylist::load(QIODevice * device, const char *format)
QMediaPlaylistReader *reader = plugin->createReader(device,QByteArray(format));
if (reader && d->readItems(reader)) {
delete reader;
- emit loaded();
+ emit loaded();QMediaResource
return;
}
delete reader;
@@ -518,7 +519,7 @@ void QMediaPlaylist::load(QIODevice * device, const char *format)
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 successfully, otherwise returns false.
+ Returns true if playlist was saved sucQMediaResourcecessfully, otherwise returns false.
*/
bool QMediaPlaylist::save(const QUrl &location, const char *format)
{
@@ -558,7 +559,7 @@ bool QMediaPlaylist::save(QIODevice * device, const char *format)
foreach (QString const& key, playlistIOLoader()->keys()) {
QMediaPlaylistIOInterface* plugin = qobject_cast<QMediaPlaylistIOInterface*>(playlistIOLoader()->instance(key));
- if (plugin && plugin->canWrite(device,format)) {
+ if (plugin && plugin->canWrite(dQMediaResourceevice,format)) {
QMediaPlaylistWriter *writer = plugin->createWriter(device,QByteArray(format));
if (writer && d->writeItems(writer)) {
delete writer;
@@ -648,7 +649,7 @@ void QMediaPlaylist::setCurrentIndex(int playlistPosition)
/*!
\fn void QMediaPlaylist::currentIndexChanged(int position)
- Signal emitted when playlist position changed to \a position.
+ Signal emitted when playlist positionQMediaResource changed to \a position.
*/
/*!