diff options
Diffstat (limited to 'src/multimedia')
-rw-r--r-- | src/multimedia/controls/qmediastreamscontrol.cpp | 4 | ||||
-rw-r--r-- | src/multimedia/controls/qmetadatareadercontrol.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/controls/qmetadatawritercontrol.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/doc/src/changes.qdoc | 4 | ||||
-rw-r--r-- | src/multimedia/playback/playlistfileparser.cpp | 12 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplayer.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/qmediaobject.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/qtmedianamespace.cpp | 6 | ||||
-rw-r--r-- | src/multimedia/qtmedianamespace.h | 6 |
9 files changed, 20 insertions, 20 deletions
diff --git a/src/multimedia/controls/qmediastreamscontrol.cpp b/src/multimedia/controls/qmediastreamscontrol.cpp index 292b5326d..501f97fcf 100644 --- a/src/multimedia/controls/qmediastreamscontrol.cpp +++ b/src/multimedia/controls/qmediastreamscontrol.cpp @@ -129,8 +129,8 @@ QMediaStreamsControl::~QMediaStreamsControl() Returns the meta-data value of \a key for a given \a stream. - Useful metadata keys are QtMultimedia::MetaData::Title, - QtMultimedia::MetaData::Description and QtMultimedia::MetaData::Language. + Useful metadata keys are QMediaMetaData::Title, + QMediaMetaData::Description and QMediaMetaData::Language. */ /*! diff --git a/src/multimedia/controls/qmetadatareadercontrol.cpp b/src/multimedia/controls/qmetadatareadercontrol.cpp index 514a9edeb..aef80a3d0 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.cpp +++ b/src/multimedia/controls/qmetadatareadercontrol.cpp @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE its current media it will implement QMetaDataReaderControl. This control provides functions for both retrieving and setting meta-data values. Meta-data may be addressed by the keys defined in the - QtMultimedia::MetaData namespace. + QMediaMetaData namespace. The functionality provided by this control is exposed to application code by the meta-data members of QMediaObject, and so meta-data access diff --git a/src/multimedia/controls/qmetadatawritercontrol.cpp b/src/multimedia/controls/qmetadatawritercontrol.cpp index 9f62da58b..45d43dafd 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.cpp +++ b/src/multimedia/controls/qmetadatawritercontrol.cpp @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE current media it will implement QMetaDataWriterControl. This control provides functions for both retrieving and setting meta-data values. Meta-data may be addressed by the keys defined in the - QtMultimedia::MetaData namespace. + QMediaMetaData namespace. The functionality provided by this control is exposed to application code by the meta-data members of QMediaObject, and so meta-data access is diff --git a/src/multimedia/doc/src/changes.qdoc b/src/multimedia/doc/src/changes.qdoc index d21049898..1b0e4b7fc 100644 --- a/src/multimedia/doc/src/changes.qdoc +++ b/src/multimedia/doc/src/changes.qdoc @@ -114,9 +114,9 @@ they are documented elsewhere. \li Meta-data enumeration changes \li In Qt Multimedia Kit the available meta-data keys were in an enumeration in the \c QtMultimediaKit namespace. These meta-data keys have been changed - to string literals in the \c {QtMultimedia::MetaData} namespace - generally your + to string literals in the \c {QMediaMetaData} namespace - generally your source code will mostly be compatible unless you have created variables or - parameters with the \c {QtMultimedia::MetaData} type - you should replace these + parameters with the \c {QMediaMetaData} type - you should replace these with \c QString. \row \li Meta-data method changes diff --git a/src/multimedia/playback/playlistfileparser.cpp b/src/multimedia/playback/playlistfileparser.cpp index f9848245a..19870e477 100644 --- a/src/multimedia/playback/playlistfileparser.cpp +++ b/src/multimedia/playback/playlistfileparser.cpp @@ -103,18 +103,18 @@ public: int length = line.mid(8, artistStart < 8 ? -1 : artistStart - 8).trimmed().toInt(&ok); if (ok && length > 0) { //convert from second to milisecond - m_extraInfo[QtMultimedia::MetaData::Duration] = QVariant(length * 1000); + m_extraInfo[QMediaMetaData::Duration] = QVariant(length * 1000); } if (artistStart > 0) { int titleStart = getSplitIndex(line, artistStart); if (titleStart > artistStart) { - m_extraInfo[QtMultimedia::MetaData::Author] = line.mid(artistStart + 1, + m_extraInfo[QMediaMetaData::Author] = line.mid(artistStart + 1, titleStart - artistStart - 1).trimmed(). replace(QLatin1String("--"), QLatin1String("-")); - m_extraInfo[QtMultimedia::MetaData::Title] = line.mid(titleStart + 1).trimmed(). + m_extraInfo[QMediaMetaData::Title] = line.mid(titleStart + 1).trimmed(). replace(QLatin1String("--"), QLatin1String("-")); } else { - m_extraInfo[QtMultimedia::MetaData::Title] = line.mid(artistStart + 1).trimmed(). + m_extraInfo[QMediaMetaData::Title] = line.mid(artistStart + 1).trimmed(). replace(QLatin1String("--"), QLatin1String("-")); } } @@ -262,13 +262,13 @@ Version=2 m_item[QLatin1String("url")] = getValue(lineIndex, line); setFlag(FileRead); } else if (!containsFlag(TitleRead) && line.startsWith(m_titleName)) { - m_item[QtMultimedia::MetaData::Title] = getValue(lineIndex, line); + m_item[QMediaMetaData::Title] = getValue(lineIndex, line); setFlag(TitleRead); } else if (!containsFlag(LengthRead) && line.startsWith(m_lengthName)) { //convert from seconds to miliseconds int length = getValue(lineIndex, line).toInt(); if (length > 0) - m_item[QtMultimedia::MetaData::Duration] = length * 1000; + m_item[QMediaMetaData::Duration] = length * 1000; setFlag(LengthRead); } else if (line.startsWith(QLatin1String("NumberOfEntries"))) { m_state = Footer; diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 99a74354c..2555deb4f 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE functions for things like: \list - \li Accessing the currently playing media's metadata (\l {QMediaObject::metaData()} and \l {QtMultimedia::MetaData}{predefined meta-data keys}) + \li Accessing the currently playing media's metadata (\l {QMediaObject::metaData()} and \l {QMediaMetaData}{predefined meta-data keys}) \li Checking to see if the media playback service is currently available (\l {QMediaObject::availability()}) \endlist diff --git a/src/multimedia/qmediaobject.cpp b/src/multimedia/qmediaobject.cpp index 7f083ec33..249562203 100644 --- a/src/multimedia/qmediaobject.cpp +++ b/src/multimedia/qmediaobject.cpp @@ -347,7 +347,7 @@ bool QMediaObject::isMetaDataAvailable() const /*! Returns the value associated with a meta-data \a key. - See the list of predefined \l {QtMultimedia::MetaData}{meta-data keys}. + See the list of predefined \l {QMediaMetaData}{meta-data keys}. */ QVariant QMediaObject::metaData(const QString &key) const { diff --git a/src/multimedia/qtmedianamespace.cpp b/src/multimedia/qtmedianamespace.cpp index 47c5557d1..c22af7f18 100644 --- a/src/multimedia/qtmedianamespace.cpp +++ b/src/multimedia/qtmedianamespace.cpp @@ -68,9 +68,9 @@ namespace Fall back to the less-performant QLatin1String in this case. */ #if defined(Q_CC_GNU) && defined(Q_COMPILER_LAMBDA) -# define Q_DEFINE_METADATA(key) const QString QtMultimedia::MetaData::key(QStringLiteral(#key)) +# define Q_DEFINE_METADATA(key) const QString QMediaMetaData::key(QStringLiteral(#key)) #else -# define Q_DEFINE_METADATA(key) const QString QtMultimedia::MetaData::key(QLatin1String(#key)) +# define Q_DEFINE_METADATA(key) const QString QMediaMetaData::key(QLatin1String(#key)) #endif // Common @@ -187,7 +187,7 @@ Q_DEFINE_METADATA(ThumbnailImage); /*! - \namespace QtMultimedia::MetaData + \namespace QMediaMetaData \inheaderfile qtmedianamespace.h This namespace provides identifiers for meta-data attributes. diff --git a/src/multimedia/qtmedianamespace.h b/src/multimedia/qtmedianamespace.h index f85111ccc..c3af78fda 100644 --- a/src/multimedia/qtmedianamespace.h +++ b/src/multimedia/qtmedianamespace.h @@ -57,9 +57,7 @@ class QString; #define Q_DECLARE_METADATA(key) Q_MULTIMEDIA_EXPORT extern const QString key -namespace QtMultimedia -{ - namespace MetaData { + namespace QMediaMetaData { #ifdef Q_QDOC // QDoc does not like macros, so try to keep this in sync :) QString Title; @@ -287,6 +285,8 @@ namespace QtMultimedia #endif } +namespace QtMultimedia +{ enum SupportEstimate { NotSupported, |