slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename QtMultimediaKit to QtMultimedia.

Browse Source 
There are a few legacy bits left in place so it passes CI, and
then qt5.git etc can be updated.

Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a
Reviewed-on: http://codereview.qt-project.org/5368
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2011-10-06 14:31:58 +10:00
committed by Qt by Nokia
parent 55bc4f2b46
commit 03f22bcdaf
395 changed files with 1393 additions and 3088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/imports/multimedia/multimedia.cpp
View File

@@ -68,7 +68,8 @@ class QMultimediaDeclarativeModule : public QDeclarativeExtensionPlugin
public:
virtual void registerTypes(const char *uri)
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.multimediakit"));
Q_ASSERT(QLatin1String(uri) == QLatin1String("QtMultimedia")
|| QLatin1String(uri) == QLatin1String("Qt.multimediakit"));
qmlRegisterType<QSoundEffect>(uri, 4, 0, "SoundEffect");
qmlRegisterType<QDeclarativeAudio>(uri, 4, 0, "Audio");

18
src/imports/multimedia/multimedia.pro
View File

@@ -1,11 +1,11 @@
TARGET = declarative_multimedia
TARGETPATH = Qt/multimediakit
TARGETPATH = QtMultimedia
include(../qimportbase.pri)
QT += declarative network multimediakit-private
QT += declarative network multimedia-private
DESTDIR = $$QT.multimediakit.imports/$$TARGETPATH
DESTDIR = $$QT.multimedia.imports/$$TARGETPATH
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
HEADERS += \
@@ -59,4 +59,16 @@ disabled {
qmldir.files += $$PWD/qmldir
qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
# another copy of the qmldir file so the old import works
OLDQMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir.qtmultimediakit
oldcopy2build.input = OLDQMLDIRFILE
oldcopy2build.output = $$QT.multimedia.imports/Qt/multimediakit/qmldir
!contains(TEMPLATE_PREFIX, vc):oldcopy2build.variable_out = PRE_TARGETDEPS
oldcopy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
oldcopy2build.name = COPY ${QMAKE_FILE_IN}
oldcopy2build.CONFIG += no_link
# `clean' should leave the build in a runnable state, which means it shouldn't delete qmldir
oldcopy2build.CONFIG += no_clean
QMAKE_EXTRA_COMPILERS += oldcopy2build
INSTALLS += target qmldir

94
src/imports/multimedia/qdeclarativeaudio.cpp
View File

@@ -52,11 +52,11 @@ QT_BEGIN_NAMESPACE
\ingroup qml-multimedia
This element is part of the \bold{QtMultimediaKit 1.1} module.
This element is part of the \bold{QtMultimedia 4.0} module.
\qml
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
Text {
text: "Click Me!";
@@ -333,7 +333,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the tile of the media.
\sa {QtMultimediaKit::Title}
\sa {QtMultimedia::Title}
*/
/*!
@@ -341,7 +341,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the sub-title of the media.
\sa {QtMultimediaKit::SubTitle}
\sa {QtMultimedia::SubTitle}
*/
/*!
@@ -349,7 +349,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the author of the media.
\sa {QtMultimediaKit::Author}
\sa {QtMultimedia::Author}
*/
/*!
@@ -357,7 +357,7 @@ void QDeclarativeAudio::componentComplete()
This property holds a user comment about the media.
\sa {QtMultimediaKit::Comment}
\sa {QtMultimedia::Comment}
*/
/*!
@@ -365,7 +365,7 @@ void QDeclarativeAudio::componentComplete()
This property holds a description of the media.
\sa {QtMultimediaKit::Description}
\sa {QtMultimedia::Description}
*/
/*!
@@ -373,7 +373,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the category of the media
\sa {QtMultimediaKit::Category}
\sa {QtMultimedia::Category}
*/
/*!
@@ -381,7 +381,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the genre of the media.
\sa {QtMultimediaKit::Genre}
\sa {QtMultimedia::Genre}
*/
/*!
@@ -389,7 +389,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the year of release of the media.
\sa {QtMultimediaKit::Year}
\sa {QtMultimedia::Year}
*/
/*!
@@ -397,7 +397,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the date of the media.
\sa {QtMultimediaKit::Date}
\sa {QtMultimedia::Date}
*/
/*!
@@ -405,7 +405,7 @@ void QDeclarativeAudio::componentComplete()
This property holds a user rating of the media in the range of 0 to 100.
\sa {QtMultimediaKit::UserRating}
\sa {QtMultimedia::UserRating}
*/
/*!
@@ -413,7 +413,7 @@ void QDeclarativeAudio::componentComplete()
This property holds a list of keywords describing the media.
\sa {QtMultimediaKit::Keywords}
\sa {QtMultimedia::Keywords}
*/
/*!
@@ -421,7 +421,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the language of the media, as an ISO 639-2 code.
\sa {QtMultimediaKit::Language}
\sa {QtMultimedia::Language}
*/
/*!
@@ -429,7 +429,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the publisher of the media.
\sa {QtMultimediaKit::Publisher}
\sa {QtMultimedia::Publisher}
*/
/*!
@@ -437,7 +437,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the media's copyright notice.
\sa {QtMultimediaKit::Copyright}
\sa {QtMultimedia::Copyright}
*/
/*!
@@ -445,7 +445,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the parental rating of the media.
\sa {QtMultimediaKit::ParentalRating}
\sa {QtMultimedia::ParentalRating}
*/
/*!
@@ -454,7 +454,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the name of the rating organisation responsible for the
parental rating of the media.
\sa {QtMultimediaKit::RatingOrganisation}
\sa {QtMultimedia::RatingOrganisation}
*/
/*!
@@ -462,7 +462,7 @@ void QDeclarativeAudio::componentComplete()
This property property holds the size of the media in bytes.
\sa {QtMultimediaKit::Size}
\sa {QtMultimedia::Size}
*/
/*!
@@ -470,7 +470,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the type of the media.
\sa {QtMultimediaKit::MediaType}
\sa {QtMultimedia::MediaType}
*/
/*!
@@ -479,7 +479,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the bit rate of the media's audio stream ni bits per
second.
\sa {QtMultimediaKit::AudioBitRate}
\sa {QtMultimedia::AudioBitRate}
*/
/*!
@@ -487,7 +487,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the encoding of the media audio stream.
\sa {QtMultimediaKit::AudioCodec}
\sa {QtMultimedia::AudioCodec}
*/
/*!
@@ -495,7 +495,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the average volume level of the media.
\sa {QtMultimediaKit::AverageLevel}
\sa {QtMultimedia::AverageLevel}
*/
/*!
@@ -503,7 +503,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the number of channels in the media's audio stream.
\sa {QtMultimediaKit::ChannelCount}
\sa {QtMultimedia::ChannelCount}
*/
/*!
@@ -511,7 +511,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the peak volume of media's audio stream.
\sa {QtMultimediaKit::PeakValue}
\sa {QtMultimedia::PeakValue}
*/
/*!
@@ -519,7 +519,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the sample rate of the media's audio stream in hertz.
\sa {QtMultimediaKit::SampleRate}
\sa {QtMultimedia::SampleRate}
*/
/*!
@@ -527,7 +527,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the title of the album the media belongs to.
\sa {QtMultimediaKit::AlbumTitle}
\sa {QtMultimedia::AlbumTitle}
*/
/*!
@@ -536,7 +536,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the name of the principal artist of the album the media
belongs to.
\sa {QtMultimediaKit::AlbumArtist}
\sa {QtMultimedia::AlbumArtist}
*/
/*!
@@ -544,7 +544,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the names of artists contributing to the media.
\sa {QtMultimediaKit::ContributingArtist}
\sa {QtMultimedia::ContributingArtist}
*/
/*!
@@ -552,7 +552,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the composer of the media.
\sa {QtMultimediaKit::Composer}
\sa {QtMultimedia::Composer}
*/
/*!
@@ -560,7 +560,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the conductor of the media.
\sa {QtMultimediaKit::Conductor}
\sa {QtMultimedia::Conductor}
*/
/*!
@@ -568,7 +568,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the lyrics to the media.
\sa {QtMultimediaKit::Lyrics}
\sa {QtMultimedia::Lyrics}
*/
/*!
@@ -576,7 +576,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the mood of the media.
\sa {QtMultimediaKit::Mood}
\sa {QtMultimedia::Mood}
*/
/*!
@@ -584,7 +584,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the track number of the media.
\sa {QtMultimediaKit::TrackNumber}
\sa {QtMultimedia::TrackNumber}
*/
/*!
@@ -592,7 +592,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the number of track on the album containing the media.
\sa {QtMultimediaKit::TrackNumber}
\sa {QtMultimedia::TrackNumber}
*/
/*!
@@ -600,7 +600,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the URL of a small cover art image.
\sa {QtMultimediaKit::CoverArtUrlSmall}
\sa {QtMultimedia::CoverArtUrlSmall}
*/
/*!
@@ -608,7 +608,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the URL of a large cover art image.
\sa {QtMultimediaKit::CoverArtUrlLarge}
\sa {QtMultimedia::CoverArtUrlLarge}
*/
/*!
@@ -616,7 +616,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the dimension of an image or video.
\sa {QtMultimediaKit::Resolution}
\sa {QtMultimedia::Resolution}
*/
/*!
@@ -624,7 +624,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the pixel aspect ratio of an image or video.
\sa {QtMultimediaKit::PixelAspectRatio}
\sa {QtMultimedia::PixelAspectRatio}
*/
/*!
@@ -632,7 +632,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the frame rate of the media's video stream.
\sa {QtMultimediaKit::VideoFrameRate}
\sa {QtMultimedia::VideoFrameRate}
*/
/*!
@@ -641,7 +641,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the bit rate of the media's video stream in bits per
second.
\sa {QtMultimediaKit::VideoBitRate}
\sa {QtMultimedia::VideoBitRate}
*/
/*!
@@ -649,7 +649,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the encoding of the media's video stream.
\sa {QtMultimediaKit::VideoCodec}
\sa {QtMultimedia::VideoCodec}
*/
/*!
@@ -657,7 +657,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the URL of a poster image.
\sa {QtMultimediaKit::PosterUrl}
\sa {QtMultimedia::PosterUrl}
*/
/*!
@@ -665,7 +665,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the chapter number of the media.
\sa {QtMultimediaKit::ChapterNumber}
\sa {QtMultimedia::ChapterNumber}
*/
/*!
@@ -673,7 +673,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the director of the media.
\sa {QtMultimediaKit::Director}
\sa {QtMultimedia::Director}
*/
/*!
@@ -681,7 +681,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the lead performer in the media.
\sa {QtMultimediaKit::LeadPerformer}
\sa {QtMultimedia::LeadPerformer}
*/
/*!
@@ -689,7 +689,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the writer of the media.
\sa {QtMultimediaKit::Writer}
\sa {QtMultimedia::Writer}
*/
QT_END_NAMESPACE

4
src/imports/multimedia/qdeclarativecamera.cpp
View File

@@ -75,11 +75,11 @@ void QDeclarativeCamera::_q_updateState(QCamera::State state)
\ingroup qml-multimedia
\inherits Item
This element is part of the \bold{QtMultimediaKit 1.1} module.
This element is part of the \bold{QtMultimedia 4.0} module.
\qml
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
Camera {
id: camera

4
src/imports/multimedia/qdeclarativecameraexposure.cpp
View File

@@ -50,13 +50,13 @@ QT_BEGIN_NAMESPACE
\brief The CameraExposure element provides interface for exposure related camera settings.
\ingroup qml-multimedia
This element is part of the \bold{Qt.multimediakit 4.0} module.
This element is part of the \bold{QtMultimedia 4.0} module.
It should not be constructed separately but provided by Camera.exposure.
\qml
import QtQuick 2.0
import Qt.multimediakit 4.0
import QtMultimedia 4.0
Camera {
id: camera

4
src/imports/multimedia/qdeclarativecameraflash.cpp
View File

@@ -50,13 +50,13 @@ QT_BEGIN_NAMESPACE
\brief The CameraFlash element provides interface for flash related camera settings.
\ingroup qml-multimedia
This element is part of the \bold{Qt.multimediakit 4.0} module.
This element is part of the \bold{QtMultimedia 4.0} module.
It should not be constructed separately but provided by Camera.flash.
\qml
import QtQuick 2.0
import Qt.multimediakit 4.0
import QtMultimedia 4.0
Camera {
id: camera

4
src/imports/multimedia/qdeclarativecamerafocus.cpp
View File

@@ -50,13 +50,13 @@ QT_BEGIN_NAMESPACE
\brief The CameraFocus element provides interface for focus related camera settings.
\ingroup qml-multimedia
This element is part of the \bold{Qt.multimediakit 4.0} module.
This element is part of the \bold{QtMultimedia 4.0} module.
It should not be constructed separately but provided by Camera.focus.
\qml
import QtQuick 2.0
import Qt.multimediakit 4.0
import QtMultimedia 4.0
Camera {
id: camera

6
src/imports/multimedia/qdeclarativemediabase.cpp
View File

@@ -109,9 +109,9 @@ public:
bool isMetaDataAvailable() const { return false; }
QVariant metaData(QtMultimediaKit::MetaData) const { return QVariant(); }
QList<QtMultimediaKit::MetaData> availableMetaData() const {
return QList<QtMultimediaKit::MetaData>(); }
QVariant metaData(QtMultimedia::MetaData) const { return QVariant(); }
QList<QtMultimedia::MetaData> availableMetaData() const {
return QList<QtMultimedia::MetaData>(); }
QVariant extendedMetaData(const QString &) const { return QVariant(); }
QStringList availableExtendedMetaData() const { return QStringList(); }

92
src/imports/multimedia/qdeclarativemediametadata_p.h
View File

@@ -117,57 +117,57 @@ public:
{
}
QVariant title() const { return m_control->metaData(QtMultimediaKit::Title); }
QVariant subTitle() const { return m_control->metaData(QtMultimediaKit::SubTitle); }
QVariant author() const { return m_control->metaData(QtMultimediaKit::Author); }
QVariant comment() const { return m_control->metaData(QtMultimediaKit::Comment); }
QVariant description() const { return m_control->metaData(QtMultimediaKit::Description); }
QVariant category() const { return m_control->metaData(QtMultimediaKit::Category); }
QVariant genre() const { return m_control->metaData(QtMultimediaKit::Genre); }
QVariant year() const { return m_control->metaData(QtMultimediaKit::Year); }
QVariant date() const { return m_control->metaData(QtMultimediaKit::Date); }
QVariant userRating() const { return m_control->metaData(QtMultimediaKit::UserRating); }
QVariant keywords() const { return m_control->metaData(QtMultimediaKit::Keywords); }
QVariant language() const { return m_control->metaData(QtMultimediaKit::Language); }
QVariant publisher() const { return m_control->metaData(QtMultimediaKit::Publisher); }
QVariant copyright() const { return m_control->metaData(QtMultimediaKit::Copyright); }
QVariant parentalRating() const { return m_control->metaData(QtMultimediaKit::ParentalRating); }
QVariant title() const { return m_control->metaData(QtMultimedia::Title); }
QVariant subTitle() const { return m_control->metaData(QtMultimedia::SubTitle); }
QVariant author() const { return m_control->metaData(QtMultimedia::Author); }
QVariant comment() const { return m_control->metaData(QtMultimedia::Comment); }
QVariant description() const { return m_control->metaData(QtMultimedia::Description); }
QVariant category() const { return m_control->metaData(QtMultimedia::Category); }
QVariant genre() const { return m_control->metaData(QtMultimedia::Genre); }
QVariant year() const { return m_control->metaData(QtMultimedia::Year); }
QVariant date() const { return m_control->metaData(QtMultimedia::Date); }
QVariant userRating() const { return m_control->metaData(QtMultimedia::UserRating); }
QVariant keywords() const { return m_control->metaData(QtMultimedia::Keywords); }
QVariant language() const { return m_control->metaData(QtMultimedia::Language); }
QVariant publisher() const { return m_control->metaData(QtMultimedia::Publisher); }
QVariant copyright() const { return m_control->metaData(QtMultimedia::Copyright); }
QVariant parentalRating() const { return m_control->metaData(QtMultimedia::ParentalRating); }
QVariant ratingOrganisation() const {
return m_control->metaData(QtMultimediaKit::RatingOrganisation); }
QVariant size() const { return m_control->metaData(QtMultimediaKit::Size); }
QVariant mediaType() const { return m_control->metaData(QtMultimediaKit::MediaType); }
QVariant duration() const { return m_control->metaData(QtMultimediaKit::Duration); }
QVariant audioBitRate() const { return m_control->metaData(QtMultimediaKit::AudioBitRate); }
QVariant audioCodec() const { return m_control->metaData(QtMultimediaKit::AudioCodec); }
QVariant averageLevel() const { return m_control->metaData(QtMultimediaKit::AverageLevel); }
QVariant channelCount() const { return m_control->metaData(QtMultimediaKit::ChannelCount); }
QVariant peakValue() const { return m_control->metaData(QtMultimediaKit::PeakValue); }
QVariant sampleRate() const { return m_control->metaData(QtMultimediaKit::SampleRate); }
QVariant albumTitle() const { return m_control->metaData(QtMultimediaKit::AlbumTitle); }
QVariant albumArtist() const { return m_control->metaData(QtMultimediaKit::AlbumArtist); }
return m_control->metaData(QtMultimedia::RatingOrganisation); }
QVariant size() const { return m_control->metaData(QtMultimedia::Size); }
QVariant mediaType() const { return m_control->metaData(QtMultimedia::MediaType); }
QVariant duration() const { return m_control->metaData(QtMultimedia::Duration); }
QVariant audioBitRate() const { return m_control->metaData(QtMultimedia::AudioBitRate); }
QVariant audioCodec() const { return m_control->metaData(QtMultimedia::AudioCodec); }
QVariant averageLevel() const { return m_control->metaData(QtMultimedia::AverageLevel); }
QVariant channelCount() const { return m_control->metaData(QtMultimedia::ChannelCount); }
QVariant peakValue() const { return m_control->metaData(QtMultimedia::PeakValue); }
QVariant sampleRate() const { return m_control->metaData(QtMultimedia::SampleRate); }
QVariant albumTitle() const { return m_control->metaData(QtMultimedia::AlbumTitle); }
QVariant albumArtist() const { return m_control->metaData(QtMultimedia::AlbumArtist); }
QVariant contributingArtist() const {
return m_control->metaData(QtMultimediaKit::ContributingArtist); }
QVariant composer() const { return m_control->metaData(QtMultimediaKit::Composer); }
QVariant conductor() const { return m_control->metaData(QtMultimediaKit::Conductor); }
QVariant lyrics() const { return m_control->metaData(QtMultimediaKit::Lyrics); }
QVariant mood() const { return m_control->metaData(QtMultimediaKit::Mood); }
QVariant trackNumber() const { return m_control->metaData(QtMultimediaKit::TrackNumber); }
QVariant trackCount() const { return m_control->metaData(QtMultimediaKit::TrackCount); }
return m_control->metaData(QtMultimedia::ContributingArtist); }
QVariant composer() const { return m_control->metaData(QtMultimedia::Composer); }
QVariant conductor() const { return m_control->metaData(QtMultimedia::Conductor); }
QVariant lyrics() const { return m_control->metaData(QtMultimedia::Lyrics); }
QVariant mood() const { return m_control->metaData(QtMultimedia::Mood); }
QVariant trackNumber() const { return m_control->metaData(QtMultimedia::TrackNumber); }
QVariant trackCount() const { return m_control->metaData(QtMultimedia::TrackCount); }
QVariant coverArtUrlSmall() const {
return m_control->metaData(QtMultimediaKit::CoverArtUrlSmall); }
return m_control->metaData(QtMultimedia::CoverArtUrlSmall); }
QVariant coverArtUrlLarge() const {
return m_control->metaData(QtMultimediaKit::CoverArtUrlLarge); }
QVariant resolution() const { return m_control->metaData(QtMultimediaKit::Resolution); }
return m_control->metaData(QtMultimedia::CoverArtUrlLarge); }
QVariant resolution() const { return m_control->metaData(QtMultimedia::Resolution); }
QVariant pixelAspectRatio() const {
return m_control->metaData(QtMultimediaKit::PixelAspectRatio); }
QVariant videoFrameRate() const { return m_control->metaData(QtMultimediaKit::VideoFrameRate); }
QVariant videoBitRate() const { return m_control->metaData(QtMultimediaKit::VideoBitRate); }
QVariant videoCodec() const { return m_control->metaData(QtMultimediaKit::VideoCodec); }
QVariant posterUrl() const { return m_control->metaData(QtMultimediaKit::PosterUrl); }
QVariant chapterNumber() const { return m_control->metaData(QtMultimediaKit::ChapterNumber); }
QVariant director() const { return m_control->metaData(QtMultimediaKit::Director); }
QVariant leadPerformer() const { return m_control->metaData(QtMultimediaKit::LeadPerformer); }
QVariant writer() const { return m_control->metaData(QtMultimediaKit::Writer); }
return m_control->metaData(QtMultimedia::PixelAspectRatio); }
QVariant videoFrameRate() const { return m_control->metaData(QtMultimedia::VideoFrameRate); }
QVariant videoBitRate() const { return m_control->metaData(QtMultimedia::VideoBitRate); }
QVariant videoCodec() const { return m_control->metaData(QtMultimedia::VideoCodec); }
QVariant posterUrl() const { return m_control->metaData(QtMultimedia::PosterUrl); }
QVariant chapterNumber() const { return m_control->metaData(QtMultimedia::ChapterNumber); }
QVariant director() const { return m_control->metaData(QtMultimedia::Director); }
QVariant leadPerformer() const { return m_control->metaData(QtMultimedia::LeadPerformer); }
QVariant writer() const { return m_control->metaData(QtMultimedia::Writer); }
Q_SIGNALS:
void metaDataChanged();

146
src/imports/multimedia/qdeclarativevideo.cpp
View File

@@ -72,11 +72,11 @@ void QDeclarativeVideo::_q_error(int errorCode, const QString &errorString)
\inherits Item
\ingroup qml-multimedia
This element is part of the \bold{QtMultimediaKit 1.1} module.
This element is part of the \bold{QtMultimedia 4.0} module.
\qml
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
Video {
id: video
@@ -427,7 +427,7 @@ QT_END_NAMESPACE
This property holds the tile of the media.
\sa {QtMultimediaKit::Title}
\sa {QtMultimedia::Title}
*/
/*!
@@ -435,7 +435,7 @@ QT_END_NAMESPACE
This property holds the sub-title of the media.
\sa {QtMultimediaKit::SubTitle}
\sa {QtMultimedia::SubTitle}
*/
/*!
@@ -443,7 +443,7 @@ QT_END_NAMESPACE
This property holds the author of the media.
\sa {QtMultimediaKit::Author}
\sa {QtMultimedia::Author}
*/
/*!
@@ -451,7 +451,7 @@ QT_END_NAMESPACE
This property holds a user comment about the media.
\sa {QtMultimediaKit::Comment}
\sa {QtMultimedia::Comment}
*/
/*!
@@ -459,7 +459,7 @@ QT_END_NAMESPACE
This property holds a description of the media.
\sa {QtMultimediaKit::Description}
\sa {QtMultimedia::Description}
*/
/*!
@@ -467,7 +467,7 @@ QT_END_NAMESPACE
This property holds the category of the media
\sa {QtMultimediaKit::Category}
\sa {QtMultimedia::Category}
*/
/*!
@@ -475,7 +475,7 @@ QT_END_NAMESPACE
This property holds the genre of the media.
\sa {QtMultimediaKit::Genre}
\sa {QtMultimedia::Genre}
*/
/*!
@@ -483,7 +483,7 @@ QT_END_NAMESPACE
This property holds the year of release of the media.
\sa {QtMultimediaKit::Year}
\sa {QtMultimedia::Year}
*/
/*!
@@ -491,7 +491,7 @@ QT_END_NAMESPACE
This property holds the date of the media.
\sa {QtMultimediaKit::Date}
\sa {QtMultimedia::Date}
*/
/*!
@@ -499,7 +499,7 @@ QT_END_NAMESPACE
This property holds a user rating of the media in the range of 0 to 100.
\sa {QtMultimediaKit::UserRating}
\sa {QtMultimedia::UserRating}
*/
/*!
@@ -507,7 +507,7 @@ QT_END_NAMESPACE
This property holds a list of keywords describing the media.
\sa {QtMultimediaKit::Keywords}
\sa {QtMultimedia::Keywords}
*/
/*!
@@ -515,7 +515,7 @@ QT_END_NAMESPACE
This property holds the language of the media, as an ISO 639-2 code.
\sa {QtMultimediaKit::Language}
\sa {QtMultimedia::Language}
*/
/*!
@@ -523,7 +523,7 @@ QT_END_NAMESPACE
This property holds the publisher of the media.
\sa {QtMultimediaKit::Publisher}
\sa {QtMultimedia::Publisher}
*/
/*!
@@ -531,7 +531,7 @@ QT_END_NAMESPACE
This property holds the media's copyright notice.
\sa {QtMultimediaKit::Copyright}
\sa {QtMultimedia::Copyright}
*/
/*!
@@ -539,7 +539,7 @@ QT_END_NAMESPACE
This property holds the parental rating of the media.
\sa {QtMultimediaKit::ParentalRating}
\sa {QtMultimedia::ParentalRating}
*/
/*!
@@ -548,7 +548,7 @@ QT_END_NAMESPACE
This property holds the name of the rating organisation responsible for the
parental rating of the media.
\sa {QtMultimediaKit::RatingOrganisation}
\sa {QtMultimedia::RatingOrganisation}
*/
/*!
@@ -556,7 +556,7 @@ QT_END_NAMESPACE
This property property holds the size of the media in bytes.
\sa {QtMultimediaKit::Size}
\sa {QtMultimedia::Size}
*/
/*!
@@ -564,7 +564,7 @@ QT_END_NAMESPACE
This property holds the type of the media.
\sa {QtMultimediaKit::MediaType}
\sa {QtMultimedia::MediaType}
*/
/*!
@@ -573,7 +573,7 @@ QT_END_NAMESPACE
This property holds the bit rate of the media's audio stream ni bits per
second.
\sa {QtMultimediaKit::AudioBitRate}
\sa {QtMultimedia::AudioBitRate}
*/
/*!
@@ -581,7 +581,7 @@ QT_END_NAMESPACE
This property holds the encoding of the media audio stream.
\sa {QtMultimediaKit::AudioCodec}
\sa {QtMultimedia::AudioCodec}
*/
/*!
@@ -589,7 +589,7 @@ QT_END_NAMESPACE
This property holds the average volume level of the media.
\sa {QtMultimediaKit::AverageLevel}
\sa {QtMultimedia::AverageLevel}
*/
/*!
@@ -597,7 +597,7 @@ QT_END_NAMESPACE
This property holds the number of channels in the media's audio stream.
\sa {QtMultimediaKit::ChannelCount}
\sa {QtMultimedia::ChannelCount}
*/
/*!
@@ -605,7 +605,7 @@ QT_END_NAMESPACE
This property holds the peak volume of media's audio stream.
\sa {QtMultimediaKit::PeakValue}
\sa {QtMultimedia::PeakValue}
*/
/*!
@@ -613,7 +613,7 @@ QT_END_NAMESPACE
This property holds the sample rate of the media's audio stream in hertz.
\sa {QtMultimediaKit::SampleRate}
\sa {QtMultimedia::SampleRate}
*/
/*!
@@ -621,7 +621,7 @@ QT_END_NAMESPACE
This property holds the title of the album the media belongs to.
\sa {QtMultimediaKit::AlbumTitle}
\sa {QtMultimedia::AlbumTitle}
*/
/*!
@@ -630,7 +630,7 @@ QT_END_NAMESPACE
This property holds the name of the principal artist of the album the media
belongs to.
\sa {QtMultimediaKit::AlbumArtist}
\sa {QtMultimedia::AlbumArtist}
*/
/*!
@@ -638,7 +638,7 @@ QT_END_NAMESPACE
This property holds the names of artists contributing to the media.
\sa {QtMultimediaKit::ContributingArtist}
\sa {QtMultimedia::ContributingArtist}
*/
/*!
@@ -646,7 +646,7 @@ QT_END_NAMESPACE
This property holds the composer of the media.
\sa {QtMultimediaKit::Composer}
\sa {QtMultimedia::Composer}
*/
/*!
@@ -654,7 +654,7 @@ QT_END_NAMESPACE
This property holds the conductor of the media.
\sa {QtMultimediaKit::Conductor}
\sa {QtMultimedia::Conductor}
*/
/*!
@@ -662,7 +662,7 @@ QT_END_NAMESPACE
This property holds the lyrics to the media.
\sa {QtMultimediaKit::Lyrics}
\sa {QtMultimedia::Lyrics}
*/
/*!
@@ -670,7 +670,7 @@ QT_END_NAMESPACE
This property holds the mood of the media.
\sa {QtMultimediaKit::Mood}
\sa {QtMultimedia::Mood}
*/
/*!
@@ -678,7 +678,7 @@ QT_END_NAMESPACE
This property holds the track number of the media.
\sa {QtMultimediaKit::TrackNumber}
\sa {QtMultimedia::TrackNumber}
*/
/*!
@@ -686,7 +686,7 @@ QT_END_NAMESPACE
This property holds the number of track on the album containing the media.
\sa {QtMultimediaKit::TrackNumber}
\sa {QtMultimedia::TrackNumber}
*/
/*!
@@ -694,7 +694,7 @@ QT_END_NAMESPACE
This property holds the URL of a small cover art image.
\sa {QtMultimediaKit::CoverArtUrlSmall}
\sa {QtMultimedia::CoverArtUrlSmall}
*/
/*!
@@ -702,7 +702,7 @@ QT_END_NAMESPACE
This property holds the URL of a large cover art image.
\sa {QtMultimediaKit::CoverArtUrlLarge}
\sa {QtMultimedia::CoverArtUrlLarge}
*/
/*!
@@ -710,7 +710,7 @@ QT_END_NAMESPACE
This property holds the dimension of an image or video.
\sa {QtMultimediaKit::Resolution}
\sa {QtMultimedia::Resolution}
*/
/*!
@@ -718,7 +718,7 @@ QT_END_NAMESPACE
This property holds the pixel aspect ratio of an image or video.
\sa {QtMultimediaKit::PixelAspectRatio}
\sa {QtMultimedia::PixelAspectRatio}
*/
/*!
@@ -726,7 +726,7 @@ QT_END_NAMESPACE
This property holds the frame rate of the media's video stream.
\sa {QtMultimediaKit::VideoFrameRate}
\sa {QtMultimedia::VideoFrameRate}
*/
/*!
@@ -735,7 +735,7 @@ QT_END_NAMESPACE
This property holds the bit rate of the media's video stream in bits per
second.
\sa {QtMultimediaKit::VideoBitRate}
\sa {QtMultimedia::VideoBitRate}
*/
/*!
@@ -743,7 +743,7 @@ QT_END_NAMESPACE
This property holds the encoding of the media's video stream.
\sa {QtMultimediaKit::VideoCodec}
\sa {QtMultimedia::VideoCodec}
*/
/*!
@@ -751,7 +751,7 @@ QT_END_NAMESPACE
This property holds the URL of a poster image.
\sa {QtMultimediaKit::PosterUrl}
\sa {QtMultimedia::PosterUrl}
*/
/*!
@@ -759,7 +759,7 @@ QT_END_NAMESPACE
This property holds the chapter number of the media.
\sa {QtMultimediaKit::ChapterNumber}
\sa {QtMultimedia::ChapterNumber}
*/
/*!
@@ -767,7 +767,7 @@ QT_END_NAMESPACE
This property holds the director of the media.
\sa {QtMultimediaKit::Director}
\sa {QtMultimedia::Director}
*/
/*!
@@ -775,7 +775,7 @@ QT_END_NAMESPACE
This property holds the lead performer in the media.
\sa {QtMultimediaKit::LeadPerformer}
\sa {QtMultimedia::LeadPerformer}
*/
/*!
@@ -783,7 +783,7 @@ QT_END_NAMESPACE
This property holds the writer of the media.
\sa {QtMultimediaKit::Writer}
\sa {QtMultimedia::Writer}
*/
// The remaining properties are related to photos, and are technically
@@ -793,157 +793,157 @@ QT_END_NAMESPACE
/*!
\qmlproperty variant Video::metaData.cameraManufacturer
\sa {QtMultimediaKit::CameraManufacturer}
\sa {QtMultimedia::CameraManufacturer}
*/
/*!
\qmlproperty variant Video::metaData.cameraModel
\sa {QtMultimediaKit::CameraModel}
\sa {QtMultimedia::CameraModel}
*/
/*!
\qmlproperty variant Video::metaData.event
\sa {QtMultimediaKit::Event}
\sa {QtMultimedia::Event}
*/
/*!
\qmlproperty variant Video::metaData.subject
\sa {QtMultimediaKit::Subject}
\sa {QtMultimedia::Subject}
*/
/*!
\qmlproperty variant Video::metaData.orientation
\sa {QtMultimediaKit::Orientation}
\sa {QtMultimedia::Orientation}
*/
/*!
\qmlproperty variant Video::metaData.exposureTime
\sa {QtMultimediaKit::ExposureTime}
\sa {QtMultimedia::ExposureTime}
*/
/*!
\qmlproperty variant Video::metaData.fNumber
\sa {QtMultimediaKit::FNumber}
\sa {QtMultimedia::FNumber}
*/
/*!
\qmlproperty variant Video::metaData.exposureProgram
\sa {QtMultimediaKit::ExposureProgram}
\sa {QtMultimedia::ExposureProgram}
*/
/*!
\qmlproperty variant Video::metaData.isoSpeedRatings
\sa {QtMultimediaKit::ISOSpeedRatings}
\sa {QtMultimedia::ISOSpeedRatings}
*/
/*!
\qmlproperty variant Video::metaData.exposureBiasValue
\sa {QtMultimediaKit::ExposureBiasValue}
\sa {QtMultimedia::ExposureBiasValue}
*/
/*!
\qmlproperty variant Video::metaData.dateTimeDigitized
\sa {QtMultimediaKit::DateTimeDigitized}
\sa {QtMultimedia::DateTimeDigitized}
*/
/*!
\qmlproperty variant Video::metaData.subjectDistance
\sa {QtMultimediaKit::SubjectDistance}
\sa {QtMultimedia::SubjectDistance}
*/
/*!
\qmlproperty variant Video::metaData.meteringMode
\sa {QtMultimediaKit::MeteringMode}
\sa {QtMultimedia::MeteringMode}
*/
/*!
\qmlproperty variant Video::metaData.lightSource
\sa {QtMultimediaKit::LightSource}
\sa {QtMultimedia::LightSource}
*/
/*!
\qmlproperty variant Video::metaData.flash
\sa {QtMultimediaKit::Flash}
\sa {QtMultimedia::Flash}
*/
/*!
\qmlproperty variant Video::metaData.focalLength
\sa {QtMultimediaKit::FocalLength}
\sa {QtMultimedia::FocalLength}
*/
/*!
\qmlproperty variant Video::metaData.exposureMode
\sa {QtMultimediaKit::ExposureMode}
\sa {QtMultimedia::ExposureMode}
*/
/*!
\qmlproperty variant Video::metaData.whiteBalance
\sa {QtMultimediaKit::WhiteBalance}
\sa {QtMultimedia::WhiteBalance}
*/
/*!
\qmlproperty variant Video::metaData.DigitalZoomRatio
\sa {QtMultimediaKit::DigitalZoomRatio}
\sa {QtMultimedia::DigitalZoomRatio}
*/
/*!
\qmlproperty variant Video::metaData.focalLengthIn35mmFilm
\sa {QtMultimediaKit::FocalLengthIn35mmFile}
\sa {QtMultimedia::FocalLengthIn35mmFile}
*/
/*!
\qmlproperty variant Video::metaData.sceneCaptureType
\sa {QtMultimediaKit::SceneCaptureType}
\sa {QtMultimedia::SceneCaptureType}
*/
/*!
\qmlproperty variant Video::metaData.gainControl
\sa {QtMultimediaKit::GainControl}
\sa {QtMultimedia::GainControl}
*/
/*!
\qmlproperty variant Video::metaData.contrast
\sa {QtMultimediaKit::contrast}
\sa {QtMultimedia::contrast}
*/
/*!
\qmlproperty variant Video::metaData.saturation
\sa {QtMultimediaKit::Saturation}
\sa {QtMultimedia::Saturation}
*/
/*!
\qmlproperty variant Video::metaData.sharpness
\sa {QtMultimediaKit::Sharpness}
\sa {QtMultimedia::Sharpness}
*/
/*!
\qmlproperty variant Video::metaData.deviceSettingDescription
\sa {QtMultimediaKit::DeviceSettingDescription}
\sa {QtMultimedia::DeviceSettingDescription}
*/
#endif

12
src/imports/multimedia/qdeclarativevideooutput.cpp
View File

@@ -46,10 +46,10 @@
#include <QtDeclarative/qsgitem.h>
#include <QtMultimediaKit/QAbstractVideoSurface>
#include <QtMultimediaKit/qmediaservice.h>
#include <QtMultimediaKit/qvideorenderercontrol.h>
#include <QtMultimediaKit/qvideosurfaceformat.h>
#include <QtMultimedia/QAbstractVideoSurface>
#include <QtMultimedia/qmediaservice.h>
#include <QtMultimedia/qvideorenderercontrol.h>
#include <QtMultimedia/qvideosurfaceformat.h>
#include <QtCore/qmetaobject.h>
@@ -112,11 +112,11 @@ private:
\ingroup qml-multimedia
This element is part of the \bold{QtMultimediaKit 4.0} module.
This element is part of the \bold{QtMultimedia 4.0} module.
\qml
import QtQuick 2.0
import Qt.multimediakit 4.0
import QtMultimedia 4.0
Rectangle {
width: 800

4
src/imports/multimedia/qdeclarativevideooutput_p.h
View File

@@ -44,8 +44,8 @@
#include <qsgitem.h>
#include <QtMultimediaKit/qvideoframe.h>
#include <QtMultimediaKit/qmediaobject.h>
#include <QtMultimedia/qvideoframe.h>
#include <QtMultimedia/qmediaobject.h>
#include <QtCore/qsharedpointer.h>

1
src/imports/multimedia/qmldir.qtmultimediakit Normal file
View File

@@ -0,0 +1 @@
plugin declarative_multimedia ../../QtMultimedia

2
src/imports/multimedia/qsgvideonode_i420.h
View File

@@ -43,7 +43,7 @@
#define QSGVIDEONODE_I420_H
#include "qsgvideonode_p.h"
#include <QtMultimediaKit/qvideosurfaceformat.h>
#include <QtMultimedia/qvideosurfaceformat.h>
class QSGVideoMaterial_YUV420;
class QSGVideoNode_I420 : public QSGVideoNode

4
src/imports/multimedia/qsgvideonode_p.h
View File

@@ -44,8 +44,8 @@
#include <QtDeclarative/qsgnode.h>
#include <QtMultimediaKit/qvideoframe.h>
#include <QtMultimediaKit/qvideosurfaceformat.h>
#include <QtMultimedia/qvideoframe.h>
#include <QtMultimedia/qvideosurfaceformat.h>
#include <QtOpenGL/qglfunctions.h>
class QSGVideoNode : public QSGGeometryNode

2
src/imports/qimportbase.pri
View File

@@ -14,7 +14,7 @@ isEmpty(TARGET) {
QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
copy2build.input = QMLDIRFILE
copy2build.output = $$QT.multimediakit.imports/$$TARGETPATH/qmldir
copy2build.output = $$QT.multimedia.imports/$$TARGETPATH/qmldir
!contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS
copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy2build.name = COPY ${QMAKE_FILE_IN}