From 24d5c396903c1ce12578a32c2cc10e0ae391e6d5 Mon Sep 17 00:00:00 2001 From: Justin McPherson Date: Fri, 16 Apr 2010 11:25:04 +1000 Subject: QtMediaservices -> QtMediaServices. Reviewed-by: Dmytro Poplavskiy --- bin/syncqt | 2 +- configure | 4 +- demos/multimedia/player/player.cpp | 12 +- demos/multimedia/player/playercontrols.h | 2 +- demos/multimedia/player/videowidget.h | 2 +- mkspecs/features/qt.prf | 2 +- src/imports/multimedia/multimedia.cpp | 2 +- src/imports/multimedia/qdeclarativeaudio.cpp | 2 +- src/imports/multimedia/qdeclarativemediabase.cpp | 8 +- src/imports/multimedia/qdeclarativemediabase_p.h | 2 +- src/imports/multimedia/qdeclarativevideo.cpp | 152 ++++++++++----------- src/imports/multimedia/qdeclarativevideo_p.h | 2 +- .../multimedia/qmetadatacontrolmetaobject.cpp | 152 ++++++++++----------- .../multimedia/qmetadatacontrolmetaobject_p.h | 2 +- .../mediaservices/base/qgraphicsvideoitem.cpp | 12 +- .../mediaservices/base/qgraphicsvideoitem.h | 4 +- .../base/qlocalmediaplaylistprovider.cpp | 6 +- .../base/qlocalmediaplaylistprovider.h | 4 +- .../mediaservices/base/qmediacontent.cpp | 4 +- src/multimedia/mediaservices/base/qmediacontent.h | 4 +- .../mediaservices/base/qmediacontrol.cpp | 6 +- src/multimedia/mediaservices/base/qmediacontrol.h | 2 +- .../mediaservices/base/qmediacontrol_p.h | 2 +- src/multimedia/mediaservices/base/qmediaobject.cpp | 16 +-- src/multimedia/mediaservices/base/qmediaobject.h | 12 +- src/multimedia/mediaservices/base/qmediaobject_p.h | 4 +- .../mediaservices/base/qmediaplaylist.cpp | 16 +-- src/multimedia/mediaservices/base/qmediaplaylist.h | 6 +- .../mediaservices/base/qmediaplaylist_p.h | 12 +- .../mediaservices/base/qmediaplaylistcontrol.cpp | 4 +- .../mediaservices/base/qmediaplaylistcontrol.h | 6 +- .../mediaservices/base/qmediaplaylistioplugin.cpp | 4 +- .../mediaservices/base/qmediaplaylistioplugin.h | 4 +- .../mediaservices/base/qmediaplaylistnavigator.cpp | 8 +- .../mediaservices/base/qmediaplaylistnavigator.h | 6 +- .../mediaservices/base/qmediaplaylistprovider.cpp | 4 +- .../mediaservices/base/qmediaplaylistprovider.h | 6 +- .../mediaservices/base/qmediaplaylistprovider_p.h | 4 +- .../mediaservices/base/qmediapluginloader.cpp | 4 +- .../mediaservices/base/qmediapluginloader_p.h | 2 +- .../mediaservices/base/qmediaresource.cpp | 4 +- src/multimedia/mediaservices/base/qmediaresource.h | 2 +- .../mediaservices/base/qmediaservice.cpp | 4 +- src/multimedia/mediaservices/base/qmediaservice.h | 4 +- .../mediaservices/base/qmediaservice_p.h | 2 +- .../mediaservices/base/qmediaserviceprovider.cpp | 32 ++--- .../mediaservices/base/qmediaserviceprovider.h | 6 +- .../base/qmediaserviceproviderplugin.h | 6 +- .../mediaservices/base/qmediatimerange.cpp | 4 +- .../mediaservices/base/qmediatimerange.h | 4 +- .../mediaservices/base/qmetadatacontrol.cpp | 10 +- .../mediaservices/base/qmetadatacontrol.h | 14 +- .../mediaservices/base/qpaintervideosurface.cpp | 2 +- .../base/qpaintervideosurface_mac_p.h | 2 +- .../mediaservices/base/qpaintervideosurface_p.h | 2 +- .../mediaservices/base/qtmedianamespace.h | 4 +- .../mediaservices/base/qvideodevicecontrol.cpp | 4 +- .../mediaservices/base/qvideodevicecontrol.h | 4 +- .../mediaservices/base/qvideooutputcontrol.cpp | 4 +- .../mediaservices/base/qvideooutputcontrol.h | 4 +- .../mediaservices/base/qvideorenderercontrol.cpp | 4 +- .../mediaservices/base/qvideorenderercontrol.h | 4 +- src/multimedia/mediaservices/base/qvideowidget.cpp | 14 +- src/multimedia/mediaservices/base/qvideowidget.h | 2 +- src/multimedia/mediaservices/base/qvideowidget_p.h | 4 +- .../mediaservices/base/qvideowidgetcontrol.cpp | 4 +- .../mediaservices/base/qvideowidgetcontrol.h | 6 +- .../mediaservices/base/qvideowindowcontrol.cpp | 4 +- .../mediaservices/base/qvideowindowcontrol.h | 6 +- .../mediaservices/effects/qsoundeffect_p.h | 2 +- .../mediaservices/effects/qsoundeffect_pulse_p.cpp | 2 +- .../mediaservices/effects/qsoundeffect_pulse_p.h | 4 +- .../effects/qsoundeffect_qmedia_p.cpp | 6 +- .../mediaservices/effects/qsoundeffect_qmedia_p.h | 4 +- .../effects/qsoundeffect_qsound_p.cpp | 2 +- .../mediaservices/effects/qsoundeffect_qsound_p.h | 2 +- .../mediaservices/effects/wavedecoder_p.cpp | 2 +- .../mediaservices/effects/wavedecoder_p.h | 2 +- src/multimedia/mediaservices/mediaservices.pro | 2 +- .../mediaservices/playback/qmediaplayer.cpp | 22 +-- .../mediaservices/playback/qmediaplayer.h | 10 +- .../mediaservices/playback/qmediaplayercontrol.cpp | 8 +- .../mediaservices/playback/qmediaplayercontrol.h | 8 +- .../mediaplayer/directshowaudioendpointcontrol.h | 2 +- .../mediaplayer/directshowmetadatacontrol.cpp | 116 ++++++++-------- .../mediaplayer/directshowmetadatacontrol.h | 8 +- .../directshow/mediaplayer/directshowpinenum.cpp | 2 +- .../mediaplayer/directshowplayercontrol.h | 4 +- .../mediaplayer/directshowplayerservice.cpp | 2 +- .../mediaplayer/directshowplayerservice.h | 8 +- .../mediaplayer/directshowvideooutputcontrol.h | 2 +- .../mediaplayer/directshowvideorenderercontrol.h | 2 +- .../mediaplayer/mediasamplevideobuffer.h | 2 +- .../mediaplayer/vmr9videowindowcontrol.h | 2 +- .../mediaplayer/qgstreamermetadataprovider.cpp | 108 +++++++-------- .../mediaplayer/qgstreamermetadataprovider.h | 8 +- .../mediaplayer/qgstreamerplayercontrol.h | 4 +- .../mediaplayer/qgstreamerplayerservice.h | 2 +- .../mediaplayer/qgstreamerplayersession.cpp | 8 +- .../mediaplayer/qgstreamerplayersession.h | 6 +- .../gstreamer/qgstreamerserviceplugin.cpp | 2 +- .../gstreamer/qgstreamerserviceplugin.h | 2 +- .../gstreamer/qgstreamervideoinputdevicecontrol.h | 2 +- .../gstreamer/qgstreamervideooutputcontrol.h | 2 +- .../gstreamer/qgstreamervideooverlay.h | 2 +- .../gstreamer/qgstreamervideorenderer.h | 2 +- .../gstreamer/qgstreamervideowidget.h | 2 +- .../qt7/mediaplayer/qt7playercontrol.h | 4 +- .../qt7/mediaplayer/qt7playercontrol.mm | 2 +- .../qt7/mediaplayer/qt7playermetadata.h | 10 +- .../qt7/mediaplayer/qt7playermetadata.mm | 20 +-- .../qt7/mediaplayer/qt7playerservice.h | 2 +- .../qt7/mediaplayer/qt7playerservice.mm | 4 +- .../qt7/mediaplayer/qt7playersession.h | 4 +- .../qt7/mediaplayer/qt7playersession.mm | 2 +- src/plugins/mediaservices/qt7/qt7movieviewoutput.h | 4 +- .../mediaservices/qt7/qt7movieviewrenderer.h | 4 +- src/plugins/mediaservices/qt7/qt7serviceplugin.h | 2 +- src/plugins/mediaservices/qt7/qt7serviceplugin.mm | 2 +- .../mediaservices/qt7/qt7videooutputcontrol.h | 10 +- tools/configure/configureapp.cpp | 10 +- 121 files changed, 565 insertions(+), 565 deletions(-) diff --git a/bin/syncqt b/bin/syncqt index 9fe0009..e36eeb6 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -51,7 +51,7 @@ my %modules = ( # path to module name map "QtWebKit" => "$basedir/src/3rdparty/webkit/WebCore", "phonon" => "$basedir/src/phonon", "QtMultimedia" => "$basedir/src/multimedia/multimedia", - "QtMediaservices" => "$basedir/src/multimedia/mediaservices", + "QtMediaServices" => "$basedir/src/multimedia/mediaservices", ); my %moduleheaders = ( # restrict the module headers to those found in relative path "QtWebKit" => "../WebKit/qt/Api", diff --git a/configure b/configure index 9cbb0f7..fc26a7a 100755 --- a/configure +++ b/configure @@ -3555,8 +3555,8 @@ fi -no-audio-backend .. Do not build the platform audio backend into QtMultimedia. + -audio-backend ..... Build the platform audio backend into QtMultimedia if available. - -no-mediaservices... Do not build the QtMediaservices module. - + -mediaservices...... Build the QtMediaservices module. + -no-mediaservices... Do not build the QtMediaServices module. + + -mediaservices...... Build the QtMediaServices module. -no-media-backend... Do not build platform mediaservices plugin. + -media-backend..... Build the platform mediaservices plugin. diff --git a/demos/multimedia/player/player.cpp b/demos/multimedia/player/player.cpp index 20341bc..6ba19fd 100644 --- a/demos/multimedia/player/player.cpp +++ b/demos/multimedia/player/player.cpp @@ -45,8 +45,8 @@ #include "playlistmodel.h" #include "videowidget.h" -#include -#include +#include +#include #include @@ -204,14 +204,14 @@ void Player::positionChanged(qint64 progress) void Player::metaDataChanged() { - //qDebug() << "update metadata" << player->metaData(QtMediaservices::Title).toString(); + //qDebug() << "update metadata" << player->metaData(QtMediaServices::Title).toString(); if (player->isMetaDataAvailable()) { setTrackInfo(QString("%1 - %2") - .arg(player->metaData(QtMediaservices::AlbumArtist).toString()) - .arg(player->metaData(QtMediaservices::Title).toString())); + .arg(player->metaData(QtMediaServices::AlbumArtist).toString()) + .arg(player->metaData(QtMediaServices::Title).toString())); if (coverLabel) { - QUrl url = player->metaData(QtMediaservices::CoverArtUrlLarge).value(); + QUrl url = player->metaData(QtMediaServices::CoverArtUrlLarge).value(); coverLabel->setPixmap(!url.isEmpty() ? QPixmap(url.toString()) diff --git a/demos/multimedia/player/playercontrols.h b/demos/multimedia/player/playercontrols.h index 0b0b0e6..d2229bd 100644 --- a/demos/multimedia/player/playercontrols.h +++ b/demos/multimedia/player/playercontrols.h @@ -42,7 +42,7 @@ #ifndef PLAYERCONTROLS_H #define PLAYERCONTROLS_H -#include +#include #include diff --git a/demos/multimedia/player/videowidget.h b/demos/multimedia/player/videowidget.h index 0251bfe..b5bf581 100644 --- a/demos/multimedia/player/videowidget.h +++ b/demos/multimedia/player/videowidget.h @@ -41,7 +41,7 @@ #ifndef VIDEOWIDGET_H #define VIDEOWIDGET_H -#include +#include QT_BEGIN_HEADER diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index ff4e986..7b0b4af 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -175,7 +175,7 @@ for(QTLIB, $$list($$lower($$unique(QT)))) { } } else:isEqual(QTLIB, declarative):qlib = QtDeclarative else:isEqual(QTLIB, multimedia):qlib = QtMultimedia - else:isEqual(QTLIB, mediaservices):qlib = QtMediaservices + else:isEqual(QTLIB, mediaservices):qlib = QtMediaServices else:message("Unknown QT: $$QTLIB"):qlib = !isEmpty(qlib) { target_qt:isEqual(TARGET, qlib) { diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index 46ceb34..e2a2821 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -41,7 +41,7 @@ #include #include -#include +#include #include "qdeclarativevideo_p.h" #include "qdeclarativeaudio_p.h" diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp index 3367e08..49eabc2 100644 --- a/src/imports/multimedia/qdeclarativeaudio.cpp +++ b/src/imports/multimedia/qdeclarativeaudio.cpp @@ -41,7 +41,7 @@ #include "qdeclarativeaudio_p.h" -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/imports/multimedia/qdeclarativemediabase.cpp b/src/imports/multimedia/qdeclarativemediabase.cpp index 5ed602a..ee0737b 100644 --- a/src/imports/multimedia/qdeclarativemediabase.cpp +++ b/src/imports/multimedia/qdeclarativemediabase.cpp @@ -44,10 +44,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "qmetadatacontrolmetaobject_p.h" diff --git a/src/imports/multimedia/qdeclarativemediabase_p.h b/src/imports/multimedia/qdeclarativemediabase_p.h index e5115de..34875f9 100644 --- a/src/imports/multimedia/qdeclarativemediabase_p.h +++ b/src/imports/multimedia/qdeclarativemediabase_p.h @@ -54,7 +54,7 @@ // #include -#include +#include QT_BEGIN_HEADER diff --git a/src/imports/multimedia/qdeclarativevideo.cpp b/src/imports/multimedia/qdeclarativevideo.cpp index 6a91656..774c9a4 100644 --- a/src/imports/multimedia/qdeclarativevideo.cpp +++ b/src/imports/multimedia/qdeclarativevideo.cpp @@ -41,11 +41,11 @@ #include "qdeclarativevideo_p.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include QT_BEGIN_NAMESPACE @@ -435,7 +435,7 @@ QT_END_NAMESPACE This property holds the tile of the media. - \sa {QtMediaservices::Title} + \sa {QtMediaServices::Title} */ /*! @@ -443,7 +443,7 @@ QT_END_NAMESPACE This property holds the sub-title of the media. - \sa {QtMediaservices::SubTitle} + \sa {QtMediaServices::SubTitle} */ /*! @@ -451,7 +451,7 @@ QT_END_NAMESPACE This property holds the author of the media. - \sa {QtMediaservices::Author} + \sa {QtMediaServices::Author} */ /*! @@ -459,7 +459,7 @@ QT_END_NAMESPACE This property holds a user comment about the media. - \sa {QtMediaservices::Comment} + \sa {QtMediaServices::Comment} */ /*! @@ -467,7 +467,7 @@ QT_END_NAMESPACE This property holds a description of the media. - \sa {QtMediaservices::Description} + \sa {QtMediaServices::Description} */ /*! @@ -475,7 +475,7 @@ QT_END_NAMESPACE This property holds the category of the media - \sa {QtMediaservices::Category} + \sa {QtMediaServices::Category} */ /*! @@ -483,7 +483,7 @@ QT_END_NAMESPACE This property holds the genre of the media. - \sa {QtMediaservices::Genre} + \sa {QtMediaServices::Genre} */ /*! @@ -491,7 +491,7 @@ QT_END_NAMESPACE This property holds the year of release of the media. - \sa {QtMediaservices::Year} + \sa {QtMediaServices::Year} */ /*! @@ -499,7 +499,7 @@ QT_END_NAMESPACE This property holds the date of the media. - \sa {QtMediaservices::Date} + \sa {QtMediaServices::Date} */ /*! @@ -507,7 +507,7 @@ QT_END_NAMESPACE This property holds a user rating of the media in the range of 0 to 100. - \sa {QtMediaservices::UserRating} + \sa {QtMediaServices::UserRating} */ /*! @@ -515,7 +515,7 @@ QT_END_NAMESPACE This property holds a list of keywords describing the media. - \sa {QtMediaservices::Keywords} + \sa {QtMediaServices::Keywords} */ /*! @@ -523,7 +523,7 @@ QT_END_NAMESPACE This property holds the language of the media, as an ISO 639-2 code. - \sa {QtMediaservices::Language} + \sa {QtMediaServices::Language} */ /*! @@ -531,7 +531,7 @@ QT_END_NAMESPACE This property holds the publisher of the media. - \sa {QtMediaservices::Publisher} + \sa {QtMediaServices::Publisher} */ /*! @@ -539,7 +539,7 @@ QT_END_NAMESPACE This property holds the media's copyright notice. - \sa {QtMediaservices::Copyright} + \sa {QtMediaServices::Copyright} */ /*! @@ -547,7 +547,7 @@ QT_END_NAMESPACE This property holds the parental rating of the media. - \sa {QtMediaservices::ParentalRating} + \sa {QtMediaServices::ParentalRating} */ /*! @@ -556,7 +556,7 @@ QT_END_NAMESPACE This property holds the name of the rating organisation responsible for the parental rating of the media. - \sa {QtMediaservices::RatingOrganisation} + \sa {QtMediaServices::RatingOrganisation} */ /*! @@ -564,7 +564,7 @@ QT_END_NAMESPACE This property property holds the size of the media in bytes. - \sa {QtMediaservices::Size} + \sa {QtMediaServices::Size} */ /*! @@ -572,7 +572,7 @@ QT_END_NAMESPACE This property holds the type of the media. - \sa {QtMediaservices::MediaType} + \sa {QtMediaServices::MediaType} */ /*! @@ -581,7 +581,7 @@ QT_END_NAMESPACE This property holds the bit rate of the media's audio stream ni bits per second. - \sa {QtMediaservices::AudioBitRate} + \sa {QtMediaServices::AudioBitRate} */ /*! @@ -589,7 +589,7 @@ QT_END_NAMESPACE This property holds the encoding of the media audio stream. - \sa {QtMediaservices::AudioCodec} + \sa {QtMediaServices::AudioCodec} */ /*! @@ -597,7 +597,7 @@ QT_END_NAMESPACE This property holds the average volume level of the media. - \sa {QtMediaservices::AverageLevel} + \sa {QtMediaServices::AverageLevel} */ /*! @@ -605,7 +605,7 @@ QT_END_NAMESPACE This property holds the number of channels in the media's audio stream. - \sa {QtMediaservices::ChannelCount} + \sa {QtMediaServices::ChannelCount} */ /*! @@ -613,7 +613,7 @@ QT_END_NAMESPACE This property holds the peak volume of media's audio stream. - \sa {QtMediaservices::PeakValue} + \sa {QtMediaServices::PeakValue} */ /*! @@ -621,7 +621,7 @@ QT_END_NAMESPACE This property holds the sample rate of the media's audio stream in hertz. - \sa {QtMediaservices::SampleRate} + \sa {QtMediaServices::SampleRate} */ /*! @@ -629,7 +629,7 @@ QT_END_NAMESPACE This property holds the title of the album the media belongs to. - \sa {QtMediaservices::AlbumTitle} + \sa {QtMediaServices::AlbumTitle} */ /*! @@ -638,7 +638,7 @@ QT_END_NAMESPACE This property holds the name of the principal artist of the album the media belongs to. - \sa {QtMediaservices::AlbumArtist} + \sa {QtMediaServices::AlbumArtist} */ /*! @@ -646,7 +646,7 @@ QT_END_NAMESPACE This property holds the names of artists contributing to the media. - \sa {QtMediaservices::ContributingArtist} + \sa {QtMediaServices::ContributingArtist} */ /*! @@ -654,7 +654,7 @@ QT_END_NAMESPACE This property holds the composer of the media. - \sa {QtMediaservices::Composer} + \sa {QtMediaServices::Composer} */ /*! @@ -662,7 +662,7 @@ QT_END_NAMESPACE This property holds the conductor of the media. - \sa {QtMediaservices::Conductor} + \sa {QtMediaServices::Conductor} */ /*! @@ -670,7 +670,7 @@ QT_END_NAMESPACE This property holds the lyrics to the media. - \sa {QtMediaservices::Lyrics} + \sa {QtMediaServices::Lyrics} */ /*! @@ -678,7 +678,7 @@ QT_END_NAMESPACE This property holds the mood of the media. - \sa {QtMediaservices::Mood} + \sa {QtMediaServices::Mood} */ /*! @@ -686,7 +686,7 @@ QT_END_NAMESPACE This property holds the track number of the media. - \sa {QtMediaservices::TrackNumber} + \sa {QtMediaServices::TrackNumber} */ /*! @@ -694,7 +694,7 @@ QT_END_NAMESPACE This property holds the number of track on the album containing the media. - \sa {QtMediaservices::TrackNumber} + \sa {QtMediaServices::TrackNumber} */ /*! @@ -702,7 +702,7 @@ QT_END_NAMESPACE This property holds the URL of a small cover art image. - \sa {QtMediaservices::CoverArtUrlSmall} + \sa {QtMediaServices::CoverArtUrlSmall} */ /*! @@ -710,7 +710,7 @@ QT_END_NAMESPACE This property holds the URL of a large cover art image. - \sa {QtMediaservices::CoverArtUrlLarge} + \sa {QtMediaServices::CoverArtUrlLarge} */ /*! @@ -718,7 +718,7 @@ QT_END_NAMESPACE This property holds the dimension of an image or video. - \sa {QtMediaservices::Resolution} + \sa {QtMediaServices::Resolution} */ /*! @@ -726,7 +726,7 @@ QT_END_NAMESPACE This property holds the pixel aspect ratio of an image or video. - \sa {QtMediaservices::PixelAspectRatio} + \sa {QtMediaServices::PixelAspectRatio} */ /*! @@ -734,7 +734,7 @@ QT_END_NAMESPACE This property holds the frame rate of the media's video stream. - \sa {QtMediaservices::VideoFrameRate} + \sa {QtMediaServices::VideoFrameRate} */ /*! @@ -743,7 +743,7 @@ QT_END_NAMESPACE This property holds the bit rate of the media's video stream in bits per second. - \sa {QtMediaservices::VideoBitRate} + \sa {QtMediaServices::VideoBitRate} */ /*! @@ -751,7 +751,7 @@ QT_END_NAMESPACE This property holds the encoding of the media's video stream. - \sa {QtMediaservices::VideoCodec} + \sa {QtMediaServices::VideoCodec} */ /*! @@ -759,7 +759,7 @@ QT_END_NAMESPACE This property holds the URL of a poster image. - \sa {QtMediaservices::PosterUrl} + \sa {QtMediaServices::PosterUrl} */ /*! @@ -767,7 +767,7 @@ QT_END_NAMESPACE This property holds the chapter number of the media. - \sa {QtMediaservices::ChapterNumber} + \sa {QtMediaServices::ChapterNumber} */ /*! @@ -775,7 +775,7 @@ QT_END_NAMESPACE This property holds the director of the media. - \sa {QtMediaservices::Director} + \sa {QtMediaServices::Director} */ /*! @@ -783,7 +783,7 @@ QT_END_NAMESPACE This property holds the lead performer in the media. - \sa {QtMediaservices::LeadPerformer} + \sa {QtMediaServices::LeadPerformer} */ /*! @@ -791,7 +791,7 @@ QT_END_NAMESPACE This property holds the writer of the media. - \sa {QtMediaservices::Writer} + \sa {QtMediaServices::Writer} */ // The remaining properties are related to photos, and are technically @@ -801,157 +801,157 @@ QT_END_NAMESPACE /*! \qmlproperty variant Video::cameraManufacturer - \sa {QtMediaservices::CameraManufacturer} + \sa {QtMediaServices::CameraManufacturer} */ /*! \qmlproperty variant Video::cameraModel - \sa {QtMediaservices::CameraModel} + \sa {QtMediaServices::CameraModel} */ /*! \qmlproperty variant Video::event - \sa {QtMediaservices::Event} + \sa {QtMediaServices::Event} */ /*! \qmlproperty variant Video::subject - \sa {QtMediaservices::Subject} + \sa {QtMediaServices::Subject} */ /*! \qmlproperty variant Video::orientation - \sa {QtMediaservices::Orientation} + \sa {QtMediaServices::Orientation} */ /*! \qmlproperty variant Video::exposureTime - \sa {QtMediaservices::ExposureTime} + \sa {QtMediaServices::ExposureTime} */ /*! \qmlproperty variant Video::fNumber - \sa {QtMediaservices::FNumber} + \sa {QtMediaServices::FNumber} */ /*! \qmlproperty variant Video::exposureProgram - \sa {QtMediaservices::ExposureProgram} + \sa {QtMediaServices::ExposureProgram} */ /*! \qmlproperty variant Video::isoSpeedRatings - \sa {QtMediaservices::ISOSpeedRatings} + \sa {QtMediaServices::ISOSpeedRatings} */ /*! \qmlproperty variant Video::exposureBiasValue - \sa {QtMediaservices::ExposureBiasValue} + \sa {QtMediaServices::ExposureBiasValue} */ /*! \qmlproperty variant Video::dateTimeDigitized - \sa {QtMediaservices::DateTimeDigitized} + \sa {QtMediaServices::DateTimeDigitized} */ /*! \qmlproperty variant Video::subjectDistance - \sa {QtMediaservices::SubjectDistance} + \sa {QtMediaServices::SubjectDistance} */ /*! \qmlproperty variant Video::meteringMode - \sa {QtMediaservices::MeteringMode} + \sa {QtMediaServices::MeteringMode} */ /*! \qmlproperty variant Video::lightSource - \sa {QtMediaservices::LightSource} + \sa {QtMediaServices::LightSource} */ /*! \qmlproperty variant Video::flash - \sa {QtMediaservices::Flash} + \sa {QtMediaServices::Flash} */ /*! \qmlproperty variant Video::focalLength - \sa {QtMediaservices::FocalLength} + \sa {QtMediaServices::FocalLength} */ /*! \qmlproperty variant Video::exposureMode - \sa {QtMediaservices::ExposureMode} + \sa {QtMediaServices::ExposureMode} */ /*! \qmlproperty variant Video::whiteBalance - \sa {QtMediaservices::WhiteBalance} + \sa {QtMediaServices::WhiteBalance} */ /*! \qmlproperty variant Video::DigitalZoomRatio - \sa {QtMediaservices::DigitalZoomRatio} + \sa {QtMediaServices::DigitalZoomRatio} */ /*! \qmlproperty variant Video::focalLengthIn35mmFilm - \sa {QtMediaservices::FocalLengthIn35mmFile} + \sa {QtMediaServices::FocalLengthIn35mmFile} */ /*! \qmlproperty variant Video::sceneCaptureType - \sa {QtMediaservices::SceneCaptureType} + \sa {QtMediaServices::SceneCaptureType} */ /*! \qmlproperty variant Video::gainControl - \sa {QtMediaservices::GainControl} + \sa {QtMediaServices::GainControl} */ /*! \qmlproperty variant Video::contrast - \sa {QtMediaservices::contrast} + \sa {QtMediaServices::contrast} */ /*! \qmlproperty variant Video::saturation - \sa {QtMediaservices::Saturation} + \sa {QtMediaServices::Saturation} */ /*! \qmlproperty variant Video::sharpness - \sa {QtMediaservices::Sharpness} + \sa {QtMediaServices::Sharpness} */ /*! \qmlproperty variant Video::deviceSettingDescription - \sa {QtMediaservices::DeviceSettingDescription} + \sa {QtMediaServices::DeviceSettingDescription} */ #endif diff --git a/src/imports/multimedia/qdeclarativevideo_p.h b/src/imports/multimedia/qdeclarativevideo_p.h index 99882ac..c048b7d 100644 --- a/src/imports/multimedia/qdeclarativevideo_p.h +++ b/src/imports/multimedia/qdeclarativevideo_p.h @@ -55,7 +55,7 @@ #include "qdeclarativemediabase_p.h" -#include +#include #include #include diff --git a/src/imports/multimedia/qmetadatacontrolmetaobject.cpp b/src/imports/multimedia/qmetadatacontrolmetaobject.cpp index 2f45b50..5235a87 100644 --- a/src/imports/multimedia/qmetadatacontrolmetaobject.cpp +++ b/src/imports/multimedia/qmetadatacontrolmetaobject.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmetadatacontrolmetaobject_p.h" -#include +#include QT_BEGIN_NAMESPACE @@ -106,101 +106,101 @@ namespace { struct MetaDataKey { - QtMediaservices::MetaData key; + QtMediaServices::MetaData key; const char *name; }; const MetaDataKey qt_metaDataKeys[] = { - { QtMediaservices::Title, "title" }, - { QtMediaservices::SubTitle, "subTitle" }, - { QtMediaservices::Author, "author" }, - { QtMediaservices::Comment, "comment" }, - { QtMediaservices::Description, "description" }, - { QtMediaservices::Category, "category" }, - { QtMediaservices::Genre, "genre" }, - { QtMediaservices::Year, "year" }, - { QtMediaservices::Date, "date" }, - { QtMediaservices::UserRating, "userRating" }, - { QtMediaservices::Keywords, "keywords" }, - { QtMediaservices::Language, "language" }, - { QtMediaservices::Publisher, "publisher" }, - { QtMediaservices::Copyright, "copyright" }, - { QtMediaservices::ParentalRating, "parentalRating" }, - { QtMediaservices::RatingOrganisation, "ratingOrganisation" }, + { QtMediaServices::Title, "title" }, + { QtMediaServices::SubTitle, "subTitle" }, + { QtMediaServices::Author, "author" }, + { QtMediaServices::Comment, "comment" }, + { QtMediaServices::Description, "description" }, + { QtMediaServices::Category, "category" }, + { QtMediaServices::Genre, "genre" }, + { QtMediaServices::Year, "year" }, + { QtMediaServices::Date, "date" }, + { QtMediaServices::UserRating, "userRating" }, + { QtMediaServices::Keywords, "keywords" }, + { QtMediaServices::Language, "language" }, + { QtMediaServices::Publisher, "publisher" }, + { QtMediaServices::Copyright, "copyright" }, + { QtMediaServices::ParentalRating, "parentalRating" }, + { QtMediaServices::RatingOrganisation, "ratingOrganisation" }, // Media - { QtMediaservices::Size, "size" }, - { QtMediaservices::MediaType, "mediaType" }, -// { QtMediaservices::Duration, "duration" }, + { QtMediaServices::Size, "size" }, + { QtMediaServices::MediaType, "mediaType" }, +// { QtMediaServices::Duration, "duration" }, // Audio - { QtMediaservices::AudioBitRate, "audioBitRate" }, - { QtMediaservices::AudioCodec, "audioCodec" }, - { QtMediaservices::AverageLevel, "averageLevel" }, - { QtMediaservices::ChannelCount, "channelCount" }, - { QtMediaservices::PeakValue, "peakValue" }, - { QtMediaservices::SampleRate, "sampleRate" }, + { QtMediaServices::AudioBitRate, "audioBitRate" }, + { QtMediaServices::AudioCodec, "audioCodec" }, + { QtMediaServices::AverageLevel, "averageLevel" }, + { QtMediaServices::ChannelCount, "channelCount" }, + { QtMediaServices::PeakValue, "peakValue" }, + { QtMediaServices::SampleRate, "sampleRate" }, // Music - { QtMediaservices::AlbumTitle, "albumTitle" }, - { QtMediaservices::AlbumArtist, "albumArtist" }, - { QtMediaservices::ContributingArtist, "contributingArtist" }, - { QtMediaservices::Composer, "composer" }, - { QtMediaservices::Conductor, "conductor" }, - { QtMediaservices::Lyrics, "lyrics" }, - { QtMediaservices::Mood, "mood" }, - { QtMediaservices::TrackNumber, "trackNumber" }, - { QtMediaservices::TrackCount, "trackCount" }, - - { QtMediaservices::CoverArtUrlSmall, "coverArtUrlSmall" }, - { QtMediaservices::CoverArtUrlLarge, "coverArtUrlLarge" }, + { QtMediaServices::AlbumTitle, "albumTitle" }, + { QtMediaServices::AlbumArtist, "albumArtist" }, + { QtMediaServices::ContributingArtist, "contributingArtist" }, + { QtMediaServices::Composer, "composer" }, + { QtMediaServices::Conductor, "conductor" }, + { QtMediaServices::Lyrics, "lyrics" }, + { QtMediaServices::Mood, "mood" }, + { QtMediaServices::TrackNumber, "trackNumber" }, + { QtMediaServices::TrackCount, "trackCount" }, + + { QtMediaServices::CoverArtUrlSmall, "coverArtUrlSmall" }, + { QtMediaServices::CoverArtUrlLarge, "coverArtUrlLarge" }, // Image/Video - { QtMediaservices::Resolution, "resolution" }, - { QtMediaservices::PixelAspectRatio, "pixelAspectRatio" }, + { QtMediaServices::Resolution, "resolution" }, + { QtMediaServices::PixelAspectRatio, "pixelAspectRatio" }, // Video - { QtMediaservices::VideoFrameRate, "videoFrameRate" }, - { QtMediaservices::VideoBitRate, "videoBitRate" }, - { QtMediaservices::VideoCodec, "videoCodec" }, + { QtMediaServices::VideoFrameRate, "videoFrameRate" }, + { QtMediaServices::VideoBitRate, "videoBitRate" }, + { QtMediaServices::VideoCodec, "videoCodec" }, - { QtMediaservices::PosterUrl, "posterUrl" }, + { QtMediaServices::PosterUrl, "posterUrl" }, // Movie - { QtMediaservices::ChapterNumber, "chapterNumber" }, - { QtMediaservices::Director, "director" }, - { QtMediaservices::LeadPerformer, "leadPerformer" }, - { QtMediaservices::Writer, "writer" }, + { QtMediaServices::ChapterNumber, "chapterNumber" }, + { QtMediaServices::Director, "director" }, + { QtMediaServices::LeadPerformer, "leadPerformer" }, + { QtMediaServices::Writer, "writer" }, // Photos - { QtMediaservices::CameraManufacturer, "cameraManufacturer" }, - { QtMediaservices::CameraModel, "cameraModel" }, - { QtMediaservices::Event, "event" }, - { QtMediaservices::Subject, "subject" }, - { QtMediaservices::Orientation, "orientation" }, - { QtMediaservices::ExposureTime, "exposureTime" }, - { QtMediaservices::FNumber, "fNumber" }, - { QtMediaservices::ExposureProgram, "exposureProgram" }, - { QtMediaservices::ISOSpeedRatings, "isoSpeedRatings" }, - { QtMediaservices::ExposureBiasValue, "exposureBiasValue" }, - { QtMediaservices::DateTimeOriginal, "dateTimeOriginal" }, - { QtMediaservices::DateTimeDigitized, "dateTimeDigitized" }, - { QtMediaservices::SubjectDistance, "subjectDistance" }, - { QtMediaservices::MeteringMode, "meteringMode" }, - { QtMediaservices::LightSource, "lightSource" }, - { QtMediaservices::Flash, "flash" }, - { QtMediaservices::FocalLength, "focalLength" }, - { QtMediaservices::ExposureMode, "exposureMode" }, - { QtMediaservices::WhiteBalance, "whiteBalance" }, - { QtMediaservices::DigitalZoomRatio, "digitalZoomRatio" }, - { QtMediaservices::FocalLengthIn35mmFilm, "focalLengthIn35mmFilm" }, - { QtMediaservices::SceneCaptureType, "sceneCaptureType" }, - { QtMediaservices::GainControl, "gainControl" }, - { QtMediaservices::Contrast, "contrast" }, - { QtMediaservices::Saturation, "saturation" }, - { QtMediaservices::Sharpness, "sharpness" }, - { QtMediaservices::DeviceSettingDescription, "deviceSettingDescription" } + { QtMediaServices::CameraManufacturer, "cameraManufacturer" }, + { QtMediaServices::CameraModel, "cameraModel" }, + { QtMediaServices::Event, "event" }, + { QtMediaServices::Subject, "subject" }, + { QtMediaServices::Orientation, "orientation" }, + { QtMediaServices::ExposureTime, "exposureTime" }, + { QtMediaServices::FNumber, "fNumber" }, + { QtMediaServices::ExposureProgram, "exposureProgram" }, + { QtMediaServices::ISOSpeedRatings, "isoSpeedRatings" }, + { QtMediaServices::ExposureBiasValue, "exposureBiasValue" }, + { QtMediaServices::DateTimeOriginal, "dateTimeOriginal" }, + { QtMediaServices::DateTimeDigitized, "dateTimeDigitized" }, + { QtMediaServices::SubjectDistance, "subjectDistance" }, + { QtMediaServices::MeteringMode, "meteringMode" }, + { QtMediaServices::LightSource, "lightSource" }, + { QtMediaServices::Flash, "flash" }, + { QtMediaServices::FocalLength, "focalLength" }, + { QtMediaServices::ExposureMode, "exposureMode" }, + { QtMediaServices::WhiteBalance, "whiteBalance" }, + { QtMediaServices::DigitalZoomRatio, "digitalZoomRatio" }, + { QtMediaServices::FocalLengthIn35mmFilm, "focalLengthIn35mmFilm" }, + { QtMediaServices::SceneCaptureType, "sceneCaptureType" }, + { QtMediaServices::GainControl, "gainControl" }, + { QtMediaServices::Contrast, "contrast" }, + { QtMediaServices::Saturation, "saturation" }, + { QtMediaServices::Sharpness, "sharpness" }, + { QtMediaServices::DeviceSettingDescription, "deviceSettingDescription" } }; class QMetaDataControlObject : public QObject diff --git a/src/imports/multimedia/qmetadatacontrolmetaobject_p.h b/src/imports/multimedia/qmetadatacontrolmetaobject_p.h index 128eaa4..bbbc6fe 100644 --- a/src/imports/multimedia/qmetadatacontrolmetaobject_p.h +++ b/src/imports/multimedia/qmetadatacontrolmetaobject_p.h @@ -54,7 +54,7 @@ // #include -#include +#include #include diff --git a/src/multimedia/mediaservices/base/qgraphicsvideoitem.cpp b/src/multimedia/mediaservices/base/qgraphicsvideoitem.cpp index 8494c2e..d80dec5 100644 --- a/src/multimedia/mediaservices/base/qgraphicsvideoitem.cpp +++ b/src/multimedia/mediaservices/base/qgraphicsvideoitem.cpp @@ -39,13 +39,13 @@ ** ****************************************************************************/ -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1) diff --git a/src/multimedia/mediaservices/base/qgraphicsvideoitem.h b/src/multimedia/mediaservices/base/qgraphicsvideoitem.h index 62e66e8..bb41075 100644 --- a/src/multimedia/mediaservices/base/qgraphicsvideoitem.h +++ b/src/multimedia/mediaservices/base/qgraphicsvideoitem.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -44,7 +44,7 @@ #include -#include +#include #if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW diff --git a/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.cpp b/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.cpp index 818b285..51e3bfb 100644 --- a/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.cpp +++ b/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include +#include #include "qmediaplaylistprovider_p.h" -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.h b/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.h index 73ff82d..e6b6dca 100644 --- a/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.h +++ b/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -42,7 +42,7 @@ #ifndef QLOCALMEDIAPAYLISTPROVIDER_H #define QLOCALMEDIAPAYLISTPROVIDER_H -#include +#include QT_BEGIN_HEADER diff --git a/src/multimedia/mediaservices/base/qmediacontent.cpp b/src/multimedia/mediaservices/base/qmediacontent.cpp index f89e901..50d8e46 100644 --- a/src/multimedia/mediaservices/base/qmediacontent.cpp +++ b/src/multimedia/mediaservices/base/qmediacontent.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -42,7 +42,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/multimedia/mediaservices/base/qmediacontent.h b/src/multimedia/mediaservices/base/qmediacontent.h index 20f0525..47fa6e1 100644 --- a/src/multimedia/mediaservices/base/qmediacontent.h +++ b/src/multimedia/mediaservices/base/qmediacontent.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -45,7 +45,7 @@ #include #include -#include +#include #include diff --git a/src/multimedia/mediaservices/base/qmediacontrol.cpp b/src/multimedia/mediaservices/base/qmediacontrol.cpp index 98db9fe..09996c8 100644 --- a/src/multimedia/mediaservices/base/qmediacontrol.cpp +++ b/src/multimedia/mediaservices/base/qmediacontrol.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -42,8 +42,8 @@ #include #include -#include -#include +#include +#include diff --git a/src/multimedia/mediaservices/base/qmediacontrol.h b/src/multimedia/mediaservices/base/qmediacontrol.h index be5d95d..819c959 100644 --- a/src/multimedia/mediaservices/base/qmediacontrol.h +++ b/src/multimedia/mediaservices/base/qmediacontrol.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/multimedia/mediaservices/base/qmediacontrol_p.h b/src/multimedia/mediaservices/base/qmediacontrol_p.h index ad7e947..3f9755b 100644 --- a/src/multimedia/mediaservices/base/qmediacontrol_p.h +++ b/src/multimedia/mediaservices/base/qmediacontrol_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/multimedia/mediaservices/base/qmediaobject.cpp b/src/multimedia/mediaservices/base/qmediaobject.cpp index 3d92b12..68fb29e 100644 --- a/src/multimedia/mediaservices/base/qmediaobject.cpp +++ b/src/multimedia/mediaservices/base/qmediaobject.cpp @@ -43,8 +43,8 @@ #include "qmediaobject_p.h" -#include -#include +#include +#include QT_BEGIN_NAMESPACE @@ -97,9 +97,9 @@ QMediaObject::~QMediaObject() Returns the service availability error state. */ -QtMediaservices::AvailabilityError QMediaObject::availabilityError() const +QtMediaServices::AvailabilityError QMediaObject::availabilityError() const { - return QtMediaservices::ServiceMissingError; + return QtMediaServices::ServiceMissingError; } /*! @@ -306,7 +306,7 @@ bool QMediaObject::isMetaDataWritable() const /*! Returns the value associated with a meta-data \a key. */ -QVariant QMediaObject::metaData(QtMediaservices::MetaData key) const +QVariant QMediaObject::metaData(QtMediaServices::MetaData key) const { Q_D(const QMediaObject); @@ -318,7 +318,7 @@ QVariant QMediaObject::metaData(QtMediaservices::MetaData key) const /*! Sets a \a value for a meta-data \a key. */ -void QMediaObject::setMetaData(QtMediaservices::MetaData key, const QVariant &value) +void QMediaObject::setMetaData(QtMediaServices::MetaData key, const QVariant &value) { Q_D(QMediaObject); @@ -329,13 +329,13 @@ void QMediaObject::setMetaData(QtMediaservices::MetaData key, const QVariant &va /*! Returns a list of keys there is meta-data available for. */ -QList QMediaObject::availableMetaData() const +QList QMediaObject::availableMetaData() const { Q_D(const QMediaObject); return d->metaDataControl ? d->metaDataControl->availableMetaData() - : QList(); + : QList(); } /*! diff --git a/src/multimedia/mediaservices/base/qmediaobject.h b/src/multimedia/mediaservices/base/qmediaobject.h index 461e056..70b4f33 100644 --- a/src/multimedia/mediaservices/base/qmediaobject.h +++ b/src/multimedia/mediaservices/base/qmediaobject.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -45,7 +45,7 @@ #include #include -#include +#include QT_BEGIN_HEADER @@ -67,7 +67,7 @@ public: ~QMediaObject(); virtual bool isAvailable() const; - virtual QtMediaservices::AvailabilityError availabilityError() const; + virtual QtMediaServices::AvailabilityError availabilityError() const; virtual QMediaService* service() const; @@ -80,9 +80,9 @@ public: bool isMetaDataAvailable() const; bool isMetaDataWritable() const; - QVariant metaData(QtMediaservices::MetaData key) const; - void setMetaData(QtMediaservices::MetaData key, const QVariant &value); - QList availableMetaData() const; + QVariant metaData(QtMediaServices::MetaData key) const; + void setMetaData(QtMediaServices::MetaData key, const QVariant &value); + QList availableMetaData() const; QVariant extendedMetaData(const QString &key) const; void setExtendedMetaData(const QString &key, const QVariant &value); diff --git a/src/multimedia/mediaservices/base/qmediaobject_p.h b/src/multimedia/mediaservices/base/qmediaobject_p.h index 4589f03..c31ad46 100644 --- a/src/multimedia/mediaservices/base/qmediaobject_p.h +++ b/src/multimedia/mediaservices/base/qmediaobject_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -57,7 +57,7 @@ #include #include -#include +#include QT_BEGIN_HEADER diff --git a/src/multimedia/mediaservices/base/qmediaplaylist.cpp b/src/multimedia/mediaservices/base/qmediaplaylist.cpp index 174a8ac..93278fe 100644 --- a/src/multimedia/mediaservices/base/qmediaplaylist.cpp +++ b/src/multimedia/mediaservices/base/qmediaplaylist.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -45,14 +45,14 @@ #include #include -#include +#include #include "qmediaplaylist_p.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "qmediapluginloader_p.h" diff --git a/src/multimedia/mediaservices/base/qmediaplaylist.h b/src/multimedia/mediaservices/base/qmediaplaylist.h index 132b58c..9125fd6 100644 --- a/src/multimedia/mediaservices/base/qmediaplaylist.h +++ b/src/multimedia/mediaservices/base/qmediaplaylist.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -44,8 +44,8 @@ #include -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/multimedia/mediaservices/base/qmediaplaylist_p.h b/src/multimedia/mediaservices/base/qmediaplaylist_p.h index 57c2723..a5f290e 100644 --- a/src/multimedia/mediaservices/base/qmediaplaylist_p.h +++ b/src/multimedia/mediaservices/base/qmediaplaylist_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -53,11 +53,11 @@ // We mean it. // -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "qmediaobject_p.h" #include diff --git a/src/multimedia/mediaservices/base/qmediaplaylistcontrol.cpp b/src/multimedia/mediaservices/base/qmediaplaylistcontrol.cpp index 6f3b2fe..016c55d 100644 --- a/src/multimedia/mediaservices/base/qmediaplaylistcontrol.cpp +++ b/src/multimedia/mediaservices/base/qmediaplaylistcontrol.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -40,7 +40,7 @@ ****************************************************************************/ -#include +#include #include "qmediacontrol_p.h" diff --git a/src/multimedia/mediaservices/base/qmediaplaylistcontrol.h b/src/multimedia/mediaservices/base/qmediaplaylistcontrol.h index cf489e3..36f00ae 100644 --- a/src/multimedia/mediaservices/base/qmediaplaylistcontrol.h +++ b/src/multimedia/mediaservices/base/qmediaplaylistcontrol.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -43,8 +43,8 @@ #ifndef QMEDIAPLAYLISTCONTROL_H #define QMEDIAPLAYLISTCONTROL_H -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/multimedia/mediaservices/base/qmediaplaylistioplugin.cpp b/src/multimedia/mediaservices/base/qmediaplaylistioplugin.cpp index ba5dc81..60e80e5 100644 --- a/src/multimedia/mediaservices/base/qmediaplaylistioplugin.cpp +++ b/src/multimedia/mediaservices/base/qmediaplaylistioplugin.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/multimedia/mediaservices/base/qmediaplaylistioplugin.h b/src/multimedia/mediaservices/base/qmediaplaylistioplugin.h index 6bc0418..5fc10f7 100644 --- a/src/multimedia/mediaservices/base/qmediaplaylistioplugin.h +++ b/src/multimedia/mediaservices/base/qmediaplaylistioplugin.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -46,7 +46,7 @@ #include #include -#include +#include QT_BEGIN_HEADER diff --git a/src/multimedia/mediaservices/base/qmediaplaylistnavigator.cpp b/src/multimedia/mediaservices/base/qmediaplaylistnavigator.cpp index 134ae77..e3eec5e 100644 --- a/src/multimedia/mediaservices/base/qmediaplaylistnavigator.cpp +++ b/src/multimedia/mediaservices/base/qmediaplaylistnavigator.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include -#include -#include +#include +#include +#include #include "qmediaobject_p.h" #include diff --git a/src/multimedia/mediaservices/base/qmediaplaylistnavigator.h b/src/multimedia/mediaservices/base/qmediaplaylistnavigator.h index b6d3d96..6cb9d9c 100644 --- a/src/multimedia/mediaservices/base/qmediaplaylistnavigator.h +++ b/src/multimedia/mediaservices/base/qmediaplaylistnavigator.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -44,8 +44,8 @@ #include -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/multimedia/mediaservices/base/qmediaplaylistprovider.cpp b/src/multimedia/mediaservices/base/qmediaplaylistprovider.cpp index c546899..3cd766b 100644 --- a/src/multimedia/mediaservices/base/qmediaplaylistprovider.cpp +++ b/src/multimedia/mediaservices/base/qmediaplaylistprovider.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -41,7 +41,7 @@ #include -#include +#include #include "qmediaplaylistprovider_p.h" diff --git a/src/multimedia/mediaservices/base/qmediaplaylistprovider.h b/src/multimedia/mediaservices/base/qmediaplaylistprovider.h index 4929287..31e6d5f 100644 --- a/src/multimedia/mediaservices/base/qmediaplaylistprovider.h +++ b/src/multimedia/mediaservices/base/qmediaplaylistprovider.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -44,8 +44,8 @@ #include -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/multimedia/mediaservices/base/qmediaplaylistprovider_p.h b/src/multimedia/mediaservices/base/qmediaplaylistprovider_p.h index 03f72ac..00d1cca 100644 --- a/src/multimedia/mediaservices/base/qmediaplaylistprovider_p.h +++ b/src/multimedia/mediaservices/base/qmediaplaylistprovider_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -53,7 +53,7 @@ // We mean it. // -#include +#include QT_BEGIN_HEADER diff --git a/src/multimedia/mediaservices/base/qmediapluginloader.cpp b/src/multimedia/mediaservices/base/qmediapluginloader.cpp index a1975ab..d6da0ba 100644 --- a/src/multimedia/mediaservices/base/qmediapluginloader.cpp +++ b/src/multimedia/mediaservices/base/qmediapluginloader.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -45,7 +45,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/multimedia/mediaservices/base/qmediapluginloader_p.h b/src/multimedia/mediaservices/base/qmediapluginloader_p.h index 194f6ee..d911180 100644 --- a/src/multimedia/mediaservices/base/qmediapluginloader_p.h +++ b/src/multimedia/mediaservices/base/qmediapluginloader_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/multimedia/mediaservices/base/qmediaresource.cpp b/src/multimedia/mediaservices/base/qmediaresource.cpp index 9577092..33bd396 100644 --- a/src/multimedia/mediaservices/base/qmediaresource.cpp +++ b/src/multimedia/mediaservices/base/qmediaresource.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -43,7 +43,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/multimedia/mediaservices/base/qmediaresource.h b/src/multimedia/mediaservices/base/qmediaresource.h index 69078cc..5c381ba 100644 --- a/src/multimedia/mediaservices/base/qmediaresource.h +++ b/src/multimedia/mediaservices/base/qmediaresource.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/multimedia/mediaservices/base/qmediaservice.cpp b/src/multimedia/mediaservices/base/qmediaservice.cpp index 5d522dc..b343887 100644 --- a/src/multimedia/mediaservices/base/qmediaservice.cpp +++ b/src/multimedia/mediaservices/base/qmediaservice.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -41,7 +41,7 @@ #include -#include +#include #include "qmediaservice_p.h" diff --git a/src/multimedia/mediaservices/base/qmediaservice.h b/src/multimedia/mediaservices/base/qmediaservice.h index 060019b..3963348 100644 --- a/src/multimedia/mediaservices/base/qmediaservice.h +++ b/src/multimedia/mediaservices/base/qmediaservice.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -45,7 +45,7 @@ #include #include -#include +#include QT_BEGIN_HEADER diff --git a/src/multimedia/mediaservices/base/qmediaservice_p.h b/src/multimedia/mediaservices/base/qmediaservice_p.h index e60e669..bebae11 100644 --- a/src/multimedia/mediaservices/base/qmediaservice_p.h +++ b/src/multimedia/mediaservices/base/qmediaservice_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/multimedia/mediaservices/base/qmediaserviceprovider.cpp b/src/multimedia/mediaservices/base/qmediaserviceprovider.cpp index 48d245d..f27628b 100644 --- a/src/multimedia/mediaservices/base/qmediaserviceprovider.cpp +++ b/src/multimedia/mediaservices/base/qmediaserviceprovider.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -42,11 +42,11 @@ #include #include -#include -#include -#include +#include +#include +#include #include "qmediapluginloader_p.h" -#include +#include QT_BEGIN_NAMESPACE @@ -337,9 +337,9 @@ public: } break; case QMediaServiceProviderHint::ContentType: { - QtMediaservices::SupportEstimate estimate = QtMediaservices::NotSupported; + QtMediaServices::SupportEstimate estimate = QtMediaServices::NotSupported; foreach (QMediaServiceProviderPlugin *currentPlugin, plugins) { - QtMediaservices::SupportEstimate currentEstimate = QtMediaservices::MaybeSupported; + QtMediaServices::SupportEstimate currentEstimate = QtMediaServices::MaybeSupported; QMediaServiceSupportedFormatsInterface *iface = qobject_cast(currentPlugin); @@ -350,7 +350,7 @@ public: estimate = currentEstimate; plugin = currentPlugin; - if (currentEstimate == QtMediaservices::PreferredService) + if (currentEstimate == QtMediaServices::PreferredService) break; } } @@ -381,7 +381,7 @@ public: } } - QtMediaservices::SupportEstimate hasSupport(const QByteArray &serviceType, + QtMediaServices::SupportEstimate hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const @@ -390,10 +390,10 @@ public: QString::fromLatin1(serviceType.constData(),serviceType.length())); if (instances.isEmpty()) - return QtMediaservices::NotSupported; + return QtMediaServices::NotSupported; bool allServicesProvideInterface = true; - QtMediaservices::SupportEstimate supportEstimate = QtMediaservices::NotSupported; + QtMediaServices::SupportEstimate supportEstimate = QtMediaServices::NotSupported; foreach(QObject *obj, instances) { QMediaServiceSupportedFormatsInterface *iface = @@ -427,12 +427,12 @@ public: } //don't return PreferredService - supportEstimate = qMin(supportEstimate, QtMediaservices::ProbablySupported); + supportEstimate = qMin(supportEstimate, QtMediaServices::ProbablySupported); //Return NotSupported only if no services are available of serviceType //or all the services returned NotSupported, otherwise return at least MaybeSupported if (!allServicesProvideInterface) - supportEstimate = qMax(QtMediaservices::MaybeSupported, supportEstimate); + supportEstimate = qMax(QtMediaServices::MaybeSupported, supportEstimate); return supportEstimate; } @@ -540,13 +540,13 @@ Q_GLOBAL_STATIC(QPluginServiceProvider, pluginProvider); */ /*! - \fn QtMediaservices::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const + \fn QtMediaServices::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const Returns how confident a media service provider is that is can provide a \a serviceType service that is able to play media of a specific \a mimeType that is encoded using the listed \a codecs while adhearing to constraints identified in \a flags. */ -QtMediaservices::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, +QtMediaServices::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const @@ -556,7 +556,7 @@ QtMediaservices::SupportEstimate QMediaServiceProvider::hasSupport(const QByteAr Q_UNUSED(codecs); Q_UNUSED(flags); - return QtMediaservices::MaybeSupported; + return QtMediaServices::MaybeSupported; } /*! diff --git a/src/multimedia/mediaservices/base/qmediaserviceprovider.h b/src/multimedia/mediaservices/base/qmediaserviceprovider.h index 45021c7..24d2078 100644 --- a/src/multimedia/mediaservices/base/qmediaserviceprovider.h +++ b/src/multimedia/mediaservices/base/qmediaserviceprovider.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -45,7 +45,7 @@ #include #include -#include +#include QT_BEGIN_HEADER @@ -106,7 +106,7 @@ public: virtual QMediaService* requestService(const QByteArray &type, const QMediaServiceProviderHint &hint = QMediaServiceProviderHint()) = 0; virtual void releaseService(QMediaService *service) = 0; - virtual QtMediaservices::SupportEstimate hasSupport(const QByteArray &serviceType, + virtual QtMediaServices::SupportEstimate hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags = 0) const; diff --git a/src/multimedia/mediaservices/base/qmediaserviceproviderplugin.h b/src/multimedia/mediaservices/base/qmediaserviceproviderplugin.h index bc41845..ab55f84 100644 --- a/src/multimedia/mediaservices/base/qmediaserviceproviderplugin.h +++ b/src/multimedia/mediaservices/base/qmediaserviceproviderplugin.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -46,7 +46,7 @@ #include #include -#include +#include #ifdef Q_MOC_RUN # pragma Q_MOC_EXPAND_MACROS @@ -76,7 +76,7 @@ Q_DECLARE_INTERFACE(QMediaServiceProviderFactoryInterface, QMediaServiceProvider struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedFormatsInterface { virtual ~QMediaServiceSupportedFormatsInterface() {} - virtual QtMediaservices::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const = 0; + virtual QtMediaServices::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const = 0; virtual QStringList supportedMimeTypes() const = 0; }; diff --git a/src/multimedia/mediaservices/base/qmediatimerange.cpp b/src/multimedia/mediaservices/base/qmediatimerange.cpp index 74f54dd..2dba20c 100644 --- a/src/multimedia/mediaservices/base/qmediatimerange.cpp +++ b/src/multimedia/mediaservices/base/qmediatimerange.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/multimedia/mediaservices/base/qmediatimerange.h b/src/multimedia/mediaservices/base/qmediatimerange.h index 94beaad..33b2f27 100644 --- a/src/multimedia/mediaservices/base/qmediatimerange.h +++ b/src/multimedia/mediaservices/base/qmediatimerange.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -43,7 +43,7 @@ #define QMEDIATIMERANGE_H #include -#include +#include QT_BEGIN_HEADER diff --git a/src/multimedia/mediaservices/base/qmetadatacontrol.cpp b/src/multimedia/mediaservices/base/qmetadatacontrol.cpp index 32be987..8bfec7e 100644 --- a/src/multimedia/mediaservices/base/qmetadatacontrol.cpp +++ b/src/multimedia/mediaservices/base/qmetadatacontrol.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include #include "qmediacontrol_p.h" @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE its current media it will implement QMetaDataControl. This control provides functions for both retrieving and setting meta-data values. Meta-data may be addressed by the well defined keys in the - QtMediaservices::MetaData enumeration using the metaData() functions, or by + QtMediaServices::MetaData enumeration using the metaData() functions, or by string keys using the extendedMetaData() functions. The functionality provided by this control is exposed to application @@ -117,13 +117,13 @@ QMetaDataControl::~QMetaDataControl() */ /*! - \fn QVariant QMetaDataControl::metaData(QtMediaservices::MetaData key) const + \fn QVariant QMetaDataControl::metaData(QtMediaServices::MetaData key) const Returns the meta-data for the given \a key. */ /*! - \fn void QMetaDataControl::setMetaData(QtMediaservices::MetaData key, const QVariant &value) + \fn void QMetaDataControl::setMetaData(QtMediaServices::MetaData key, const QVariant &value) Sets the \a value of the meta-data element with the given \a key. */ diff --git a/src/multimedia/mediaservices/base/qmetadatacontrol.h b/src/multimedia/mediaservices/base/qmetadatacontrol.h index cf4a0d3..e91c88b 100644 --- a/src/multimedia/mediaservices/base/qmetadatacontrol.h +++ b/src/multimedia/mediaservices/base/qmetadatacontrol.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -42,9 +42,9 @@ #ifndef QMETADATACONTROL_H #define QMETADATACONTROL_H -#include -#include -#include +#include +#include +#include QT_BEGIN_HEADER @@ -63,9 +63,9 @@ public: virtual bool isWritable() const = 0; virtual bool isMetaDataAvailable() const = 0; - virtual QVariant metaData(QtMediaservices::MetaData key) const = 0; - virtual void setMetaData(QtMediaservices::MetaData key, const QVariant &value) = 0; - virtual QList availableMetaData() const = 0; + virtual QVariant metaData(QtMediaServices::MetaData key) const = 0; + virtual void setMetaData(QtMediaServices::MetaData key, const QVariant &value) = 0; + virtual QList availableMetaData() const = 0; virtual QVariant extendedMetaData(const QString &key) const = 0; virtual void setExtendedMetaData(const QString &key, const QVariant &value) = 0; diff --git a/src/multimedia/mediaservices/base/qpaintervideosurface.cpp b/src/multimedia/mediaservices/base/qpaintervideosurface.cpp index b3e0dd5..302e772 100644 --- a/src/multimedia/mediaservices/base/qpaintervideosurface.cpp +++ b/src/multimedia/mediaservices/base/qpaintervideosurface.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/multimedia/mediaservices/base/qpaintervideosurface_mac_p.h b/src/multimedia/mediaservices/base/qpaintervideosurface_mac_p.h index 13c22c2..4f8a7a6 100644 --- a/src/multimedia/mediaservices/base/qpaintervideosurface_mac_p.h +++ b/src/multimedia/mediaservices/base/qpaintervideosurface_mac_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/multimedia/mediaservices/base/qpaintervideosurface_p.h b/src/multimedia/mediaservices/base/qpaintervideosurface_p.h index de9c24a..20628c4 100644 --- a/src/multimedia/mediaservices/base/qpaintervideosurface_p.h +++ b/src/multimedia/mediaservices/base/qpaintervideosurface_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/multimedia/mediaservices/base/qtmedianamespace.h b/src/multimedia/mediaservices/base/qtmedianamespace.h index 7db7aa8..917c646 100644 --- a/src/multimedia/mediaservices/base/qtmedianamespace.h +++ b/src/multimedia/mediaservices/base/qtmedianamespace.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) -namespace QtMediaservices +namespace QtMediaServices { enum MetaData { diff --git a/src/multimedia/mediaservices/base/qvideodevicecontrol.cpp b/src/multimedia/mediaservices/base/qvideodevicecontrol.cpp index 128cee9..30c56cf 100644 --- a/src/multimedia/mediaservices/base/qvideodevicecontrol.cpp +++ b/src/multimedia/mediaservices/base/qvideodevicecontrol.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include QT_BEGIN_HEADER diff --git a/src/multimedia/mediaservices/base/qvideodevicecontrol.h b/src/multimedia/mediaservices/base/qvideodevicecontrol.h index df1d4fa..b86a35c 100644 --- a/src/multimedia/mediaservices/base/qvideodevicecontrol.h +++ b/src/multimedia/mediaservices/base/qvideodevicecontrol.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -42,7 +42,7 @@ #ifndef QVIDEODEVICECONTROL_H #define QVIDEODEVICECONTROL_H -#include +#include QT_BEGIN_HEADER diff --git a/src/multimedia/mediaservices/base/qvideooutputcontrol.cpp b/src/multimedia/mediaservices/base/qvideooutputcontrol.cpp index 7d7ed4b..532c892 100644 --- a/src/multimedia/mediaservices/base/qvideooutputcontrol.cpp +++ b/src/multimedia/mediaservices/base/qvideooutputcontrol.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/multimedia/mediaservices/base/qvideooutputcontrol.h b/src/multimedia/mediaservices/base/qvideooutputcontrol.h index 05bc164..ad69911 100644 --- a/src/multimedia/mediaservices/base/qvideooutputcontrol.h +++ b/src/multimedia/mediaservices/base/qvideooutputcontrol.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -42,7 +42,7 @@ #ifndef QVIDEOOUTPUTCONTROL_H #define QVIDEOOUTPUTCONTROL_H -#include +#include QT_BEGIN_HEADER diff --git a/src/multimedia/mediaservices/base/qvideorenderercontrol.cpp b/src/multimedia/mediaservices/base/qvideorenderercontrol.cpp index bd7c78d..6cc3138 100644 --- a/src/multimedia/mediaservices/base/qvideorenderercontrol.cpp +++ b/src/multimedia/mediaservices/base/qvideorenderercontrol.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include #include "qmediacontrol_p.h" diff --git a/src/multimedia/mediaservices/base/qvideorenderercontrol.h b/src/multimedia/mediaservices/base/qvideorenderercontrol.h index fd130ac..29a66ea 100644 --- a/src/multimedia/mediaservices/base/qvideorenderercontrol.h +++ b/src/multimedia/mediaservices/base/qvideorenderercontrol.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -42,7 +42,7 @@ #ifndef QVIDEORENDERERCONTROL_H #define QVIDEORENDERERCONTROL_H -#include +#include QT_BEGIN_HEADER diff --git a/src/multimedia/mediaservices/base/qvideowidget.cpp b/src/multimedia/mediaservices/base/qvideowidget.cpp index 52291b0..d39b1f4 100644 --- a/src/multimedia/mediaservices/base/qvideowidget.cpp +++ b/src/multimedia/mediaservices/base/qvideowidget.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -41,14 +41,14 @@ #include "qvideowidget_p.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "qpaintervideosurface_p.h" -#include +#include #include #include diff --git a/src/multimedia/mediaservices/base/qvideowidget.h b/src/multimedia/mediaservices/base/qvideowidget.h index 080e19c..8033d40 100644 --- a/src/multimedia/mediaservices/base/qvideowidget.h +++ b/src/multimedia/mediaservices/base/qvideowidget.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/multimedia/mediaservices/base/qvideowidget_p.h b/src/multimedia/mediaservices/base/qvideowidget_p.h index 4f67117..bb44dfa 100644 --- a/src/multimedia/mediaservices/base/qvideowidget_p.h +++ b/src/multimedia/mediaservices/base/qvideowidget_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -53,7 +53,7 @@ // We mean it. // -#include +#include #ifndef QT_NO_OPENGL #include diff --git a/src/multimedia/mediaservices/base/qvideowidgetcontrol.cpp b/src/multimedia/mediaservices/base/qvideowidgetcontrol.cpp index 1cc7eaf..538f158 100644 --- a/src/multimedia/mediaservices/base/qvideowidgetcontrol.cpp +++ b/src/multimedia/mediaservices/base/qvideowidgetcontrol.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include #include "qmediacontrol_p.h" diff --git a/src/multimedia/mediaservices/base/qvideowidgetcontrol.h b/src/multimedia/mediaservices/base/qvideowidgetcontrol.h index a8105ac..1fe43cc 100644 --- a/src/multimedia/mediaservices/base/qvideowidgetcontrol.h +++ b/src/multimedia/mediaservices/base/qvideowidgetcontrol.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -44,8 +44,8 @@ #include -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/multimedia/mediaservices/base/qvideowindowcontrol.cpp b/src/multimedia/mediaservices/base/qvideowindowcontrol.cpp index f73b187..967a2d6 100644 --- a/src/multimedia/mediaservices/base/qvideowindowcontrol.cpp +++ b/src/multimedia/mediaservices/base/qvideowindowcontrol.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/multimedia/mediaservices/base/qvideowindowcontrol.h b/src/multimedia/mediaservices/base/qvideowindowcontrol.h index 0fabce9..74c1786 100644 --- a/src/multimedia/mediaservices/base/qvideowindowcontrol.h +++ b/src/multimedia/mediaservices/base/qvideowindowcontrol.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -44,8 +44,8 @@ #include -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/multimedia/mediaservices/effects/qsoundeffect_p.h b/src/multimedia/mediaservices/effects/qsoundeffect_p.h index 8c8985a..419e4f8 100644 --- a/src/multimedia/mediaservices/effects/qsoundeffect_p.h +++ b/src/multimedia/mediaservices/effects/qsoundeffect_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.cpp b/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.cpp index 3e3dd91..c856157 100644 --- a/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.cpp +++ b/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.h b/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.h index ef6bff1..1327bf5 100644 --- a/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.h +++ b/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -58,7 +58,7 @@ #include #include -#include +#include #include diff --git a/src/multimedia/mediaservices/effects/qsoundeffect_qmedia_p.cpp b/src/multimedia/mediaservices/effects/qsoundeffect_qmedia_p.cpp index 8cc2675..5e40bed 100644 --- a/src/multimedia/mediaservices/effects/qsoundeffect_qmedia_p.cpp +++ b/src/multimedia/mediaservices/effects/qsoundeffect_qmedia_p.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -54,8 +54,8 @@ #include -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/multimedia/mediaservices/effects/qsoundeffect_qmedia_p.h b/src/multimedia/mediaservices/effects/qsoundeffect_qmedia_p.h index 5abdcad..82ea000 100644 --- a/src/multimedia/mediaservices/effects/qsoundeffect_qmedia_p.h +++ b/src/multimedia/mediaservices/effects/qsoundeffect_qmedia_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -56,7 +56,7 @@ #include #include -#include +#include QT_BEGIN_HEADER diff --git a/src/multimedia/mediaservices/effects/qsoundeffect_qsound_p.cpp b/src/multimedia/mediaservices/effects/qsoundeffect_qsound_p.cpp index 7746f0c..9247aba 100644 --- a/src/multimedia/mediaservices/effects/qsoundeffect_qsound_p.cpp +++ b/src/multimedia/mediaservices/effects/qsoundeffect_qsound_p.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/multimedia/mediaservices/effects/qsoundeffect_qsound_p.h b/src/multimedia/mediaservices/effects/qsoundeffect_qsound_p.h index 133e6ec..dad7b6f 100644 --- a/src/multimedia/mediaservices/effects/qsoundeffect_qsound_p.h +++ b/src/multimedia/mediaservices/effects/qsoundeffect_qsound_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/multimedia/mediaservices/effects/wavedecoder_p.cpp b/src/multimedia/mediaservices/effects/wavedecoder_p.cpp index 2208461..1c26c8f 100644 --- a/src/multimedia/mediaservices/effects/wavedecoder_p.cpp +++ b/src/multimedia/mediaservices/effects/wavedecoder_p.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/multimedia/mediaservices/effects/wavedecoder_p.h b/src/multimedia/mediaservices/effects/wavedecoder_p.h index bb22907..dcc5453 100644 --- a/src/multimedia/mediaservices/effects/wavedecoder_p.h +++ b/src/multimedia/mediaservices/effects/wavedecoder_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/multimedia/mediaservices/mediaservices.pro b/src/multimedia/mediaservices/mediaservices.pro index 908f60a..ef552e3 100644 --- a/src/multimedia/mediaservices/mediaservices.pro +++ b/src/multimedia/mediaservices/mediaservices.pro @@ -1,4 +1,4 @@ -TARGET = QtMediaservices +TARGET = QtMediaServices QPRO_PWD = $$PWD QT = core gui multimedia diff --git a/src/multimedia/mediaservices/playback/qmediaplayer.cpp b/src/multimedia/mediaservices/playback/qmediaplayer.cpp index b15464f..e91a64c 100644 --- a/src/multimedia/mediaservices/playback/qmediaplayer.cpp +++ b/src/multimedia/mediaservices/playback/qmediaplayer.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -45,16 +45,16 @@ #include #include -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include //#define DEBUG_PLAYER_STATE @@ -682,7 +682,7 @@ void QMediaPlayer::unbind(QObject *obj) The \a flags argument allows additional requirements such as performance indicators to be specified. */ -QtMediaservices::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType, +QtMediaServices::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType, const QStringList& codecs, Flags flags) { diff --git a/src/multimedia/mediaservices/playback/qmediaplayer.h b/src/multimedia/mediaservices/playback/qmediaplayer.h index 2b4c443..be66a63 100644 --- a/src/multimedia/mediaservices/playback/qmediaplayer.h +++ b/src/multimedia/mediaservices/playback/qmediaplayer.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -42,9 +42,9 @@ #ifndef QMEDIAPLAYER_H #define QMEDIAPLAYER_H -#include -#include -#include +#include +#include +#include QT_BEGIN_HEADER @@ -117,7 +117,7 @@ public: QMediaPlayer(QObject *parent = 0, Flags flags = 0, QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider()); ~QMediaPlayer(); - static QtMediaservices::SupportEstimate hasSupport(const QString &mimeType, + static QtMediaServices::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs = QStringList(), Flags flags = 0); static QStringList supportedMimeTypes(Flags flags = 0); diff --git a/src/multimedia/mediaservices/playback/qmediaplayercontrol.cpp b/src/multimedia/mediaservices/playback/qmediaplayercontrol.cpp index 3b63d93..ca58ce4 100644 --- a/src/multimedia/mediaservices/playback/qmediaplayercontrol.cpp +++ b/src/multimedia/mediaservices/playback/qmediaplayercontrol.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include -#include -#include +#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/multimedia/mediaservices/playback/qmediaplayercontrol.h b/src/multimedia/mediaservices/playback/qmediaplayercontrol.h index be10713..25bc2f5 100644 --- a/src/multimedia/mediaservices/playback/qmediaplayercontrol.h +++ b/src/multimedia/mediaservices/playback/qmediaplayercontrol.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMediaservices module of the Qt Toolkit. +** This file is part of the QtMediaServices module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -44,9 +44,9 @@ #include -#include -#include -#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowaudioendpointcontrol.h b/src/plugins/mediaservices/directshow/mediaplayer/directshowaudioendpointcontrol.h index d7e3499..5dd36c3 100644 --- a/src/plugins/mediaservices/directshow/mediaplayer/directshowaudioendpointcontrol.h +++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowaudioendpointcontrol.h @@ -42,7 +42,7 @@ #ifndef DIRECTSHOWAUDIOENDPOINTCONTROL_H #define DIRECTSHOWAUDIOENDPOINTCONTROL_H -#include +#include #include diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp b/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp index 53b8787..7f67a82 100644 --- a/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp +++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp @@ -57,76 +57,76 @@ namespace { struct QWMMetaDataKeyLookup { - QtMediaservices::MetaData key; + QtMediaServices::MetaData key; const wchar_t *token; }; } static const QWMMetaDataKeyLookup qt_wmMetaDataKeys[] = { - { QtMediaservices::Title, L"Title" }, - { QtMediaservices::SubTitle, L"WM/SubTitle" }, - { QtMediaservices::Author, L"Author" }, - { QtMediaservices::Comment, L"Comment" }, - { QtMediaservices::Description, L"Description" }, - { QtMediaservices::Category, L"WM/Category" }, - { QtMediaservices::Genre, L"WM/Genre" }, - //{ QtMediaservices::Date, 0 }, - { QtMediaservices::Year, L"WM/Year" }, - { QtMediaservices::UserRating, L"UserRating" }, - //{ QtMediaservices::MetaDatawords, 0 }, - { QtMediaservices::Language, L"Language" }, - { QtMediaservices::Publisher, L"WM/Publisher" }, - { QtMediaservices::Copyright, L"Copyright" }, - { QtMediaservices::ParentalRating, L"ParentalRating" }, - { QtMediaservices::RatingOrganisation, L"RatingOrganisation" }, + { QtMediaServices::Title, L"Title" }, + { QtMediaServices::SubTitle, L"WM/SubTitle" }, + { QtMediaServices::Author, L"Author" }, + { QtMediaServices::Comment, L"Comment" }, + { QtMediaServices::Description, L"Description" }, + { QtMediaServices::Category, L"WM/Category" }, + { QtMediaServices::Genre, L"WM/Genre" }, + //{ QtMediaServices::Date, 0 }, + { QtMediaServices::Year, L"WM/Year" }, + { QtMediaServices::UserRating, L"UserRating" }, + //{ QtMediaServices::MetaDatawords, 0 }, + { QtMediaServices::Language, L"Language" }, + { QtMediaServices::Publisher, L"WM/Publisher" }, + { QtMediaServices::Copyright, L"Copyright" }, + { QtMediaServices::ParentalRating, L"ParentalRating" }, + { QtMediaServices::RatingOrganisation, L"RatingOrganisation" }, // Media - { QtMediaservices::Size, L"FileSize" }, - { QtMediaservices::MediaType, L"MediaType" }, - { QtMediaservices::Duration, L"Duration" }, + { QtMediaServices::Size, L"FileSize" }, + { QtMediaServices::MediaType, L"MediaType" }, + { QtMediaServices::Duration, L"Duration" }, // Audio - { QtMediaservices::AudioBitRate, L"AudioBitRate" }, - { QtMediaservices::AudioCodec, L"AudioCodec" }, - { QtMediaservices::ChannelCount, L"ChannelCount" }, - { QtMediaservices::SampleRate, L"Frequency" }, + { QtMediaServices::AudioBitRate, L"AudioBitRate" }, + { QtMediaServices::AudioCodec, L"AudioCodec" }, + { QtMediaServices::ChannelCount, L"ChannelCount" }, + { QtMediaServices::SampleRate, L"Frequency" }, // Music - { QtMediaservices::AlbumTitle, L"WM/AlbumTitle" }, - { QtMediaservices::AlbumArtist, L"WM/AlbumArtist" }, - { QtMediaservices::ContributingArtist, L"Author" }, - { QtMediaservices::Composer, L"WM/Composer" }, - { QtMediaservices::Conductor, L"WM/Conductor" }, - { QtMediaservices::Lyrics, L"WM/Lyrics" }, - { QtMediaservices::Mood, L"WM/Mood" }, - { QtMediaservices::TrackNumber, L"WM/TrackNumber" }, - //{ QtMediaservices::TrackCount, 0 }, - //{ QtMediaservices::CoverArtUriSmall, 0 }, - //{ QtMediaservices::CoverArtUriLarge, 0 }, + { QtMediaServices::AlbumTitle, L"WM/AlbumTitle" }, + { QtMediaServices::AlbumArtist, L"WM/AlbumArtist" }, + { QtMediaServices::ContributingArtist, L"Author" }, + { QtMediaServices::Composer, L"WM/Composer" }, + { QtMediaServices::Conductor, L"WM/Conductor" }, + { QtMediaServices::Lyrics, L"WM/Lyrics" }, + { QtMediaServices::Mood, L"WM/Mood" }, + { QtMediaServices::TrackNumber, L"WM/TrackNumber" }, + //{ QtMediaServices::TrackCount, 0 }, + //{ QtMediaServices::CoverArtUriSmall, 0 }, + //{ QtMediaServices::CoverArtUriLarge, 0 }, // Image/Video - //{ QtMediaservices::Resolution, 0 }, - //{ QtMediaservices::PixelAspectRatio, 0 }, + //{ QtMediaServices::Resolution, 0 }, + //{ QtMediaServices::PixelAspectRatio, 0 }, // Video - //{ QtMediaservices::FrameRate, 0 }, - { QtMediaservices::VideoBitRate, L"VideoBitRate" }, - { QtMediaservices::VideoCodec, L"VideoCodec" }, + //{ QtMediaServices::FrameRate, 0 }, + { QtMediaServices::VideoBitRate, L"VideoBitRate" }, + { QtMediaServices::VideoCodec, L"VideoCodec" }, - //{ QtMediaservices::PosterUri, 0 }, + //{ QtMediaServices::PosterUri, 0 }, // Movie - { QtMediaservices::ChapterNumber, L"ChapterNumber" }, - { QtMediaservices::Director, L"WM/Director" }, - { QtMediaservices::LeadPerformer, L"LeadPerformer" }, - { QtMediaservices::Writer, L"WM/Writer" }, + { QtMediaServices::ChapterNumber, L"ChapterNumber" }, + { QtMediaServices::Director, L"WM/Director" }, + { QtMediaServices::LeadPerformer, L"LeadPerformer" }, + { QtMediaServices::Writer, L"WM/Writer" }, // Photos - { QtMediaservices::CameraManufacturer, L"CameraManufacturer" }, - { QtMediaservices::CameraModel, L"CameraModel" }, - { QtMediaservices::Event, L"Event" }, - { QtMediaservices::Subject, L"Subject" } + { QtMediaServices::CameraManufacturer, L"CameraManufacturer" }, + { QtMediaServices::CameraModel, L"CameraModel" }, + { QtMediaServices::Event, L"Event" }, + { QtMediaServices::Subject, L"Subject" } }; static QVariant getValue(IWMHeaderInfo *header, const wchar_t *key) @@ -257,7 +257,7 @@ bool DirectShowMetaDataControl::isMetaDataAvailable() const #endif } -QVariant DirectShowMetaDataControl::metaData(QtMediaservices::MetaData key) const +QVariant DirectShowMetaDataControl::metaData(QtMediaServices::MetaData key) const { QVariant value; @@ -277,19 +277,19 @@ QVariant DirectShowMetaDataControl::metaData(QtMediaservices::MetaData key) cons BSTR string = 0; switch (key) { - case QtMediaservices::Author: + case QtMediaServices::Author: m_content->get_AuthorName(&string); break; - case QtMediaservices::Title: + case QtMediaServices::Title: m_content->get_Title(&string); break; - case QtMediaservices::ParentalRating: + case QtMediaServices::ParentalRating: m_content->get_Rating(&string); break; - case QtMediaservices::Description: + case QtMediaServices::Description: m_content->get_Description(&string); break; - case QtMediaservices::Copyright: + case QtMediaServices::Copyright: m_content->get_Copyright(&string); break; default: @@ -305,13 +305,13 @@ QVariant DirectShowMetaDataControl::metaData(QtMediaservices::MetaData key) cons return value; } -void DirectShowMetaDataControl::setMetaData(QtMediaservices::MetaData, const QVariant &) +void DirectShowMetaDataControl::setMetaData(QtMediaServices::MetaData, const QVariant &) { } -QList DirectShowMetaDataControl::availableMetaData() const +QList DirectShowMetaDataControl::availableMetaData() const { - return QList(); + return QList(); } QVariant DirectShowMetaDataControl::extendedMetaData(const QString &) const diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.h b/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.h index c67c6eb..e368f00 100644 --- a/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.h +++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.h @@ -44,7 +44,7 @@ #include "directshowglobal.h" -#include +#include #include @@ -72,9 +72,9 @@ public: bool isWritable() const; bool isMetaDataAvailable() const; - QVariant metaData(QtMediaservices::MetaData key) const; - void setMetaData(QtMediaservices::MetaData key, const QVariant &value); - QList availableMetaData() const; + QVariant metaData(QtMediaServices::MetaData key) const; + void setMetaData(QtMediaServices::MetaData key, const QVariant &value); + QList availableMetaData() const; QVariant extendedMetaData(const QString &key) const; void setExtendedMetaData(const QString &key, const QVariant &value); diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowpinenum.cpp b/src/plugins/mediaservices/directshow/mediaplayer/directshowpinenum.cpp index 4dd9b0e..02b1a3b 100644 --- a/src/plugins/mediaservices/directshow/mediaplayer/directshowpinenum.cpp +++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowpinenum.cpp @@ -41,7 +41,7 @@ #include "directshowpinenum.h" -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowplayercontrol.h b/src/plugins/mediaservices/directshow/mediaplayer/directshowplayercontrol.h index b22a45b..6b5203e 100644 --- a/src/plugins/mediaservices/directshow/mediaplayer/directshowplayercontrol.h +++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowplayercontrol.h @@ -42,8 +42,8 @@ #ifndef DIRECTSHOWPLAYERCONTROL_H #define DIRECTSHOWPLAYERCONTROL_H -#include -#include +#include +#include #include diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowplayerservice.cpp b/src/plugins/mediaservices/directshow/mediaplayer/directshowplayerservice.cpp index 93ae3ad..8ad8cff 100644 --- a/src/plugins/mediaservices/directshow/mediaplayer/directshowplayerservice.cpp +++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowplayerservice.cpp @@ -49,7 +49,7 @@ #include "directshowvideorenderercontrol.h" #include "vmr9videowindowcontrol.h" -#include +#include #include #include diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowplayerservice.h b/src/plugins/mediaservices/directshow/mediaplayer/directshowplayerservice.h index 1a90b7e..a3f94e1 100644 --- a/src/plugins/mediaservices/directshow/mediaplayer/directshowplayerservice.h +++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowplayerservice.h @@ -42,10 +42,10 @@ #ifndef DIRECTSHOWPLAYERSERVICE_H #define DIRECTSHOWPLAYERSERVICE_H -#include -#include -#include -#include +#include +#include +#include +#include #include "directshoweventloop.h" #include "directshowglobal.h" diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowvideooutputcontrol.h b/src/plugins/mediaservices/directshow/mediaplayer/directshowvideooutputcontrol.h index c4e9bed..9b857ce 100644 --- a/src/plugins/mediaservices/directshow/mediaplayer/directshowvideooutputcontrol.h +++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowvideooutputcontrol.h @@ -42,7 +42,7 @@ #ifndef DIRECTSHOWVIDEOUTPUTCONTROL_H #define DIRECTSHOWVIDEOOUPUTCONTROL_H -#include +#include QT_BEGIN_HEADER diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowvideorenderercontrol.h b/src/plugins/mediaservices/directshow/mediaplayer/directshowvideorenderercontrol.h index c341487..adaa0f8 100644 --- a/src/plugins/mediaservices/directshow/mediaplayer/directshowvideorenderercontrol.h +++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowvideorenderercontrol.h @@ -42,7 +42,7 @@ #ifndef DIRECTSHOWVIDEORENDERERCONTROL_H #define DIRECTSHOWVIDEORENDERERCONTROL_H -#include +#include #include diff --git a/src/plugins/mediaservices/directshow/mediaplayer/mediasamplevideobuffer.h b/src/plugins/mediaservices/directshow/mediaplayer/mediasamplevideobuffer.h index 5820225..1b3776d 100644 --- a/src/plugins/mediaservices/directshow/mediaplayer/mediasamplevideobuffer.h +++ b/src/plugins/mediaservices/directshow/mediaplayer/mediasamplevideobuffer.h @@ -42,7 +42,7 @@ #ifndef MEDIASAMPLEVIDEOBUFFER_H #define MEDIASAMPLEVIDEOBUFFER_H -#include +#include #include diff --git a/src/plugins/mediaservices/directshow/mediaplayer/vmr9videowindowcontrol.h b/src/plugins/mediaservices/directshow/mediaplayer/vmr9videowindowcontrol.h index 9906fae..702dfd6 100644 --- a/src/plugins/mediaservices/directshow/mediaplayer/vmr9videowindowcontrol.h +++ b/src/plugins/mediaservices/directshow/mediaplayer/vmr9videowindowcontrol.h @@ -42,7 +42,7 @@ #ifndef VMR9VIDEOWINDOWCONTROL_H #define VMR9VIDEOWINDOWCONTROL_H -#include +#include #include #include diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp index 51d68f9..f51d024 100644 --- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp +++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp @@ -49,77 +49,77 @@ QT_BEGIN_NAMESPACE struct QGstreamerMetaDataKeyLookup { - QtMediaservices::MetaData key; + QtMediaServices::MetaData key; const char *token; }; static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] = { - { QtMediaservices::Title, GST_TAG_TITLE }, - //{ QtMediaservices::SubTitle, 0 }, - //{ QtMediaservices::Author, 0 }, - { QtMediaservices::Comment, GST_TAG_COMMENT }, - { QtMediaservices::Description, GST_TAG_DESCRIPTION }, - //{ QtMediaservices::Category, 0 }, - { QtMediaservices::Genre, GST_TAG_GENRE }, - { QtMediaservices::Year, "year" }, - //{ QtMediaservices::UserRating, 0 }, - - { QtMediaservices::Language, GST_TAG_LANGUAGE_CODE }, - - { QtMediaservices::Publisher, GST_TAG_ORGANIZATION }, - { QtMediaservices::Copyright, GST_TAG_COPYRIGHT }, - //{ QtMediaservices::ParentalRating, 0 }, - //{ QtMediaservices::RatingOrganisation, 0 }, + { QtMediaServices::Title, GST_TAG_TITLE }, + //{ QtMediaServices::SubTitle, 0 }, + //{ QtMediaServices::Author, 0 }, + { QtMediaServices::Comment, GST_TAG_COMMENT }, + { QtMediaServices::Description, GST_TAG_DESCRIPTION }, + //{ QtMediaServices::Category, 0 }, + { QtMediaServices::Genre, GST_TAG_GENRE }, + { QtMediaServices::Year, "year" }, + //{ QtMediaServices::UserRating, 0 }, + + { QtMediaServices::Language, GST_TAG_LANGUAGE_CODE }, + + { QtMediaServices::Publisher, GST_TAG_ORGANIZATION }, + { QtMediaServices::Copyright, GST_TAG_COPYRIGHT }, + //{ QtMediaServices::ParentalRating, 0 }, + //{ QtMediaServices::RatingOrganisation, 0 }, // Media - //{ QtMediaservices::Size, 0 }, - //{ QtMediaservices::MediaType, 0 }, - { QtMediaservices::Duration, GST_TAG_DURATION }, + //{ QtMediaServices::Size, 0 }, + //{ QtMediaServices::MediaType, 0 }, + { QtMediaServices::Duration, GST_TAG_DURATION }, // Audio - { QtMediaservices::AudioBitRate, GST_TAG_BITRATE }, - { QtMediaservices::AudioCodec, GST_TAG_AUDIO_CODEC }, - //{ QtMediaservices::ChannelCount, 0 }, - //{ QtMediaservices::Frequency, 0 }, + { QtMediaServices::AudioBitRate, GST_TAG_BITRATE }, + { QtMediaServices::AudioCodec, GST_TAG_AUDIO_CODEC }, + //{ QtMediaServices::ChannelCount, 0 }, + //{ QtMediaServices::Frequency, 0 }, // Music - { QtMediaservices::AlbumTitle, GST_TAG_ALBUM }, - { QtMediaservices::AlbumArtist, GST_TAG_ARTIST}, - { QtMediaservices::ContributingArtist, GST_TAG_PERFORMER }, + { QtMediaServices::AlbumTitle, GST_TAG_ALBUM }, + { QtMediaServices::AlbumArtist, GST_TAG_ARTIST}, + { QtMediaServices::ContributingArtist, GST_TAG_PERFORMER }, #if (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19) - { QtMediaservices::Composer, GST_TAG_COMPOSER }, + { QtMediaServices::Composer, GST_TAG_COMPOSER }, #endif - //{ QtMediaservices::Conductor, 0 }, - //{ QtMediaservices::Lyrics, 0 }, - //{ QtMediaservices::Mood, 0 }, - { QtMediaservices::TrackNumber, GST_TAG_TRACK_NUMBER }, + //{ QtMediaServices::Conductor, 0 }, + //{ QtMediaServices::Lyrics, 0 }, + //{ QtMediaServices::Mood, 0 }, + { QtMediaServices::TrackNumber, GST_TAG_TRACK_NUMBER }, - //{ QtMediaservices::CoverArtUrlSmall, 0 }, - //{ QtMediaservices::CoverArtUrlLarge, 0 }, + //{ QtMediaServices::CoverArtUrlSmall, 0 }, + //{ QtMediaServices::CoverArtUrlLarge, 0 }, // Image/Video - //{ QtMediaservices::Resolution, 0 }, - //{ QtMediaservices::PixelAspectRatio, 0 }, + //{ QtMediaServices::Resolution, 0 }, + //{ QtMediaServices::PixelAspectRatio, 0 }, // Video - //{ QtMediaservices::VideoFrameRate, 0 }, - //{ QtMediaservices::VideoBitRate, 0 }, - { QtMediaservices::VideoCodec, GST_TAG_VIDEO_CODEC }, + //{ QtMediaServices::VideoFrameRate, 0 }, + //{ QtMediaServices::VideoBitRate, 0 }, + { QtMediaServices::VideoCodec, GST_TAG_VIDEO_CODEC }, - //{ QtMediaservices::PosterUrl, 0 }, + //{ QtMediaServices::PosterUrl, 0 }, // Movie - //{ QtMediaservices::ChapterNumber, 0 }, - //{ QtMediaservices::Director, 0 }, - { QtMediaservices::LeadPerformer, GST_TAG_PERFORMER }, - //{ QtMediaservices::Writer, 0 }, + //{ QtMediaServices::ChapterNumber, 0 }, + //{ QtMediaServices::Director, 0 }, + { QtMediaServices::LeadPerformer, GST_TAG_PERFORMER }, + //{ QtMediaServices::Writer, 0 }, // Photos - //{ QtMediaservices::CameraManufacturer, 0 }, - //{ QtMediaservices::CameraModel, 0 }, - //{ QtMediaservices::Event, 0 }, - //{ QtMediaservices::Subject, 0 } + //{ QtMediaServices::CameraManufacturer, 0 }, + //{ QtMediaServices::CameraModel, 0 }, + //{ QtMediaServices::Event, 0 }, + //{ QtMediaServices::Subject, 0 } }; QGstreamerMetaDataProvider::QGstreamerMetaDataProvider(QGstreamerPlayerSession *session, QObject *parent) @@ -142,7 +142,7 @@ bool QGstreamerMetaDataProvider::isWritable() const return false; } -QVariant QGstreamerMetaDataProvider::metaData(QtMediaservices::MetaData key) const +QVariant QGstreamerMetaDataProvider::metaData(QtMediaServices::MetaData key) const { static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup); @@ -154,15 +154,15 @@ QVariant QGstreamerMetaDataProvider::metaData(QtMediaservices::MetaData key) con return QVariant(); } -void QGstreamerMetaDataProvider::setMetaData(QtMediaservices::MetaData key, QVariant const &value) +void QGstreamerMetaDataProvider::setMetaData(QtMediaServices::MetaData key, QVariant const &value) { Q_UNUSED(key); Q_UNUSED(value); } -QList QGstreamerMetaDataProvider::availableMetaData() const +QList QGstreamerMetaDataProvider::availableMetaData() const { - static QMap keysMap; + static QMap keysMap; if (keysMap.isEmpty()) { const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup); for (int i = 0; i < count; ++i) { @@ -170,9 +170,9 @@ QList QGstreamerMetaDataProvider::availableMetaData() } } - QList res; + QList res; foreach (const QByteArray &key, m_session->tags().keys()) { - QtMediaservices::MetaData tag = keysMap.value(key, QtMediaservices::MetaData(-1)); + QtMediaServices::MetaData tag = keysMap.value(key, QtMediaServices::MetaData(-1)); if (tag != -1) res.append(tag); } diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.h b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.h index 98803c2..4cf716a 100644 --- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.h +++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.h @@ -42,7 +42,7 @@ #ifndef QGSTREAMERMETADATAPROVIDER_H #define QGSTREAMERMETADATAPROVIDER_H -#include +#include QT_BEGIN_HEADER @@ -61,9 +61,9 @@ public: bool isMetaDataAvailable() const; bool isWritable() const; - QVariant metaData(QtMediaservices::MetaData key) const; - void setMetaData(QtMediaservices::MetaData key, const QVariant &value); - QList availableMetaData() const; + QVariant metaData(QtMediaServices::MetaData key) const; + void setMetaData(QtMediaServices::MetaData key, const QVariant &value); + QList availableMetaData() const; QVariant extendedMetaData(const QString &key) const ; void setExtendedMetaData(const QString &key, const QVariant &value); diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.h b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.h index 5239464..c95f37a 100644 --- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.h +++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.h @@ -44,8 +44,8 @@ #include -#include -#include +#include +#include #include diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayerservice.h b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayerservice.h index fe4a8a9..1283966 100644 --- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayerservice.h +++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayerservice.h @@ -45,7 +45,7 @@ #include #include -#include +#include #include "qgstreamervideooutputcontrol.h" diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.cpp index 33454d4..724a595 100644 --- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.cpp +++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.cpp @@ -812,7 +812,7 @@ void QGstreamerPlayerSession::getStreamsInfo() for (int i=0; i streamProperties; + QMap streamProperties; int streamIndex = i - m_playbin2StreamOffset[streamType]; @@ -834,7 +834,7 @@ void QGstreamerPlayerSession::getStreamsInfo() if (tags && gst_is_tag_list(tags)) { gchar *languageCode = 0; if (gst_tag_list_get_string(tags, GST_TAG_LANGUAGE_CODE, &languageCode)) - streamProperties[QtMediaservices::Language] = QString::fromUtf8(languageCode); + streamProperties[QtMediaServices::Language] = QString::fromUtf8(languageCode); //qDebug() << "language for setream" << i << QString::fromUtf8(languageCode); g_free (languageCode); @@ -889,8 +889,8 @@ void QGstreamerPlayerSession::getStreamsInfo() // break; // } // -// QMap streamProperties; -// streamProperties[QtMediaservices::Language] = QString::fromUtf8(languageCode); +// QMap streamProperties; +// streamProperties[QtMediaServices::Language] = QString::fromUtf8(languageCode); // // m_streamProperties.append(streamProperties); // m_streamTypes.append(streamType); diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.h b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.h index 61b5f51..6499a84 100644 --- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.h +++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.h @@ -46,7 +46,7 @@ #include #include "qgstreamerplayercontrol.h" #include "qgstreamerbushelper.h" -#include +#include //#include #include @@ -92,7 +92,7 @@ public: void setPlaybackRate(qreal rate); QMap tags() const { return m_tags; } - QMap streamProperties(int streamNumber) const { return m_streamProperties[streamNumber]; } + QMap streamProperties(int streamNumber) const { return m_streamProperties[streamNumber]; } // int streamCount() const { return m_streamProperties.count(); } // QMediaStreamsControl::StreamType streamType(int streamNumber) { return m_streamTypes.value(streamNumber, QMediaStreamsControl::UnknownStream); } // @@ -153,7 +153,7 @@ private: QGstreamerVideoRendererInterface *m_renderer; QMap m_tags; - QList< QMap > m_streamProperties; + QList< QMap > m_streamProperties; // QList m_streamTypes; // QMap m_playbin2StreamOffset; diff --git a/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.cpp b/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.cpp index 443e738..0ca7d54 100644 --- a/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.cpp +++ b/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.cpp @@ -52,7 +52,7 @@ #ifdef QMEDIA_GSTREAMER_CAPTURE #include "qgstreamercaptureservice.h" #endif -#include +#include #ifdef QMEDIA_GSTREAMER_CAPTURE #include diff --git a/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.h b/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.h index 6908bb3..e0a5dfd 100644 --- a/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.h +++ b/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.h @@ -43,7 +43,7 @@ #ifndef QGSTREAMERSERVICEPLUGIN_H #define QGSTREAMERSERVICEPLUGIN_H -#include +#include QT_BEGIN_HEADER diff --git a/src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.h b/src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.h index 35174cf..7994f9c 100644 --- a/src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.h +++ b/src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.h @@ -42,7 +42,7 @@ #ifndef QGSTREAMERVIDEOINPUTDEVICECONTROL_H #define QGSTREAMERVIDEOINPUTDEVICECONTROL_H -#include +#include #include diff --git a/src/plugins/mediaservices/gstreamer/qgstreamervideooutputcontrol.h b/src/plugins/mediaservices/gstreamer/qgstreamervideooutputcontrol.h index c4d76a4..6d7d47f 100644 --- a/src/plugins/mediaservices/gstreamer/qgstreamervideooutputcontrol.h +++ b/src/plugins/mediaservices/gstreamer/qgstreamervideooutputcontrol.h @@ -42,7 +42,7 @@ #ifndef QGSTREAMERVIDEOOUTPUTCONTROL_H #define QGSTREAMERVIDEOOUTPUTCONTROL_H -#include +#include #include diff --git a/src/plugins/mediaservices/gstreamer/qgstreamervideooverlay.h b/src/plugins/mediaservices/gstreamer/qgstreamervideooverlay.h index 63079c8..f44c25b 100644 --- a/src/plugins/mediaservices/gstreamer/qgstreamervideooverlay.h +++ b/src/plugins/mediaservices/gstreamer/qgstreamervideooverlay.h @@ -42,7 +42,7 @@ #ifndef QGSTREAMERVIDEOOVERLAY_H #define QGSTREAMERVIDEOOVERLAY_H -#include +#include #include "qgstreamervideorendererinterface.h" diff --git a/src/plugins/mediaservices/gstreamer/qgstreamervideorenderer.h b/src/plugins/mediaservices/gstreamer/qgstreamervideorenderer.h index 903ffbb..0fbbd63 100644 --- a/src/plugins/mediaservices/gstreamer/qgstreamervideorenderer.h +++ b/src/plugins/mediaservices/gstreamer/qgstreamervideorenderer.h @@ -42,7 +42,7 @@ #ifndef QGSTREAMERVIDEORENDERER_H #define QGSTREAMERVIDEORENDERER_H -#include +#include #include "qvideosurfacegstsink.h" #include "qgstreamervideorendererinterface.h" diff --git a/src/plugins/mediaservices/gstreamer/qgstreamervideowidget.h b/src/plugins/mediaservices/gstreamer/qgstreamervideowidget.h index e99a3cf..d54a1fc 100644 --- a/src/plugins/mediaservices/gstreamer/qgstreamervideowidget.h +++ b/src/plugins/mediaservices/gstreamer/qgstreamervideowidget.h @@ -42,7 +42,7 @@ #ifndef QGSTREAMERVIDEOWIDGET_H #define QGSTREAMERVIDEOWIDGET_H -#include +#include #include "qgstreamervideorendererinterface.h" diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.h b/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.h index a546ca1..5ac97b1 100644 --- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.h +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.h @@ -45,8 +45,8 @@ #include #include -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.mm index 90c6035..ba22552 100644 --- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.mm +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.mm @@ -42,7 +42,7 @@ #include "qt7playercontrol.h" #include "qt7playersession.h" -#include +#include #include #include diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h index e13df95..8cbc29a 100644 --- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h @@ -42,7 +42,7 @@ #ifndef QT7PLAYERMETADATACONTROL_H #define QT7PLAYERMETADATACONTROL_H -#include +#include QT_BEGIN_HEADER @@ -61,9 +61,9 @@ public: bool isMetaDataAvailable() const; bool isWritable() const; - QVariant metaData(QtMediaservices::MetaData key) const; - void setMetaData(QtMediaservices::MetaData key, const QVariant &value); - QList availableMetaData() const; + QVariant metaData(QtMediaServices::MetaData key) const; + void setMetaData(QtMediaServices::MetaData key, const QVariant &value); + QList availableMetaData() const; QVariant extendedMetaData(const QString &key) const ; void setExtendedMetaData(const QString &key, const QVariant &value); @@ -74,7 +74,7 @@ private slots: private: QT7PlayerSession *m_session; - QMap m_tags; + QMap m_tags; }; QT_END_NAMESPACE diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm index e12daf5..2ea778d 100644 --- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm @@ -72,18 +72,18 @@ bool QT7PlayerMetaDataControl::isWritable() const return false; } -QVariant QT7PlayerMetaDataControl::metaData(QtMediaservices::MetaData key) const +QVariant QT7PlayerMetaDataControl::metaData(QtMediaServices::MetaData key) const { return m_tags.value(key); } -void QT7PlayerMetaDataControl::setMetaData(QtMediaservices::MetaData key, QVariant const &value) +void QT7PlayerMetaDataControl::setMetaData(QtMediaServices::MetaData key, QVariant const &value) { Q_UNUSED(key); Q_UNUSED(value); } -QList QT7PlayerMetaDataControl::availableMetaData() const +QList QT7PlayerMetaDataControl::availableMetaData() const { return m_tags.keys(); } @@ -256,13 +256,13 @@ void QT7PlayerMetaDataControl::updateTags() metaMap.insert(QLatin1String("nam"), QString::fromUtf8([name UTF8String])); #endif // QUICKTIME_C_API_AVAILABLE - m_tags.insert(QtMediaservices::AlbumArtist, metaMap.value(QLatin1String("ART"))); - m_tags.insert(QtMediaservices::AlbumTitle, metaMap.value(QLatin1String("alb"))); - m_tags.insert(QtMediaservices::Title, metaMap.value(QLatin1String("nam"))); - m_tags.insert(QtMediaservices::Date, metaMap.value(QLatin1String("day"))); - m_tags.insert(QtMediaservices::Genre, metaMap.value(QLatin1String("gnre"))); - m_tags.insert(QtMediaservices::TrackNumber, metaMap.value(QLatin1String("trk"))); - m_tags.insert(QtMediaservices::Description, metaMap.value(QLatin1String("des"))); + m_tags.insert(QtMediaServices::AlbumArtist, metaMap.value(QLatin1String("ART"))); + m_tags.insert(QtMediaServices::AlbumTitle, metaMap.value(QLatin1String("alb"))); + m_tags.insert(QtMediaServices::Title, metaMap.value(QLatin1String("nam"))); + m_tags.insert(QtMediaServices::Date, metaMap.value(QLatin1String("day"))); + m_tags.insert(QtMediaServices::Genre, metaMap.value(QLatin1String("gnre"))); + m_tags.insert(QtMediaServices::TrackNumber, metaMap.value(QLatin1String("trk"))); + m_tags.insert(QtMediaServices::Description, metaMap.value(QLatin1String("des"))); } if (!wasEmpty || !m_tags.isEmpty()) diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.h b/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.h index 3d3a3ff..9a22c31 100644 --- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.h +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.h @@ -43,7 +43,7 @@ #define QT7PLAYERSERVICE_H #include -#include +#include QT_BEGIN_HEADER diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm index 0b3505e..cf79622 100644 --- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm @@ -54,8 +54,8 @@ #include "qt7movievideowidget.h" #include "qt7playermetadata.h" -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.h b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.h index 780776c..2450cf8 100644 --- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.h +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.h @@ -45,8 +45,8 @@ #include #include -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm index 863b3c8..024f7b0 100644 --- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm @@ -49,7 +49,7 @@ #include "qt7videooutputcontrol.h" #include -#include +#include #include #include diff --git a/src/plugins/mediaservices/qt7/qt7movieviewoutput.h b/src/plugins/mediaservices/qt7/qt7movieviewoutput.h index ed3eebc..d6bfd14 100644 --- a/src/plugins/mediaservices/qt7/qt7movieviewoutput.h +++ b/src/plugins/mediaservices/qt7/qt7movieviewoutput.h @@ -44,8 +44,8 @@ #include -#include -#include +#include +#include #include #include "qt7videooutputcontrol.h" diff --git a/src/plugins/mediaservices/qt7/qt7movieviewrenderer.h b/src/plugins/mediaservices/qt7/qt7movieviewrenderer.h index 334ea6a..fa4db4d 100644 --- a/src/plugins/mediaservices/qt7/qt7movieviewrenderer.h +++ b/src/plugins/mediaservices/qt7/qt7movieviewrenderer.h @@ -45,8 +45,8 @@ #include #include -#include -#include +#include +#include #include #include "qt7videooutputcontrol.h" diff --git a/src/plugins/mediaservices/qt7/qt7serviceplugin.h b/src/plugins/mediaservices/qt7/qt7serviceplugin.h index 7e8acf9..3871e10 100644 --- a/src/plugins/mediaservices/qt7/qt7serviceplugin.h +++ b/src/plugins/mediaservices/qt7/qt7serviceplugin.h @@ -43,7 +43,7 @@ #ifndef QT7SERVICEPLUGIN_H #define QT7SERVICEPLUGIN_H -#include +#include QT_BEGIN_HEADER diff --git a/src/plugins/mediaservices/qt7/qt7serviceplugin.mm b/src/plugins/mediaservices/qt7/qt7serviceplugin.mm index fe4ca44..92b472f 100644 --- a/src/plugins/mediaservices/qt7/qt7serviceplugin.mm +++ b/src/plugins/mediaservices/qt7/qt7serviceplugin.mm @@ -45,7 +45,7 @@ #include "qt7serviceplugin.h" #include "qt7playerservice.h" -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/mediaservices/qt7/qt7videooutputcontrol.h b/src/plugins/mediaservices/qt7/qt7videooutputcontrol.h index 39a13ee..76066ba 100644 --- a/src/plugins/mediaservices/qt7/qt7videooutputcontrol.h +++ b/src/plugins/mediaservices/qt7/qt7videooutputcontrol.h @@ -45,11 +45,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 2afc94b..d803e74 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1788,10 +1788,10 @@ bool Configure::displayHelp() desc("MULTIMEDIA", "yes","-multimedia", "Compile in multimedia module"); desc("AUDIO_BACKEND", "no","-no-audio-backend", "Do not compile in the platform audio backend into QtMultimedia"); desc("AUDIO_BACKEND", "yes","-audio-backend", "Compile in the platform audio backend into QtMultimedia"); - desc("MEDIASERVICES", "no", "-no-mediaservices","Do not compile the QtMediaservices module"); - desc("MEDIASERVICES", "yes","-mediaservices", "Compile in QtMediaservices module"); - desc("MEDIA_BACKEND", "no","-no-media-backend", "Do not compile in the platform-specific QtMediaservices media service."); - desc("MEDIA_BACKEND", "yes","-media-backend", "Compile in the platform-specific QtMediaservices media service."); + desc("MEDIASERVICES", "no", "-no-mediaservices","Do not compile the QtMediaServices module"); + desc("MEDIASERVICES", "yes","-mediaservices", "Compile in QtMediaServices module"); + desc("MEDIA_BACKEND", "no","-no-media-backend", "Do not compile in the platform-specific QtMediaServices media service."); + desc("MEDIA_BACKEND", "yes","-media-backend", "Compile in the platform-specific QtMediaServices media service."); desc("WEBKIT", "no", "-no-webkit", "Do not compile in the WebKit module"); desc("WEBKIT", "yes", "-webkit", "Compile in the WebKit module (WebKit is built if a decent C++ compiler is used.)"); desc("SCRIPT", "no", "-no-script", "Do not build the QtScript module."); @@ -3347,7 +3347,7 @@ void Configure::displayConfig() cout << "QtXmlPatterns support......." << dictionary[ "XMLPATTERNS" ] << endl; cout << "Phonon support.............." << dictionary[ "PHONON" ] << endl; cout << "QtMultimedia support........" << dictionary[ "MULTIMEDIA" ] << endl; - cout << "QtMediaservices support....." << dictionary[ "MEDIASERVICES" ] << endl; + cout << "QtMediaServices support....." << dictionary[ "MEDIASERVICES" ] << endl; cout << "WebKit support.............." << dictionary[ "WEBKIT" ] << endl; cout << "Declarative support........." << dictionary[ "DECLARATIVE" ] << endl; cout << "QtScript support............" << dictionary[ "SCRIPT" ] << endl; -- cgit v0.12