diff options
| author | Nicholas Young <nicholas.young@nokia.com> | 2010-02-23 03:37:48 (GMT) |
|---|---|---|
| committer | Nicholas Young <nicholas.young@nokia.com> | 2010-02-23 03:37:48 (GMT) |
| commit | 20a2a101e37b74e085f53a925477714bcff6cef9 (patch) | |
| tree | 377c35e8ad70e31d18abd1e21c5f52dd057e65ee /src/multimedia/base | |
| parent | f56a36d771bb71fe6d0f7025ae427a76a1d22324 (diff) | |
| parent | 4b1a9e65bb989e7edcaa0bc0be9924885e7e06c9 (diff) | |
| download | Qt-20a2a101e37b74e085f53a925477714bcff6cef9.zip Qt-20a2a101e37b74e085f53a925477714bcff6cef9.tar.gz Qt-20a2a101e37b74e085f53a925477714bcff6cef9.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging
Diffstat (limited to 'src/multimedia/base')
| -rw-r--r-- | src/multimedia/base/qmediaplaylist.cpp | 8 | ||||
| -rw-r--r-- | src/multimedia/base/qtmedianamespace.qdoc | 16 |
2 files changed, 14 insertions, 10 deletions
diff --git a/src/multimedia/base/qmediaplaylist.cpp b/src/multimedia/base/qmediaplaylist.cpp index 8a0de80..ab91fd7 100644 --- a/src/multimedia/base/qmediaplaylist.cpp +++ b/src/multimedia/base/qmediaplaylist.cpp @@ -145,6 +145,10 @@ QMediaPlaylist::~QMediaPlaylist() delete d_ptr; } +/*! + Returns the QMediaObject that is being used to play the contents of this playlist. +*/ + QMediaObject *QMediaPlaylist::mediaObject() const { return d_func()->mediaObject; @@ -308,7 +312,7 @@ int QMediaPlaylist::mediaCount() const /*! Returns true if the playlist contains no items; otherwise returns false. - \sa size() + \sa mediaCount() */ bool QMediaPlaylist::isEmpty() const { @@ -317,7 +321,7 @@ bool QMediaPlaylist::isEmpty() const /*! Returns true if the playlist can be modified; otherwise returns false. - \sa size() + \sa mediaCount() */ bool QMediaPlaylist::isReadOnly() const { diff --git a/src/multimedia/base/qtmedianamespace.qdoc b/src/multimedia/base/qtmedianamespace.qdoc index 0fb39f5..270c7d6 100644 --- a/src/multimedia/base/qtmedianamespace.qdoc +++ b/src/multimedia/base/qtmedianamespace.qdoc @@ -40,15 +40,15 @@ ****************************************************************************/ /*! - \namespace QtMedia + \namespace QtMultimedia \ingroup multimedia - \brief The QtMedia namespace contains miscellaneous identifiers used throughout the Qt Media - library. + \brief The QtMultimedia namespace contains miscellaneous identifiers used + throughout the Qt Multimedia library. */ /*! - \enum QtMedia::MetaData + \enum QtMultimedia::MetaData This enum provides identifiers for meta-data attributes. @@ -165,7 +165,7 @@ */ /*! - \enum QtMedia::SupportEstimate + \enum QtMultimedia::SupportEstimate Enumerates the levels of support a media service provider may have for a feature. @@ -176,7 +176,7 @@ */ /*! - \enum QtMedia::EncodingQuality + \enum QtMultimedia::EncodingQuality Enumerates quality encoding levels. @@ -188,7 +188,7 @@ */ /*! - \enum QtMedia::EncodingMode + \enum QtMultimedia::EncodingMode Enumerates encoding modes. @@ -199,7 +199,7 @@ */ /*! - \enum QtMedia::AvailabilityError + \enum QtMultimedia::AvailabilityError Enumerates Service status errors. |