diff options
214 files changed, 714 insertions, 650 deletions
@@ -50,7 +50,8 @@ my %modules = ( # path to module name map "QtDBus" => "$basedir/src/dbus", "QtWebKit" => "$basedir/src/3rdparty/webkit/WebCore", "phonon" => "$basedir/src/phonon", - "QtMultimedia" => "$basedir/src/multimedia", + "QtMultimedia" => "$basedir/src/multimedia/multimedia", + "QtMediaservices" => "$basedir/src/multimedia/mediaservices", ); my %moduleheaders = ( # restrict the module headers to those found in relative path "QtWebKit" => "../WebKit/qt/Api", @@ -682,7 +682,8 @@ CFG_RELEASE_QMAKE=no CFG_PHONON=auto CFG_PHONON_BACKEND=yes CFG_MULTIMEDIA=auto -CFG_MEDIASERVICE=auto +CFG_MEDIASERVICES=auto +CFG_MEDIA_BACKEND=auto CFG_AUDIO_BACKEND=auto CFG_SVG=auto CFG_DECLARATIVE=auto @@ -937,7 +938,7 @@ while [ "$#" -gt 0 ]; do VAL=no ;; #Qt style yes options - -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-mediaservice|-audio-backend|-svg|-declarative|-webkit|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles) + -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-mediaservices|-media-backend|-audio-backend|-svg|-declarative|-webkit|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` VAL=yes ;; @@ -2153,9 +2154,16 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; - mediaservice) + mediaservices) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_MEDIASERVICE="$VAL" + CFG_MEDIASERVICES="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; + media-backend) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_MEDIA_BACKEND="$VAL" else UNKNOWN_OPT=yes fi @@ -3390,8 +3398,9 @@ Usage: $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir [-no-separate-debug-info] [-no-mmx] [-no-3dnow] [-no-sse] [-no-sse2] [-qtnamespace <namespace>] [-qtlibinfix <infix>] [-separate-debug-info] [-armfpa] [-no-optimized-qmake] [-optimized-qmake] [-no-xmlpatterns] [-xmlpatterns] - [-no-multimedia] [-multimedia] [-no-phonon] [-phonon] [-no-phonon-backend] [-phonon-backend] - [-no-mediaservice] [-mediaservice] [-no-audio-backend] [-audio-backend] + [-no-multimedia] [-multimedia] [-no-mediaservices] [-mediaservices] + [-no-phonon] [-phonon] [-no-phonon-backend] [-phonon-backend] + [-no-media-backend] [-medias-backend] [-no-audio-backend] [-audio-backend] [-no-openssl] [-openssl] [-openssl-linked] [-no-gtkstyle] [-gtkstyle] [-no-svg] [-svg] [-no-webkit] [-webkit] [-no-javascript-jit] [-javascript-jit] [-no-script] [-script] [-no-scripttools] [-scripttools] [-no-declarative] [-declarative] @@ -3532,12 +3541,15 @@ fi -no-multimedia ..... Do not build the QtMultimedia module. + -multimedia ........ Build the QtMultimedia module. - -no-mediaservice.... Do not build platform mediaservice plugin. - + -mediaservice ...... Build the platform mediaservice plugin. - -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-media-backend... Do not build platform mediaservices plugin. + + -media-backend..... Build the platform mediaservices plugin. + -no-phonon ......... Do not build the Phonon module. + -phonon ............ Build the Phonon module. Phonon is built if a decent C++ compiler is used. @@ -5176,16 +5188,16 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then fi if [ "$CFG_GUI" = "no" ]; then - if [ "$CFG_MEDIASERVICE" = "auto" ]; then - CFG_MEDIASERVICE=no + if [ "$CFG_MEDIA_BACKEND" = "auto" ]; then + CFG_MEDIA_BACKEND=no fi - if [ "$CFG_MEDIASERVICE" != "no" ]; then - echo "Mediaservice enabled, but GUI disabled." - echo " You might need to either enable the GUI or disable Mediaservice" + if [ "$CFG_MEDIA_BACKEND" != "no" ]; then + echo "Medias backend enabled, but GUI disabled." + echo " You might need to either enable the GUI or disable the media backend" exit 1 fi - elif [ "$CFG_MEDIASERVICE" = "auto" ]; then - CFG_MEDIASERVICE=yes + elif [ "$CFG_MEDIA_BACKEND" = "auto" ]; then + CFG_MEDIA_BACKEND=yes fi # Auto-detect GStreamer support (needed for both Phonon & QtMultimedia) @@ -6820,8 +6832,14 @@ if [ "$CFG_MULTIMEDIA" = "no" ]; then QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MULTIMEDIA" else QT_CONFIG="$QT_CONFIG multimedia" - if [ "$CFG_MEDIASERVICE" = "yes" ]; then - QT_CONFIG="$QT_CONFIG mediaservice" +fi + +if [ "$CFG_MEDIASERVICES" = "no" ]; then + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MEDIASERVICES" +else + QT_CONFIG="$QT_CONFIG mediaservices" + if [ "$CFG_MEDIA_BACKEND" = "yes" ]; then + QT_CONFIG="$QT_CONFIG media-backend" fi fi @@ -7782,6 +7800,7 @@ echo "QtScriptTools module ... $CFG_SCRIPTTOOLS" echo "QtXmlPatterns module ... $CFG_XMLPATTERNS" echo "Phonon module .......... $CFG_PHONON" echo "Multimedia module ...... $CFG_MULTIMEDIA" +echo "Mediaservices module ... $CFG_MEDIASERVICES" echo "SVG module ............. $CFG_SVG" echo "WebKit module .......... $CFG_WEBKIT" if [ "$CFG_WEBKIT" = "yes" ]; then diff --git a/demos/multimedia/player/player.cpp b/demos/multimedia/player/player.cpp index af30a97..20341bc 100644 --- a/demos/multimedia/player/player.cpp +++ b/demos/multimedia/player/player.cpp @@ -45,8 +45,8 @@ #include "playlistmodel.h" #include "videowidget.h" -#include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaplaylist.h> +#include <QtMediaservices/qmediaservice.h> +#include <QtMediaservices/qmediaplaylist.h> #include <QtGui> @@ -204,14 +204,14 @@ void Player::positionChanged(qint64 progress) void Player::metaDataChanged() { - //qDebug() << "update metadata" << player->metaData(QtMultimedia::Title).toString(); + //qDebug() << "update metadata" << player->metaData(QtMediaservices::Title).toString(); if (player->isMetaDataAvailable()) { setTrackInfo(QString("%1 - %2") - .arg(player->metaData(QtMultimedia::AlbumArtist).toString()) - .arg(player->metaData(QtMultimedia::Title).toString())); + .arg(player->metaData(QtMediaservices::AlbumArtist).toString()) + .arg(player->metaData(QtMediaservices::Title).toString())); if (coverLabel) { - QUrl url = player->metaData(QtMultimedia::CoverArtUrlLarge).value<QUrl>(); + QUrl url = player->metaData(QtMediaservices::CoverArtUrlLarge).value<QUrl>(); coverLabel->setPixmap(!url.isEmpty() ? QPixmap(url.toString()) diff --git a/demos/multimedia/player/player.pro b/demos/multimedia/player/player.pro index dc731e4..fb93416 100644 --- a/demos/multimedia/player/player.pro +++ b/demos/multimedia/player/player.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = player -QT += gui multimedia +QT += gui mediaservices HEADERS = \ diff --git a/demos/multimedia/player/playercontrols.h b/demos/multimedia/player/playercontrols.h index 99894ff..0b0b0e6 100644 --- a/demos/multimedia/player/playercontrols.h +++ b/demos/multimedia/player/playercontrols.h @@ -42,7 +42,7 @@ #ifndef PLAYERCONTROLS_H #define PLAYERCONTROLS_H -#include <QtMultimedia/qmediaplayer.h> +#include <QtMediaservices/qmediaplayer.h> #include <QtGui/qwidget.h> diff --git a/demos/multimedia/player/videowidget.h b/demos/multimedia/player/videowidget.h index 543e1e0..0251bfe 100644 --- a/demos/multimedia/player/videowidget.h +++ b/demos/multimedia/player/videowidget.h @@ -41,7 +41,7 @@ #ifndef VIDEOWIDGET_H #define VIDEOWIDGET_H -#include <QtMultimedia/qvideowidget.h> +#include <QtMediaservices/qvideowidget.h> QT_BEGIN_HEADER diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 62cce62..ff4e986 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -36,7 +36,7 @@ INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH #prepending prevents us from picki win32:INCLUDEPATH += $$QMAKE_INCDIR_QT/ActiveQt # As order does matter for static libs, we reorder the QT variable here -TMPLIBS = declarative webkit phonon multimedia dbus testlib script scripttools svg qt3support sql xmlpatterns xml egl opengl openvg gui network core +TMPLIBS = declarative webkit phonon mediaservices multimedia dbus testlib script scripttools svg qt3support sql xmlpatterns xml egl opengl openvg gui network core for(QTLIB, $$list($$TMPLIBS)) { contains(QT, $$QTLIB): QT_ORDERED += $$QTLIB } @@ -175,6 +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:message("Unknown QT: $$QTLIB"):qlib = !isEmpty(qlib) { target_qt:isEqual(TARGET, qlib) { diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index bdb3f83..22c39b6 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -142,7 +142,7 @@ addJavaScriptCoreLib(../JavaScriptCore) DEFINES -= ENABLE_VIDEO=0 DEFINES += ENABLE_VIDEO=1 } - !lessThan(QT_MINOR_VERSION, 7):contains(QT_CONFIG, multimedia) { + !lessThan(QT_MINOR_VERSION, 7):contains(QT_CONFIG, mediaservices) { DEFINES -= ENABLE_VIDEO=0 DEFINES += ENABLE_VIDEO=1 } @@ -2370,7 +2370,7 @@ contains(DEFINES, ENABLE_VIDEO=1) { HEADERS += platform/graphics/qt/MediaPlayerPrivateQt.h SOURCES += platform/graphics/qt/MediaPlayerPrivateQt.cpp - tobe|!tobe: QT += multimedia + tobe|!tobe: QT += mediaservices } else { HEADERS += \ platform/graphics/qt/MediaPlayerPrivatePhonon.h diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index a2e74f4..46ceb34 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -41,7 +41,7 @@ #include <QtDeclarative/qdeclarativeextensionplugin.h> #include <QtDeclarative/qdeclarative.h> -#include <QtMultimedia/private/qsoundeffect_p.h> +#include <QtMediaservices/private/qsoundeffect_p.h> #include "qdeclarativevideo_p.h" #include "qdeclarativeaudio_p.h" diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro index 92f7ec4..c1933a3 100644 --- a/src/imports/multimedia/multimedia.pro +++ b/src/imports/multimedia/multimedia.pro @@ -2,7 +2,7 @@ TARGET = multimedia TARGETPATH = Qt/multimedia include(../qimportbase.pri) -QT += multimedia declarative +QT += mediaservices declarative HEADERS += \ qdeclarativeaudio_p.h \ diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp index 8d2dc61..4e75099 100644 --- a/src/imports/multimedia/qdeclarativeaudio.cpp +++ b/src/imports/multimedia/qdeclarativeaudio.cpp @@ -41,7 +41,7 @@ #include "qdeclarativeaudio_p.h" -#include <QtMultimedia/qmediaplayercontrol.h> +#include <QtMediaservices/qmediaplayercontrol.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/multimedia/qdeclarativemediabase.cpp b/src/imports/multimedia/qdeclarativemediabase.cpp index bbd5901..5ed602a 100644 --- a/src/imports/multimedia/qdeclarativemediabase.cpp +++ b/src/imports/multimedia/qdeclarativemediabase.cpp @@ -44,10 +44,10 @@ #include <QtCore/qcoreevent.h> #include <QtCore/qurl.h> -#include <QtMultimedia/qmediaplayercontrol.h> -#include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaserviceprovider.h> -#include <QtMultimedia/qmetadatacontrol.h> +#include <QtMediaservices/qmediaplayercontrol.h> +#include <QtMediaservices/qmediaservice.h> +#include <QtMediaservices/qmediaserviceprovider.h> +#include <QtMediaservices/qmetadatacontrol.h> #include "qmetadatacontrolmetaobject_p.h" diff --git a/src/imports/multimedia/qdeclarativemediabase_p.h b/src/imports/multimedia/qdeclarativemediabase_p.h index 7d262e0..e5115de 100644 --- a/src/imports/multimedia/qdeclarativemediabase_p.h +++ b/src/imports/multimedia/qdeclarativemediabase_p.h @@ -54,7 +54,7 @@ // #include <QtCore/qbasictimer.h> -#include <QtMultimedia/qmediaplayer.h> +#include <QtMediaservices/qmediaplayer.h> QT_BEGIN_HEADER diff --git a/src/imports/multimedia/qdeclarativevideo.cpp b/src/imports/multimedia/qdeclarativevideo.cpp index bf112be..734bd96 100644 --- a/src/imports/multimedia/qdeclarativevideo.cpp +++ b/src/imports/multimedia/qdeclarativevideo.cpp @@ -41,11 +41,11 @@ #include "qdeclarativevideo_p.h" -#include <QtMultimedia/qmediaplayercontrol.h> -#include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/private/qpaintervideosurface_p.h> -#include <QtMultimedia/qvideooutputcontrol.h> -#include <QtMultimedia/qvideorenderercontrol.h> +#include <QtMediaservices/qmediaplayercontrol.h> +#include <QtMediaservices/qmediaservice.h> +#include <QtMediaservices/private/qpaintervideosurface_p.h> +#include <QtMediaservices/qvideooutputcontrol.h> +#include <QtMediaservices/qvideorenderercontrol.h> QT_BEGIN_NAMESPACE @@ -435,7 +435,7 @@ QT_END_NAMESPACE This property holds the tile of the media. - \sa {QtMultimedia::Title} + \sa {QtMediaservices::Title} */ /*! @@ -443,7 +443,7 @@ QT_END_NAMESPACE This property holds the sub-title of the media. - \sa {QtMultimedia::SubTitle} + \sa {QtMediaservices::SubTitle} */ /*! @@ -451,7 +451,7 @@ QT_END_NAMESPACE This property holds the author of the media. - \sa {QtMultimedia::Author} + \sa {QtMediaservices::Author} */ /*! @@ -459,7 +459,7 @@ QT_END_NAMESPACE This property holds a user comment about the media. - \sa {QtMultimedia::Comment} + \sa {QtMediaservices::Comment} */ /*! @@ -467,7 +467,7 @@ QT_END_NAMESPACE This property holds a description of the media. - \sa {QtMultimedia::Description} + \sa {QtMediaservices::Description} */ /*! @@ -475,7 +475,7 @@ QT_END_NAMESPACE This property holds the category of the media - \sa {QtMultimedia::Category} + \sa {QtMediaservices::Category} */ /*! @@ -483,7 +483,7 @@ QT_END_NAMESPACE This property holds the genre of the media. - \sa {QtMultimedia::Genre} + \sa {QtMediaservices::Genre} */ /*! @@ -491,7 +491,7 @@ QT_END_NAMESPACE This property holds the year of release of the media. - \sa {QtMultimedia::Year} + \sa {QtMediaservices::Year} */ /*! @@ -499,7 +499,7 @@ QT_END_NAMESPACE This property holds the date of the media. - \sa {QtMultimedia::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 {QtMultimedia::UserRating} + \sa {QtMediaservices::UserRating} */ /*! @@ -515,7 +515,7 @@ QT_END_NAMESPACE This property holds a list of keywords describing the media. - \sa {QtMultimedia::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 {QtMultimedia::Language} + \sa {QtMediaservices::Language} */ /*! @@ -531,7 +531,7 @@ QT_END_NAMESPACE This property holds the publisher of the media. - \sa {QtMultimedia::Publisher} + \sa {QtMediaservices::Publisher} */ /*! @@ -539,7 +539,7 @@ QT_END_NAMESPACE This property holds the media's copyright notice. - \sa {QtMultimedia::Copyright} + \sa {QtMediaservices::Copyright} */ /*! @@ -547,7 +547,7 @@ QT_END_NAMESPACE This property holds the parental rating of the media. - \sa {QtMultimedia::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 {QtMultimedia::RatingOrganisation} + \sa {QtMediaservices::RatingOrganisation} */ /*! @@ -564,7 +564,7 @@ QT_END_NAMESPACE This property property holds the size of the media in bytes. - \sa {QtMultimedia::Size} + \sa {QtMediaservices::Size} */ /*! @@ -572,7 +572,7 @@ QT_END_NAMESPACE This property holds the type of the media. - \sa {QtMultimedia::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 {QtMultimedia::AudioBitRate} + \sa {QtMediaservices::AudioBitRate} */ /*! @@ -589,7 +589,7 @@ QT_END_NAMESPACE This property holds the encoding of the media audio stream. - \sa {QtMultimedia::AudioCodec} + \sa {QtMediaservices::AudioCodec} */ /*! @@ -597,7 +597,7 @@ QT_END_NAMESPACE This property holds the average volume level of the media. - \sa {QtMultimedia::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 {QtMultimedia::ChannelCount} + \sa {QtMediaservices::ChannelCount} */ /*! @@ -613,7 +613,7 @@ QT_END_NAMESPACE This property holds the peak volume of media's audio stream. - \sa {QtMultimedia::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 {QtMultimedia::SampleRate} + \sa {QtMediaservices::SampleRate} */ /*! @@ -629,7 +629,7 @@ QT_END_NAMESPACE This property holds the title of the album the media belongs to. - \sa {QtMultimedia::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 {QtMultimedia::AlbumArtist} + \sa {QtMediaservices::AlbumArtist} */ /*! @@ -646,7 +646,7 @@ QT_END_NAMESPACE This property holds the names of artists contributing to the media. - \sa {QtMultimedia::ContributingArtist} + \sa {QtMediaservices::ContributingArtist} */ /*! @@ -654,7 +654,7 @@ QT_END_NAMESPACE This property holds the composer of the media. - \sa {QtMultimedia::Composer} + \sa {QtMediaservices::Composer} */ /*! @@ -662,7 +662,7 @@ QT_END_NAMESPACE This property holds the conductor of the media. - \sa {QtMultimedia::Conductor} + \sa {QtMediaservices::Conductor} */ /*! @@ -670,7 +670,7 @@ QT_END_NAMESPACE This property holds the lyrics to the media. - \sa {QtMultimedia::Lyrics} + \sa {QtMediaservices::Lyrics} */ /*! @@ -678,7 +678,7 @@ QT_END_NAMESPACE This property holds the mood of the media. - \sa {QtMultimedia::Mood} + \sa {QtMediaservices::Mood} */ /*! @@ -686,7 +686,7 @@ QT_END_NAMESPACE This property holds the track number of the media. - \sa {QtMultimedia::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 {QtMultimedia::TrackNumber} + \sa {QtMediaservices::TrackNumber} */ /*! @@ -702,7 +702,7 @@ QT_END_NAMESPACE This property holds the URL of a small cover art image. - \sa {QtMultimedia::CoverArtUrlSmall} + \sa {QtMediaservices::CoverArtUrlSmall} */ /*! @@ -710,7 +710,7 @@ QT_END_NAMESPACE This property holds the URL of a large cover art image. - \sa {QtMultimedia::CoverArtUrlLarge} + \sa {QtMediaservices::CoverArtUrlLarge} */ /*! @@ -718,7 +718,7 @@ QT_END_NAMESPACE This property holds the dimension of an image or video. - \sa {QtMultimedia::Resolution} + \sa {QtMediaservices::Resolution} */ /*! @@ -726,7 +726,7 @@ QT_END_NAMESPACE This property holds the pixel aspect ratio of an image or video. - \sa {QtMultimedia::PixelAspectRatio} + \sa {QtMediaservices::PixelAspectRatio} */ /*! @@ -734,7 +734,7 @@ QT_END_NAMESPACE This property holds the frame rate of the media's video stream. - \sa {QtMultimedia::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 {QtMultimedia::VideoBitRate} + \sa {QtMediaservices::VideoBitRate} */ /*! @@ -751,7 +751,7 @@ QT_END_NAMESPACE This property holds the encoding of the media's video stream. - \sa {QtMultimedia::VideoCodec} + \sa {QtMediaservices::VideoCodec} */ /*! @@ -759,7 +759,7 @@ QT_END_NAMESPACE This property holds the URL of a poster image. - \sa {QtMultimedia::PosterUrl} + \sa {QtMediaservices::PosterUrl} */ /*! @@ -767,7 +767,7 @@ QT_END_NAMESPACE This property holds the chapter number of the media. - \sa {QtMultimedia::ChapterNumber} + \sa {QtMediaservices::ChapterNumber} */ /*! @@ -775,7 +775,7 @@ QT_END_NAMESPACE This property holds the director of the media. - \sa {QtMultimedia::Director} + \sa {QtMediaservices::Director} */ /*! @@ -783,7 +783,7 @@ QT_END_NAMESPACE This property holds the lead performer in the media. - \sa {QtMultimedia::LeadPerformer} + \sa {QtMediaservices::LeadPerformer} */ /*! @@ -791,7 +791,7 @@ QT_END_NAMESPACE This property holds the writer of the media. - \sa {QtMultimedia::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 {QtMultimedia::CameraManufacturer} + \sa {QtMediaservices::CameraManufacturer} */ /*! \qmlproperty variant Video::cameraModel - \sa {QtMultimedia::CameraModel} + \sa {QtMediaservices::CameraModel} */ /*! \qmlproperty variant Video::event - \sa {QtMultimedia::Event} + \sa {QtMediaservices::Event} */ /*! \qmlproperty variant Video::subject - \sa {QtMultimedia::Subject} + \sa {QtMediaservices::Subject} */ /*! \qmlproperty variant Video::orientation - \sa {QtMultimedia::Orientation} + \sa {QtMediaservices::Orientation} */ /*! \qmlproperty variant Video::exposureTime - \sa {QtMultimedia::ExposureTime} + \sa {QtMediaservices::ExposureTime} */ /*! \qmlproperty variant Video::fNumber - \sa {QtMultimedia::FNumber} + \sa {QtMediaservices::FNumber} */ /*! \qmlproperty variant Video::exposureProgram - \sa {QtMultimedia::ExposureProgram} + \sa {QtMediaservices::ExposureProgram} */ /*! \qmlproperty variant Video::isoSpeedRatings - \sa {QtMultimedia::ISOSpeedRatings} + \sa {QtMediaservices::ISOSpeedRatings} */ /*! \qmlproperty variant Video::exposureBiasValue - \sa {QtMultimedia::ExposureBiasValue} + \sa {QtMediaservices::ExposureBiasValue} */ /*! \qmlproperty variant Video::dateTimeDigitized - \sa {QtMultimedia::DateTimeDigitized} + \sa {QtMediaservices::DateTimeDigitized} */ /*! \qmlproperty variant Video::subjectDistance - \sa {QtMultimedia::SubjectDistance} + \sa {QtMediaservices::SubjectDistance} */ /*! \qmlproperty variant Video::meteringMode - \sa {QtMultimedia::MeteringMode} + \sa {QtMediaservices::MeteringMode} */ /*! \qmlproperty variant Video::lightSource - \sa {QtMultimedia::LightSource} + \sa {QtMediaservices::LightSource} */ /*! \qmlproperty variant Video::flash - \sa {QtMultimedia::Flash} + \sa {QtMediaservices::Flash} */ /*! \qmlproperty variant Video::focalLength - \sa {QtMultimedia::FocalLength} + \sa {QtMediaservices::FocalLength} */ /*! \qmlproperty variant Video::exposureMode - \sa {QtMultimedia::ExposureMode} + \sa {QtMediaservices::ExposureMode} */ /*! \qmlproperty variant Video::whiteBalance - \sa {QtMultimedia::WhiteBalance} + \sa {QtMediaservices::WhiteBalance} */ /*! \qmlproperty variant Video::DigitalZoomRatio - \sa {QtMultimedia::DigitalZoomRatio} + \sa {QtMediaservices::DigitalZoomRatio} */ /*! \qmlproperty variant Video::focalLengthIn35mmFilm - \sa {QtMultimedia::FocalLengthIn35mmFile} + \sa {QtMediaservices::FocalLengthIn35mmFile} */ /*! \qmlproperty variant Video::sceneCaptureType - \sa {QtMultimedia::SceneCaptureType} + \sa {QtMediaservices::SceneCaptureType} */ /*! \qmlproperty variant Video::gainControl - \sa {QtMultimedia::GainControl} + \sa {QtMediaservices::GainControl} */ /*! \qmlproperty variant Video::contrast - \sa {QtMultimedia::contrast} + \sa {QtMediaservices::contrast} */ /*! \qmlproperty variant Video::saturation - \sa {QtMultimedia::Saturation} + \sa {QtMediaservices::Saturation} */ /*! \qmlproperty variant Video::sharpness - \sa {QtMultimedia::Sharpness} + \sa {QtMediaservices::Sharpness} */ /*! \qmlproperty variant Video::deviceSettingDescription - \sa {QtMultimedia::DeviceSettingDescription} + \sa {QtMediaservices::DeviceSettingDescription} */ #endif diff --git a/src/imports/multimedia/qdeclarativevideo_p.h b/src/imports/multimedia/qdeclarativevideo_p.h index 29e1090..99882ac 100644 --- a/src/imports/multimedia/qdeclarativevideo_p.h +++ b/src/imports/multimedia/qdeclarativevideo_p.h @@ -55,7 +55,7 @@ #include "qdeclarativemediabase_p.h" -#include <QtMultimedia/qgraphicsvideoitem.h> +#include <QtMediaservices/qgraphicsvideoitem.h> #include <QtCore/qbasictimer.h> #include <QtDeclarative/qdeclarativeitem.h> diff --git a/src/imports/multimedia/qmetadatacontrolmetaobject.cpp b/src/imports/multimedia/qmetadatacontrolmetaobject.cpp index e90cbd6..2f45b50 100644 --- a/src/imports/multimedia/qmetadatacontrolmetaobject.cpp +++ b/src/imports/multimedia/qmetadatacontrolmetaobject.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmetadatacontrolmetaobject_p.h" -#include <QtMultimedia/qmetadatacontrol.h> +#include <QtMediaservices/qmetadatacontrol.h> QT_BEGIN_NAMESPACE @@ -106,101 +106,101 @@ namespace { struct MetaDataKey { - QtMultimedia::MetaData key; + QtMediaservices::MetaData key; const char *name; }; const MetaDataKey qt_metaDataKeys[] = { - { QtMultimedia::Title, "title" }, - { QtMultimedia::SubTitle, "subTitle" }, - { QtMultimedia::Author, "author" }, - { QtMultimedia::Comment, "comment" }, - { QtMultimedia::Description, "description" }, - { QtMultimedia::Category, "category" }, - { QtMultimedia::Genre, "genre" }, - { QtMultimedia::Year, "year" }, - { QtMultimedia::Date, "date" }, - { QtMultimedia::UserRating, "userRating" }, - { QtMultimedia::Keywords, "keywords" }, - { QtMultimedia::Language, "language" }, - { QtMultimedia::Publisher, "publisher" }, - { QtMultimedia::Copyright, "copyright" }, - { QtMultimedia::ParentalRating, "parentalRating" }, - { QtMultimedia::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 - { QtMultimedia::Size, "size" }, - { QtMultimedia::MediaType, "mediaType" }, -// { QtMultimedia::Duration, "duration" }, + { QtMediaservices::Size, "size" }, + { QtMediaservices::MediaType, "mediaType" }, +// { QtMediaservices::Duration, "duration" }, // Audio - { QtMultimedia::AudioBitRate, "audioBitRate" }, - { QtMultimedia::AudioCodec, "audioCodec" }, - { QtMultimedia::AverageLevel, "averageLevel" }, - { QtMultimedia::ChannelCount, "channelCount" }, - { QtMultimedia::PeakValue, "peakValue" }, - { QtMultimedia::SampleRate, "sampleRate" }, + { QtMediaservices::AudioBitRate, "audioBitRate" }, + { QtMediaservices::AudioCodec, "audioCodec" }, + { QtMediaservices::AverageLevel, "averageLevel" }, + { QtMediaservices::ChannelCount, "channelCount" }, + { QtMediaservices::PeakValue, "peakValue" }, + { QtMediaservices::SampleRate, "sampleRate" }, // Music - { QtMultimedia::AlbumTitle, "albumTitle" }, - { QtMultimedia::AlbumArtist, "albumArtist" }, - { QtMultimedia::ContributingArtist, "contributingArtist" }, - { QtMultimedia::Composer, "composer" }, - { QtMultimedia::Conductor, "conductor" }, - { QtMultimedia::Lyrics, "lyrics" }, - { QtMultimedia::Mood, "mood" }, - { QtMultimedia::TrackNumber, "trackNumber" }, - { QtMultimedia::TrackCount, "trackCount" }, - - { QtMultimedia::CoverArtUrlSmall, "coverArtUrlSmall" }, - { QtMultimedia::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 - { QtMultimedia::Resolution, "resolution" }, - { QtMultimedia::PixelAspectRatio, "pixelAspectRatio" }, + { QtMediaservices::Resolution, "resolution" }, + { QtMediaservices::PixelAspectRatio, "pixelAspectRatio" }, // Video - { QtMultimedia::VideoFrameRate, "videoFrameRate" }, - { QtMultimedia::VideoBitRate, "videoBitRate" }, - { QtMultimedia::VideoCodec, "videoCodec" }, + { QtMediaservices::VideoFrameRate, "videoFrameRate" }, + { QtMediaservices::VideoBitRate, "videoBitRate" }, + { QtMediaservices::VideoCodec, "videoCodec" }, - { QtMultimedia::PosterUrl, "posterUrl" }, + { QtMediaservices::PosterUrl, "posterUrl" }, // Movie - { QtMultimedia::ChapterNumber, "chapterNumber" }, - { QtMultimedia::Director, "director" }, - { QtMultimedia::LeadPerformer, "leadPerformer" }, - { QtMultimedia::Writer, "writer" }, + { QtMediaservices::ChapterNumber, "chapterNumber" }, + { QtMediaservices::Director, "director" }, + { QtMediaservices::LeadPerformer, "leadPerformer" }, + { QtMediaservices::Writer, "writer" }, // Photos - { QtMultimedia::CameraManufacturer, "cameraManufacturer" }, - { QtMultimedia::CameraModel, "cameraModel" }, - { QtMultimedia::Event, "event" }, - { QtMultimedia::Subject, "subject" }, - { QtMultimedia::Orientation, "orientation" }, - { QtMultimedia::ExposureTime, "exposureTime" }, - { QtMultimedia::FNumber, "fNumber" }, - { QtMultimedia::ExposureProgram, "exposureProgram" }, - { QtMultimedia::ISOSpeedRatings, "isoSpeedRatings" }, - { QtMultimedia::ExposureBiasValue, "exposureBiasValue" }, - { QtMultimedia::DateTimeOriginal, "dateTimeOriginal" }, - { QtMultimedia::DateTimeDigitized, "dateTimeDigitized" }, - { QtMultimedia::SubjectDistance, "subjectDistance" }, - { QtMultimedia::MeteringMode, "meteringMode" }, - { QtMultimedia::LightSource, "lightSource" }, - { QtMultimedia::Flash, "flash" }, - { QtMultimedia::FocalLength, "focalLength" }, - { QtMultimedia::ExposureMode, "exposureMode" }, - { QtMultimedia::WhiteBalance, "whiteBalance" }, - { QtMultimedia::DigitalZoomRatio, "digitalZoomRatio" }, - { QtMultimedia::FocalLengthIn35mmFilm, "focalLengthIn35mmFilm" }, - { QtMultimedia::SceneCaptureType, "sceneCaptureType" }, - { QtMultimedia::GainControl, "gainControl" }, - { QtMultimedia::Contrast, "contrast" }, - { QtMultimedia::Saturation, "saturation" }, - { QtMultimedia::Sharpness, "sharpness" }, - { QtMultimedia::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 c381f2d..128eaa4 100644 --- a/src/imports/multimedia/qmetadatacontrolmetaobject_p.h +++ b/src/imports/multimedia/qmetadatacontrolmetaobject_p.h @@ -54,7 +54,7 @@ // #include <QtCore/qmetaobject.h> -#include <QtMultimedia/qtmedianamespace.h> +#include <QtMediaservices/qtmedianamespace.h> #include <QtCore/private/qobject_p.h> diff --git a/src/multimedia/base/base.pri b/src/multimedia/mediaservices/base/base.pri index 49eca49..49eca49 100644 --- a/src/multimedia/base/base.pri +++ b/src/multimedia/mediaservices/base/base.pri diff --git a/src/multimedia/base/qgraphicsvideoitem.cpp b/src/multimedia/mediaservices/base/qgraphicsvideoitem.cpp index f903eb7..05070f8 100644 --- a/src/multimedia/base/qgraphicsvideoitem.cpp +++ b/src/multimedia/mediaservices/base/qgraphicsvideoitem.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMultimedia module of the Qt Toolkit. +** This file is part of the QtMediaservies module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -39,13 +39,13 @@ ** ****************************************************************************/ -#include <QtMultimedia/qgraphicsvideoitem.h> +#include <QtMediaservices/qgraphicsvideoitem.h> -#include <QtMultimedia/qmediaobject.h> -#include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/private/qpaintervideosurface_p.h> -#include <QtMultimedia/qvideooutputcontrol.h> -#include <QtMultimedia/qvideorenderercontrol.h> +#include <QtMediaservices/qmediaobject.h> +#include <QtMediaservices/qmediaservice.h> +#include <QtMediaservices/private/qpaintervideosurface_p.h> +#include <QtMediaservices/qvideooutputcontrol.h> +#include <QtMediaservices/qvideorenderercontrol.h> #include <QtMultimedia/qvideosurfaceformat.h> #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1) diff --git a/src/multimedia/base/qgraphicsvideoitem.h b/src/multimedia/mediaservices/base/qgraphicsvideoitem.h index e6f0d81..c0d8f7a 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtGui/qgraphicsitem.h> -#include <QtMultimedia/qvideowidget.h> +#include <QtMediaservices/qvideowidget.h> QT_BEGIN_HEADER diff --git a/src/multimedia/base/qlocalmediaplaylistprovider.cpp b/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.cpp index 40ff1fc..818b285 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qlocalmediaplaylistprovider.h> +#include <QtMediaservices/qlocalmediaplaylistprovider.h> #include "qmediaplaylistprovider_p.h" -#include <QtMultimedia/qmediacontent.h> +#include <QtMediaservices/qmediacontent.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/base/qlocalmediaplaylistprovider.h b/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.h index db8deb1..73ff82d 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qmediaplaylistprovider.h> +#include <QtMediaservices/qmediaplaylistprovider.h> QT_BEGIN_HEADER diff --git a/src/multimedia/base/qmediacontent.cpp b/src/multimedia/mediaservices/base/qmediacontent.cpp index b6bf56b..f89e901 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qurl.h> #include <QtCore/qvariant.h> -#include <qmediacontent.h> +#include <QtMediaservices/qmediacontent.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/base/qmediacontent.h b/src/multimedia/mediaservices/base/qmediacontent.h index 5a279c1..20f0525 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qmetatype.h> #include <QtCore/qshareddata.h> -#include <QtMultimedia/qmediaresource.h> +#include <QtMediaservices/qmediaresource.h> #include <QtNetwork/qnetworkrequest.h> diff --git a/src/multimedia/base/qmediacontrol.cpp b/src/multimedia/mediaservices/base/qmediacontrol.cpp index b84c49e..98db9fe 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qmetaobject.h> #include <QtCore/qtimer.h> -#include <QtMultimedia/qmediacontrol.h> -#include "qmediacontrol_p.h" +#include <QtMediaservices//qmediacontrol.h> +#include <QtMediaservices/private/qmediacontrol_p.h> diff --git a/src/multimedia/base/qmediacontrol.h b/src/multimedia/mediaservices/base/qmediacontrol.h index 8ed9fe8..be5d95d 100644 --- a/src/multimedia/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 QtMultimedia 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/base/qmediacontrol_p.h b/src/multimedia/mediaservices/base/qmediacontrol_p.h index 4d00f11..ad7e947 100644 --- a/src/multimedia/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 QtMultimedia 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/base/qmediaobject.cpp b/src/multimedia/mediaservices/base/qmediaobject.cpp index 0422718..3d92b12 100644 --- a/src/multimedia/base/qmediaobject.cpp +++ b/src/multimedia/mediaservices/base/qmediaobject.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtMultimedia module of the Qt Toolkit. +** This file is part of the QtMediaservics module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -43,8 +43,8 @@ #include "qmediaobject_p.h" -#include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmetadatacontrol.h> +#include <QtMediaservices/qmediaservice.h> +#include <QtMediaservices/qmetadatacontrol.h> QT_BEGIN_NAMESPACE @@ -97,9 +97,9 @@ QMediaObject::~QMediaObject() Returns the service availability error state. */ -QtMultimedia::AvailabilityError QMediaObject::availabilityError() const +QtMediaservices::AvailabilityError QMediaObject::availabilityError() const { - return QtMultimedia::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(QtMultimedia::MetaData key) const +QVariant QMediaObject::metaData(QtMediaservices::MetaData key) const { Q_D(const QMediaObject); @@ -318,7 +318,7 @@ QVariant QMediaObject::metaData(QtMultimedia::MetaData key) const /*! Sets a \a value for a meta-data \a key. */ -void QMediaObject::setMetaData(QtMultimedia::MetaData key, const QVariant &value) +void QMediaObject::setMetaData(QtMediaservices::MetaData key, const QVariant &value) { Q_D(QMediaObject); @@ -329,13 +329,13 @@ void QMediaObject::setMetaData(QtMultimedia::MetaData key, const QVariant &value /*! Returns a list of keys there is meta-data available for. */ -QList<QtMultimedia::MetaData> QMediaObject::availableMetaData() const +QList<QtMediaservices::MetaData> QMediaObject::availableMetaData() const { Q_D(const QMediaObject); return d->metaDataControl ? d->metaDataControl->availableMetaData() - : QList<QtMultimedia::MetaData>(); + : QList<QtMediaservices::MetaData>(); } /*! diff --git a/src/multimedia/base/qmediaobject.h b/src/multimedia/mediaservices/base/qmediaobject.h index d09b1af..461e056 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qobject.h> #include <QtCore/qstringlist.h> -#include <QtMultimedia/qtmedianamespace.h> +#include <QtMediaservices/qtmedianamespace.h> QT_BEGIN_HEADER @@ -67,7 +67,7 @@ public: ~QMediaObject(); virtual bool isAvailable() const; - virtual QtMultimedia::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(QtMultimedia::MetaData key) const; - void setMetaData(QtMultimedia::MetaData key, const QVariant &value); - QList<QtMultimedia::MetaData> availableMetaData() const; + QVariant metaData(QtMediaservices::MetaData key) const; + void setMetaData(QtMediaservices::MetaData key, const QVariant &value); + QList<QtMediaservices::MetaData> availableMetaData() const; QVariant extendedMetaData(const QString &key) const; void setExtendedMetaData(const QString &key, const QVariant &value); diff --git a/src/multimedia/base/qmediaobject_p.h b/src/multimedia/mediaservices/base/qmediaobject_p.h index ec2f75a..4589f03 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qset.h> #include <QtCore/qtimer.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMediaservices/qmediaobject.h> QT_BEGIN_HEADER diff --git a/src/multimedia/base/qmediaplaylist.cpp b/src/multimedia/mediaservices/base/qmediaplaylist.cpp index b3f3dd3..174a8ac 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qcoreevent.h> #include <QtCore/qcoreapplication.h> -#include <QtMultimedia/qmediaplaylist.h> +#include <QtMediaservices/qmediaplaylist.h> #include "qmediaplaylist_p.h" -#include <QtMultimedia/qmediaplaylistprovider.h> -#include <QtMultimedia/qlocalmediaplaylistprovider.h> -#include <QtMultimedia/qmediaplaylistioplugin.h> -#include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaplaylistcontrol.h> -#include <QtMultimedia/qmediaplayercontrol.h> +#include <QtMediaservices/qmediaplaylistprovider.h> +#include <QtMediaservices/qlocalmediaplaylistprovider.h> +#include <QtMediaservices/qmediaplaylistioplugin.h> +#include <QtMediaservices/qmediaservice.h> +#include <QtMediaservices/qmediaplaylistcontrol.h> +#include <QtMediaservices/qmediaplayercontrol.h> #include "qmediapluginloader_p.h" diff --git a/src/multimedia/base/qmediaplaylist.h b/src/multimedia/mediaservices/base/qmediaplaylist.h index 494cf11..132b58c 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qobject.h> -#include <QtMultimedia/qmediacontent.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMediaservices/qmediacontent.h> +#include <QtMediaservices/qmediaobject.h> QT_BEGIN_HEADER diff --git a/src/multimedia/base/qmediaplaylist_p.h b/src/multimedia/mediaservices/base/qmediaplaylist_p.h index da529b7..57c2723 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qmediaplaylist.h> -#include <QtMultimedia/qmediaplaylistcontrol.h> -#include <QtMultimedia/qmediaplayer.h> -#include <QtMultimedia/qmediaplayercontrol.h> -#include <QtMultimedia/qlocalmediaplaylistprovider.h> +#include <QtMediaservices/qmediaplaylist.h> +#include <QtMediaservices/qmediaplaylistcontrol.h> +#include <QtMediaservices/qmediaplayer.h> +#include <QtMediaservices/qmediaplayercontrol.h> +#include <QtMediaservices/qlocalmediaplaylistprovider.h> #include "qmediaobject_p.h" #include <QtCore/qdebug.h> diff --git a/src/multimedia/base/qmediaplaylistcontrol.cpp b/src/multimedia/mediaservices/base/qmediaplaylistcontrol.cpp index ba3d224..6f3b2fe 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qmediaplaylistcontrol.h> +#include <QtMediaservices/qmediaplaylistcontrol.h> #include "qmediacontrol_p.h" diff --git a/src/multimedia/base/qmediaplaylistcontrol.h b/src/multimedia/mediaservices/base/qmediaplaylistcontrol.h index 228ee19..cf489e3 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmediaplaylistnavigator.h> +#include <QtMediaservices/qmediacontrol.h> +#include <QtMediaservices/qmediaplaylistnavigator.h> QT_BEGIN_HEADER diff --git a/src/multimedia/base/qmediaplaylistioplugin.cpp b/src/multimedia/mediaservices/base/qmediaplaylistioplugin.cpp index 48fd721..ba5dc81 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qmediaplaylistioplugin.h> +#include <QtMediaservices/qmediaplaylistioplugin.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/base/qmediaplaylistioplugin.h b/src/multimedia/mediaservices/base/qmediaplaylistioplugin.h index e55298d..6bc0418 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> -#include <QtMultimedia/qmediacontent.h> +#include <QtMediaservices/qmediacontent.h> QT_BEGIN_HEADER diff --git a/src/multimedia/base/qmediaplaylistnavigator.cpp b/src/multimedia/mediaservices/base/qmediaplaylistnavigator.cpp index 0c52c71..134ae77 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qmediaplaylistnavigator.h> -#include <QtMultimedia/qmediaplaylistprovider.h> -#include <QtMultimedia/qmediaplaylist.h> +#include <QtMediaservices/qmediaplaylistnavigator.h> +#include <QtMediaservices/qmediaplaylistprovider.h> +#include <QtMediaservices/qmediaplaylist.h> #include "qmediaobject_p.h" #include <QtCore/qdebug.h> diff --git a/src/multimedia/base/qmediaplaylistnavigator.h b/src/multimedia/mediaservices/base/qmediaplaylistnavigator.h index 73789af..b6d3d96 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qobject.h> -#include <QtMultimedia/qmediaplaylistprovider.h> -#include <QtMultimedia/qmediaplaylist.h> +#include <QtMediaservices/qmediaplaylistprovider.h> +#include <QtMediaservices/qmediaplaylist.h> QT_BEGIN_HEADER diff --git a/src/multimedia/base/qmediaplaylistprovider.cpp b/src/multimedia/mediaservices/base/qmediaplaylistprovider.cpp index 942f155..c546899 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qurl.h> -#include <QtMultimedia/qmediaplaylistprovider.h> +#include <QtMediaservices/qmediaplaylistprovider.h> #include "qmediaplaylistprovider_p.h" diff --git a/src/multimedia/base/qmediaplaylistprovider.h b/src/multimedia/mediaservices/base/qmediaplaylistprovider.h index b8f07d1..4929287 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qobject.h> -#include <QtMultimedia/qmediacontent.h> -#include <QtMultimedia/qmediaplaylist.h> +#include <QtMediaservices/qmediacontent.h> +#include <QtMediaservices/qmediaplaylist.h> QT_BEGIN_HEADER diff --git a/src/multimedia/base/qmediaplaylistprovider_p.h b/src/multimedia/mediaservices/base/qmediaplaylistprovider_p.h index aaf6deb..03f72ac 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qmediaplaylist.h> +#include <QtMediaservices/qmediaplaylist.h> QT_BEGIN_HEADER diff --git a/src/multimedia/base/qmediapluginloader.cpp b/src/multimedia/mediaservices/base/qmediapluginloader.cpp index eaf6218..a1975ab 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qdir.h> #include <QtCore/qdebug.h> -#include <QtMultimedia/qmediaserviceproviderplugin.h> +#include <QtMediaservices/qmediaserviceproviderplugin.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/base/qmediapluginloader_p.h b/src/multimedia/mediaservices/base/qmediapluginloader_p.h index 351d2f1..194f6ee 100644 --- a/src/multimedia/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 QtMultimedia 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/base/qmediaresource.cpp b/src/multimedia/mediaservices/base/qmediaresource.cpp index 646d9a7..9577092 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qurl.h> #include <QtCore/qvariant.h> -#include <QtMultimedia/qmediaresource.h> +#include <QtMediaservices/qmediaresource.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/base/qmediaresource.h b/src/multimedia/mediaservices/base/qmediaresource.h index a535bbd..69078cc 100644 --- a/src/multimedia/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 QtMultimedia 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/base/qmediaservice.cpp b/src/multimedia/mediaservices/base/qmediaservice.cpp index d9e980b..5d522dc 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qtimer.h> -#include <QtMultimedia/qmediaservice.h> +#include <QtMediaservices/qmediaservice.h> #include "qmediaservice_p.h" diff --git a/src/multimedia/base/qmediaservice.h b/src/multimedia/mediaservices/base/qmediaservice.h index c53a15f..060019b 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qobject.h> #include <QtCore/qstringlist.h> -#include <QtMultimedia/qmediacontrol.h> +#include <QtMediaservices/qmediacontrol.h> QT_BEGIN_HEADER diff --git a/src/multimedia/base/qmediaservice_p.h b/src/multimedia/mediaservices/base/qmediaservice_p.h index 7dbcd8a..e60e669 100644 --- a/src/multimedia/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 QtMultimedia 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/base/qmediaserviceprovider.cpp b/src/multimedia/mediaservices/base/qmediaserviceprovider.cpp index b089b39..48d245d 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qdebug.h> #include <QtCore/qmap.h> -#include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaserviceprovider.h> -#include <QtMultimedia/qmediaserviceproviderplugin.h> +#include <QtMediaservices/qmediaservice.h> +#include <QtMediaservices/qmediaserviceprovider.h> +#include <QtMediaservices/qmediaserviceproviderplugin.h> #include "qmediapluginloader_p.h" -#include <QtMultimedia/qmediaplayer.h> +#include <QtMediaservices/qmediaplayer.h> QT_BEGIN_NAMESPACE @@ -337,9 +337,9 @@ public: } break; case QMediaServiceProviderHint::ContentType: { - QtMultimedia::SupportEstimate estimate = QtMultimedia::NotSupported; + QtMediaservices::SupportEstimate estimate = QtMediaservices::NotSupported; foreach (QMediaServiceProviderPlugin *currentPlugin, plugins) { - QtMultimedia::SupportEstimate currentEstimate = QtMultimedia::MaybeSupported; + QtMediaservices::SupportEstimate currentEstimate = QtMediaservices::MaybeSupported; QMediaServiceSupportedFormatsInterface *iface = qobject_cast<QMediaServiceSupportedFormatsInterface*>(currentPlugin); @@ -350,7 +350,7 @@ public: estimate = currentEstimate; plugin = currentPlugin; - if (currentEstimate == QtMultimedia::PreferredService) + if (currentEstimate == QtMediaservices::PreferredService) break; } } @@ -381,7 +381,7 @@ public: } } - QtMultimedia::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 QtMultimedia::NotSupported; + return QtMediaservices::NotSupported; bool allServicesProvideInterface = true; - QtMultimedia::SupportEstimate supportEstimate = QtMultimedia::NotSupported; + QtMediaservices::SupportEstimate supportEstimate = QtMediaservices::NotSupported; foreach(QObject *obj, instances) { QMediaServiceSupportedFormatsInterface *iface = @@ -427,12 +427,12 @@ public: } //don't return PreferredService - supportEstimate = qMin(supportEstimate, QtMultimedia::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(QtMultimedia::MaybeSupported, supportEstimate); + supportEstimate = qMax(QtMediaservices::MaybeSupported, supportEstimate); return supportEstimate; } @@ -540,13 +540,13 @@ Q_GLOBAL_STATIC(QPluginServiceProvider, pluginProvider); */ /*! - \fn QtMultimedia::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. */ -QtMultimedia::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 @@ QtMultimedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray Q_UNUSED(codecs); Q_UNUSED(flags); - return QtMultimedia::MaybeSupported; + return QtMediaservices::MaybeSupported; } /*! diff --git a/src/multimedia/base/qmediaserviceprovider.h b/src/multimedia/mediaservices/base/qmediaserviceprovider.h index 6e31493..45021c7 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qobject.h> #include <QtCore/qshareddata.h> -#include <QtMultimedia/qtmedianamespace.h> +#include <QtMediaservices/qtmedianamespace.h> 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 QtMultimedia::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/base/qmediaserviceproviderplugin.h b/src/multimedia/mediaservices/base/qmediaserviceproviderplugin.h index b1e728b..bc41845 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> -#include <QtMultimedia/qmediaserviceprovider.h> +#include <QtMediaservices/qmediaserviceprovider.h> #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 QtMultimedia::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/base/qmediatimerange.cpp b/src/multimedia/mediaservices/base/qmediatimerange.cpp index e1cea7e..74f54dd 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qmediatimerange.h> +#include <QtMediaservices/qmediatimerange.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/base/qmediatimerange.h b/src/multimedia/mediaservices/base/qmediatimerange.h index a65629e..94beaad 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qshareddata.h> -#include <QtMultimedia/qtmedianamespace.h> +#include <QtMediaservices/qtmedianamespace.h> QT_BEGIN_HEADER diff --git a/src/multimedia/base/qmetadatacontrol.cpp b/src/multimedia/mediaservices/base/qmetadatacontrol.cpp index 28a82ec..32be987 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qmetadatacontrol.h> +#include <QtMediaservices/qmetadatacontrol.h> #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 - QtMultimedia::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(QtMultimedia::MetaData key) const + \fn QVariant QMetaDataControl::metaData(QtMediaservices::MetaData key) const Returns the meta-data for the given \a key. */ /*! - \fn void QMetaDataControl::setMetaData(QtMultimedia::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/base/qmetadatacontrol.h b/src/multimedia/mediaservices/base/qmetadatacontrol.h index 8e18c16..cf4a0d3 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmediaobject.h> -#include <QtMultimedia/qmediaresource.h> +#include <QtMediaservices/qmediacontrol.h> +#include <QtMediaservices/qmediaobject.h> +#include <QtMediaservices/qmediaresource.h> QT_BEGIN_HEADER @@ -63,9 +63,9 @@ public: virtual bool isWritable() const = 0; virtual bool isMetaDataAvailable() const = 0; - virtual QVariant metaData(QtMultimedia::MetaData key) const = 0; - virtual void setMetaData(QtMultimedia::MetaData key, const QVariant &value) = 0; - virtual QList<QtMultimedia::MetaData> availableMetaData() const = 0; + virtual QVariant metaData(QtMediaservices::MetaData key) const = 0; + virtual void setMetaData(QtMediaservices::MetaData key, const QVariant &value) = 0; + virtual QList<QtMediaservices::MetaData> 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/base/qpaintervideosurface.cpp b/src/multimedia/mediaservices/base/qpaintervideosurface.cpp index 2fe941b..b3e0dd5 100644 --- a/src/multimedia/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 QtMultimedia 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/base/qpaintervideosurface_mac.mm b/src/multimedia/mediaservices/base/qpaintervideosurface_mac.mm index 1154f86..1154f86 100644 --- a/src/multimedia/base/qpaintervideosurface_mac.mm +++ b/src/multimedia/mediaservices/base/qpaintervideosurface_mac.mm diff --git a/src/multimedia/base/qpaintervideosurface_mac_p.h b/src/multimedia/mediaservices/base/qpaintervideosurface_mac_p.h index 64442ed..13c22c2 100644 --- a/src/multimedia/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 QtMultimedia 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/base/qpaintervideosurface_p.h b/src/multimedia/mediaservices/base/qpaintervideosurface_p.h index caba3ba..de9c24a 100644 --- a/src/multimedia/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 QtMultimedia 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/base/qtmedianamespace.h b/src/multimedia/mediaservices/base/qtmedianamespace.h index 1e04da8..7db7aa8 100644 --- a/src/multimedia/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 QtMultimedia 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 QtMultimedia +namespace QtMediaservices { enum MetaData { diff --git a/src/multimedia/base/qtmedianamespace.qdoc b/src/multimedia/mediaservices/base/qtmedianamespace.qdoc index 277b1a5..277b1a5 100644 --- a/src/multimedia/base/qtmedianamespace.qdoc +++ b/src/multimedia/mediaservices/base/qtmedianamespace.qdoc diff --git a/src/multimedia/base/qvideodevicecontrol.cpp b/src/multimedia/mediaservices/base/qvideodevicecontrol.cpp index c0fe9a8..128cee9 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qvideodevicecontrol.h> +#include <QtMediaservices/qvideodevicecontrol.h> QT_BEGIN_HEADER diff --git a/src/multimedia/base/qvideodevicecontrol.h b/src/multimedia/mediaservices/base/qvideodevicecontrol.h index ce99fd1..df1d4fa 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qmediacontrol.h> +#include <QtMediaservices/qmediacontrol.h> QT_BEGIN_HEADER diff --git a/src/multimedia/base/qvideooutputcontrol.cpp b/src/multimedia/mediaservices/base/qvideooutputcontrol.cpp index 58f1527..7d7ed4b 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qvideooutputcontrol.h> +#include <QtMediaservices/qvideooutputcontrol.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/base/qvideooutputcontrol.h b/src/multimedia/mediaservices/base/qvideooutputcontrol.h index 805da58..05bc164 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qmediacontrol.h> +#include <QtMediaservices/qmediacontrol.h> QT_BEGIN_HEADER diff --git a/src/multimedia/base/qvideorenderercontrol.cpp b/src/multimedia/mediaservices/base/qvideorenderercontrol.cpp index a34ef9b..bd7c78d 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qvideorenderercontrol.h> +#include <QtMediaservices/qvideorenderercontrol.h> #include "qmediacontrol_p.h" diff --git a/src/multimedia/base/qvideorenderercontrol.h b/src/multimedia/mediaservices/base/qvideorenderercontrol.h index f5ba83e..fd130ac 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qmediacontrol.h> +#include <QtMediaservices/qmediacontrol.h> QT_BEGIN_HEADER diff --git a/src/multimedia/base/qvideowidget.cpp b/src/multimedia/mediaservices/base/qvideowidget.cpp index b791abd..52291b0 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qmediaobject.h> -#include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qvideooutputcontrol.h> -#include <QtMultimedia/qvideowindowcontrol.h> -#include <QtMultimedia/qvideowidgetcontrol.h> +#include <QtMediaservices/qmediaobject.h> +#include <QtMediaservices/qmediaservice.h> +#include <QtMediaservices/qvideooutputcontrol.h> +#include <QtMediaservices/qvideowindowcontrol.h> +#include <QtMediaservices/qvideowidgetcontrol.h> #include "qpaintervideosurface_p.h" -#include <QtMultimedia/qvideorenderercontrol.h> +#include <QtMediaservices/qvideorenderercontrol.h> #include <QtMultimedia/qvideosurfaceformat.h> #include <qpainter.h> diff --git a/src/multimedia/base/qvideowidget.h b/src/multimedia/mediaservices/base/qvideowidget.h index 4b24bcb..080e19c 100644 --- a/src/multimedia/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 QtMultimedia 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/base/qvideowidget_p.h b/src/multimedia/mediaservices/base/qvideowidget_p.h index 44fd1cd..4f67117 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qvideowidget.h> +#include <QtMediaservices/qvideowidget.h> #ifndef QT_NO_OPENGL #include <QGLWidget> diff --git a/src/multimedia/base/qvideowidgetcontrol.cpp b/src/multimedia/mediaservices/base/qvideowidgetcontrol.cpp index e8957dc..1cc7eaf 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qvideowidgetcontrol.h> +#include <QtMediaservices/qvideowidgetcontrol.h> #include "qmediacontrol_p.h" diff --git a/src/multimedia/base/qvideowidgetcontrol.h b/src/multimedia/mediaservices/base/qvideowidgetcontrol.h index 4c0a6c6..a8105ac 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtGui/qwidget.h> -#include <QtMultimedia/qvideowidget.h> -#include <QtMultimedia/qmediacontrol.h> +#include <QtMediaservices/qvideowidget.h> +#include <QtMediaservices/qmediacontrol.h> QT_BEGIN_HEADER diff --git a/src/multimedia/base/qvideowindowcontrol.cpp b/src/multimedia/mediaservices/base/qvideowindowcontrol.cpp index c74a0d5..f73b187 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qvideowindowcontrol.h> +#include <QtMediaservices/qvideowindowcontrol.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/base/qvideowindowcontrol.h b/src/multimedia/mediaservices/base/qvideowindowcontrol.h index 53f7b0e..0fabce9 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtGui/qwidget.h> -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qvideowidget.h> +#include <QtMediaservices/qmediacontrol.h> +#include <QtMediaservices/qvideowidget.h> QT_BEGIN_HEADER diff --git a/src/multimedia/effects/effects.pri b/src/multimedia/mediaservices/effects/effects.pri index 6307255..6307255 100644 --- a/src/multimedia/effects/effects.pri +++ b/src/multimedia/mediaservices/effects/effects.pri diff --git a/src/multimedia/effects/qsoundeffect.cpp b/src/multimedia/mediaservices/effects/qsoundeffect.cpp index 8a38103..8a38103 100644 --- a/src/multimedia/effects/qsoundeffect.cpp +++ b/src/multimedia/mediaservices/effects/qsoundeffect.cpp diff --git a/src/multimedia/effects/qsoundeffect_p.h b/src/multimedia/mediaservices/effects/qsoundeffect_p.h index 05207a0..8c8985a 100644 --- a/src/multimedia/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 QtMultimedia 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/effects/qsoundeffect_pulse_p.cpp b/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.cpp index e379259..e834280 100644 --- a/src/multimedia/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 QtMultimedia 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 @@ // #include <QtCore/qcoreapplication.h> -#include <QtMultimedia/qaudioformat.h> +#include <QtMediaservices/qaudioformat.h> #include <QtNetwork> #include <QTime> diff --git a/src/multimedia/effects/qsoundeffect_pulse_p.h b/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.h index aff729c..ef6bff1 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qobject.h> #include <QtCore/qdatetime.h> -#include <QtMultimedia/qmediaplayer.h> +#include <QtMediaservices/qmediaplayer.h> #include <pulse/pulseaudio.h> diff --git a/src/multimedia/effects/qsoundeffect_qmedia_p.cpp b/src/multimedia/mediaservices/effects/qsoundeffect_qmedia_p.cpp index 36c36dd..8cc2675 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qcoreapplication.h> -#include <QtMultimedia/qmediacontent.h> -#include <QtMultimedia/qmediaplayer.h> +#include <QtMediaservices/qmediacontent.h> +#include <QtMediaservices/qmediaplayer.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/effects/qsoundeffect_qmedia_p.h b/src/multimedia/mediaservices/effects/qsoundeffect_qmedia_p.h index 6ad9d79..5abdcad 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qobject.h> #include <QtCore/qurl.h> -#include <QtMultimedia/qmediaplayer.h> +#include <QtMediaservices/qmediaplayer.h> QT_BEGIN_HEADER diff --git a/src/multimedia/effects/qsoundeffect_qsound_p.cpp b/src/multimedia/mediaservices/effects/qsoundeffect_qsound_p.cpp index ff30f67..7746f0c 100644 --- a/src/multimedia/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 QtMultimedia 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/effects/qsoundeffect_qsound_p.h b/src/multimedia/mediaservices/effects/qsoundeffect_qsound_p.h index 6fb3cfa..133e6ec 100644 --- a/src/multimedia/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 QtMultimedia 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/effects/wavedecoder_p.cpp b/src/multimedia/mediaservices/effects/wavedecoder_p.cpp index b534ded..2208461 100644 --- a/src/multimedia/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 QtMultimedia 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/effects/wavedecoder_p.h b/src/multimedia/mediaservices/effects/wavedecoder_p.h index c1892bb..bb22907 100644 --- a/src/multimedia/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 QtMultimedia 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 new file mode 100644 index 0000000..908f60a --- /dev/null +++ b/src/multimedia/mediaservices/mediaservices.pro @@ -0,0 +1,16 @@ +TARGET = QtMediaservices +QPRO_PWD = $$PWD +QT = core gui multimedia + +DEFINES += QT_BUILD_MEDIASERVICES_LIB QT_NO_USING_NAMESPACE + +unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtMultimedia + +include(../../qbase.pri) + +include(base/base.pri) +include(playback/playback.pri) +include(effects/effects.pri) + +symbian: TARGET.UID3 = 0x2001E631 + diff --git a/src/multimedia/playback/playback.pri b/src/multimedia/mediaservices/playback/playback.pri index 09a81c9..09a81c9 100644 --- a/src/multimedia/playback/playback.pri +++ b/src/multimedia/mediaservices/playback/playback.pri diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/mediaservices/playback/qmediaplayer.cpp index 9466cad..676a6eb 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qpointer.h> #include <QtCore/qdebug.h> -#include <QtMultimedia/qmediaplayer.h> +#include <QtMediaservices/qmediaplayer.h> -#include <QtMultimedia/private/qmediaobject_p.h> -#include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaplayercontrol.h> -#include <QtMultimedia/qmediaserviceprovider.h> -#include <QtMultimedia/qmediaplaylist.h> -#include <QtMultimedia/qmediaplaylistcontrol.h> -#include <QtMultimedia/qvideowidget.h> -#include <QtMultimedia/qgraphicsvideoitem.h> +#include <QtMediaservices/private/qmediaobject_p.h> +#include <QtMediaservices/qmediaservice.h> +#include <QtMediaservices/qmediaplayercontrol.h> +#include <QtMediaservices/qmediaserviceprovider.h> +#include <QtMediaservices/qmediaplaylist.h> +#include <QtMediaservices/qmediaplaylistcontrol.h> +#include <QtMediaservices/qvideowidget.h> +#include <QtMediaservices/qgraphicsvideoitem.h> //#define DEBUG_PLAYER_STATE @@ -668,7 +668,7 @@ void QMediaPlayer::unbind(QObject *obj) The \a flags argument allows additional requirements such as performance indicators to be specified. */ -QtMultimedia::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType, +QtMediaservices::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType, const QStringList& codecs, Flags flags) { diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/mediaservices/playback/qmediaplayer.h index 129b244..2b4c443 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qmediaserviceprovider.h> -#include <QtMultimedia/qmediaobject.h> -#include <QtMultimedia/qmediacontent.h> +#include <QtMediaservices/qmediaserviceprovider.h> +#include <QtMediaservices/qmediaobject.h> +#include <QtMediaservices/qmediacontent.h> QT_BEGIN_HEADER @@ -117,7 +117,7 @@ public: QMediaPlayer(QObject *parent = 0, Flags flags = 0, QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider()); ~QMediaPlayer(); - static QtMultimedia::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/playback/qmediaplayercontrol.cpp b/src/multimedia/mediaservices/playback/qmediaplayercontrol.cpp index 2129098..3b63d93 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtMultimedia/qmediaplayercontrol.h> -#include <QtMultimedia/private/qmediacontrol_p.h> -#include <QtMultimedia/qmediaplayer.h> +#include <QtMediaservices/qmediaplayercontrol.h> +#include <QtMediaservices/private/qmediacontrol_p.h> +#include <QtMediaservices/qmediaplayer.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/playback/qmediaplayercontrol.h b/src/multimedia/mediaservices/playback/qmediaplayercontrol.h index a7e418b..be10713 100644 --- a/src/multimedia/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 QtMultimedia 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 <QtCore/qpair.h> -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmediaplayer.h> -#include <QtMultimedia/qmediatimerange.h> +#include <QtMediaservices/qmediacontrol.h> +#include <QtMediaservices/qmediaplayer.h> +#include <QtMediaservices/qmediatimerange.h> QT_BEGIN_HEADER diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 500aff7..8cdcb38 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -1,17 +1,8 @@ -TARGET = QtMultimedia -QPRO_PWD = $$PWD -QT = core gui +TEMPLATE = subdirs -DEFINES += QT_BUILD_MULTIMEDIA_LIB QT_NO_USING_NAMESPACE +contains(QT_CONFIG, multimedia) { + SUBDIRS += multimedia -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui + contains(QT_CONFIG, mediaservices):SUBDIRS += mediaservices +} -include(../qbase.pri) - -include(audio/audio.pri) -include(video/video.pri) -include(base/base.pri) -include(playback/playback.pri) -include(effects/effects.pri) - -symbian: TARGET.UID3 = 0x2001E627 diff --git a/src/multimedia/audio/audio.pri b/src/multimedia/multimedia/audio/audio.pri index ae28a26..ae28a26 100644 --- a/src/multimedia/audio/audio.pri +++ b/src/multimedia/multimedia/audio/audio.pri diff --git a/src/multimedia/audio/qaudio.cpp b/src/multimedia/multimedia/audio/qaudio.cpp index e0f24ce..e0f24ce 100644 --- a/src/multimedia/audio/qaudio.cpp +++ b/src/multimedia/multimedia/audio/qaudio.cpp diff --git a/src/multimedia/audio/qaudio.h b/src/multimedia/multimedia/audio/qaudio.h index 9ca1dff..9ca1dff 100644 --- a/src/multimedia/audio/qaudio.h +++ b/src/multimedia/multimedia/audio/qaudio.h diff --git a/src/multimedia/audio/qaudio_mac.cpp b/src/multimedia/multimedia/audio/qaudio_mac.cpp index 14fee8b..14fee8b 100644 --- a/src/multimedia/audio/qaudio_mac.cpp +++ b/src/multimedia/multimedia/audio/qaudio_mac.cpp diff --git a/src/multimedia/audio/qaudio_mac_p.h b/src/multimedia/multimedia/audio/qaudio_mac_p.h index 4e7d688..4e7d688 100644 --- a/src/multimedia/audio/qaudio_mac_p.h +++ b/src/multimedia/multimedia/audio/qaudio_mac_p.h diff --git a/src/multimedia/audio/qaudio_symbian_p.cpp b/src/multimedia/multimedia/audio/qaudio_symbian_p.cpp index 58e3745..58e3745 100644 --- a/src/multimedia/audio/qaudio_symbian_p.cpp +++ b/src/multimedia/multimedia/audio/qaudio_symbian_p.cpp diff --git a/src/multimedia/audio/qaudio_symbian_p.h b/src/multimedia/multimedia/audio/qaudio_symbian_p.h index d5238b4..d5238b4 100644 --- a/src/multimedia/audio/qaudio_symbian_p.h +++ b/src/multimedia/multimedia/audio/qaudio_symbian_p.h diff --git a/src/multimedia/audio/qaudiodevicefactory.cpp b/src/multimedia/multimedia/audio/qaudiodevicefactory.cpp index 4f45110..4f45110 100644 --- a/src/multimedia/audio/qaudiodevicefactory.cpp +++ b/src/multimedia/multimedia/audio/qaudiodevicefactory.cpp diff --git a/src/multimedia/audio/qaudiodevicefactory_p.h b/src/multimedia/multimedia/audio/qaudiodevicefactory_p.h index 8ee8b05..8ee8b05 100644 --- a/src/multimedia/audio/qaudiodevicefactory_p.h +++ b/src/multimedia/multimedia/audio/qaudiodevicefactory_p.h diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/multimedia/audio/qaudiodeviceinfo.cpp index ff04b4e..ff04b4e 100644 --- a/src/multimedia/audio/qaudiodeviceinfo.cpp +++ b/src/multimedia/multimedia/audio/qaudiodeviceinfo.cpp diff --git a/src/multimedia/audio/qaudiodeviceinfo.h b/src/multimedia/multimedia/audio/qaudiodeviceinfo.h index 1cc0731..1cc0731 100644 --- a/src/multimedia/audio/qaudiodeviceinfo.h +++ b/src/multimedia/multimedia/audio/qaudiodeviceinfo.h diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimedia/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp index 36270a7..36270a7 100644 --- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp +++ b/src/multimedia/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h b/src/multimedia/multimedia/audio/qaudiodeviceinfo_alsa_p.h index 6f9a459..6f9a459 100644 --- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h +++ b/src/multimedia/multimedia/audio/qaudiodeviceinfo_alsa_p.h diff --git a/src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp b/src/multimedia/multimedia/audio/qaudiodeviceinfo_mac_p.cpp index ecd03e5..ecd03e5 100644 --- a/src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp +++ b/src/multimedia/multimedia/audio/qaudiodeviceinfo_mac_p.cpp diff --git a/src/multimedia/audio/qaudiodeviceinfo_mac_p.h b/src/multimedia/multimedia/audio/qaudiodeviceinfo_mac_p.h index e234384..e234384 100644 --- a/src/multimedia/audio/qaudiodeviceinfo_mac_p.h +++ b/src/multimedia/multimedia/audio/qaudiodeviceinfo_mac_p.h diff --git a/src/multimedia/audio/qaudiodeviceinfo_symbian_p.cpp b/src/multimedia/multimedia/audio/qaudiodeviceinfo_symbian_p.cpp index 36284d3..36284d3 100644 --- a/src/multimedia/audio/qaudiodeviceinfo_symbian_p.cpp +++ b/src/multimedia/multimedia/audio/qaudiodeviceinfo_symbian_p.cpp diff --git a/src/multimedia/audio/qaudiodeviceinfo_symbian_p.h b/src/multimedia/multimedia/audio/qaudiodeviceinfo_symbian_p.h index 89e539f..89e539f 100644 --- a/src/multimedia/audio/qaudiodeviceinfo_symbian_p.h +++ b/src/multimedia/multimedia/audio/qaudiodeviceinfo_symbian_p.h diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/multimedia/audio/qaudiodeviceinfo_win32_p.cpp index aee0807..aee0807 100644 --- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp +++ b/src/multimedia/multimedia/audio/qaudiodeviceinfo_win32_p.cpp diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.h b/src/multimedia/multimedia/audio/qaudiodeviceinfo_win32_p.h index cb6dd91..cb6dd91 100644 --- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.h +++ b/src/multimedia/multimedia/audio/qaudiodeviceinfo_win32_p.h diff --git a/src/multimedia/audio/qaudioengine.cpp b/src/multimedia/multimedia/audio/qaudioengine.cpp index 7f1f5d3..7f1f5d3 100644 --- a/src/multimedia/audio/qaudioengine.cpp +++ b/src/multimedia/multimedia/audio/qaudioengine.cpp diff --git a/src/multimedia/audio/qaudioengine.h b/src/multimedia/multimedia/audio/qaudioengine.h index df9d09d..df9d09d 100644 --- a/src/multimedia/audio/qaudioengine.h +++ b/src/multimedia/multimedia/audio/qaudioengine.h diff --git a/src/multimedia/audio/qaudioengineplugin.cpp b/src/multimedia/multimedia/audio/qaudioengineplugin.cpp index 82324b5..82324b5 100644 --- a/src/multimedia/audio/qaudioengineplugin.cpp +++ b/src/multimedia/multimedia/audio/qaudioengineplugin.cpp diff --git a/src/multimedia/audio/qaudioengineplugin.h b/src/multimedia/multimedia/audio/qaudioengineplugin.h index 2322d2a..2322d2a 100644 --- a/src/multimedia/audio/qaudioengineplugin.h +++ b/src/multimedia/multimedia/audio/qaudioengineplugin.h diff --git a/src/multimedia/audio/qaudioformat.cpp b/src/multimedia/multimedia/audio/qaudioformat.cpp index 86d72f6..86d72f6 100644 --- a/src/multimedia/audio/qaudioformat.cpp +++ b/src/multimedia/multimedia/audio/qaudioformat.cpp diff --git a/src/multimedia/audio/qaudioformat.h b/src/multimedia/multimedia/audio/qaudioformat.h index 6c835b7..6c835b7 100644 --- a/src/multimedia/audio/qaudioformat.h +++ b/src/multimedia/multimedia/audio/qaudioformat.h diff --git a/src/multimedia/audio/qaudioinput.cpp b/src/multimedia/multimedia/audio/qaudioinput.cpp index c99e870..c99e870 100644 --- a/src/multimedia/audio/qaudioinput.cpp +++ b/src/multimedia/multimedia/audio/qaudioinput.cpp diff --git a/src/multimedia/audio/qaudioinput.h b/src/multimedia/multimedia/audio/qaudioinput.h index 5be9b5a..5be9b5a 100644 --- a/src/multimedia/audio/qaudioinput.h +++ b/src/multimedia/multimedia/audio/qaudioinput.h diff --git a/src/multimedia/audio/qaudioinput_alsa_p.cpp b/src/multimedia/multimedia/audio/qaudioinput_alsa_p.cpp index 6b15008..6b15008 100644 --- a/src/multimedia/audio/qaudioinput_alsa_p.cpp +++ b/src/multimedia/multimedia/audio/qaudioinput_alsa_p.cpp diff --git a/src/multimedia/audio/qaudioinput_alsa_p.h b/src/multimedia/multimedia/audio/qaudioinput_alsa_p.h index c907019..c907019 100644 --- a/src/multimedia/audio/qaudioinput_alsa_p.h +++ b/src/multimedia/multimedia/audio/qaudioinput_alsa_p.h diff --git a/src/multimedia/audio/qaudioinput_mac_p.cpp b/src/multimedia/multimedia/audio/qaudioinput_mac_p.cpp index cb65f6e..cb65f6e 100644 --- a/src/multimedia/audio/qaudioinput_mac_p.cpp +++ b/src/multimedia/multimedia/audio/qaudioinput_mac_p.cpp diff --git a/src/multimedia/audio/qaudioinput_mac_p.h b/src/multimedia/multimedia/audio/qaudioinput_mac_p.h index 7aa4168..7aa4168 100644 --- a/src/multimedia/audio/qaudioinput_mac_p.h +++ b/src/multimedia/multimedia/audio/qaudioinput_mac_p.h diff --git a/src/multimedia/audio/qaudioinput_symbian_p.cpp b/src/multimedia/multimedia/audio/qaudioinput_symbian_p.cpp index 52daa88..52daa88 100644 --- a/src/multimedia/audio/qaudioinput_symbian_p.cpp +++ b/src/multimedia/multimedia/audio/qaudioinput_symbian_p.cpp diff --git a/src/multimedia/audio/qaudioinput_symbian_p.h b/src/multimedia/multimedia/audio/qaudioinput_symbian_p.h index ca3ccf7..ca3ccf7 100644 --- a/src/multimedia/audio/qaudioinput_symbian_p.h +++ b/src/multimedia/multimedia/audio/qaudioinput_symbian_p.h diff --git a/src/multimedia/audio/qaudioinput_win32_p.cpp b/src/multimedia/multimedia/audio/qaudioinput_win32_p.cpp index b5d673e..b5d673e 100644 --- a/src/multimedia/audio/qaudioinput_win32_p.cpp +++ b/src/multimedia/multimedia/audio/qaudioinput_win32_p.cpp diff --git a/src/multimedia/audio/qaudioinput_win32_p.h b/src/multimedia/multimedia/audio/qaudioinput_win32_p.h index 66c2535..66c2535 100644 --- a/src/multimedia/audio/qaudioinput_win32_p.h +++ b/src/multimedia/multimedia/audio/qaudioinput_win32_p.h diff --git a/src/multimedia/audio/qaudiooutput.cpp b/src/multimedia/multimedia/audio/qaudiooutput.cpp index b0b5244..b0b5244 100644 --- a/src/multimedia/audio/qaudiooutput.cpp +++ b/src/multimedia/multimedia/audio/qaudiooutput.cpp diff --git a/src/multimedia/audio/qaudiooutput.h b/src/multimedia/multimedia/audio/qaudiooutput.h index 0f45b1b..0f45b1b 100644 --- a/src/multimedia/audio/qaudiooutput.h +++ b/src/multimedia/multimedia/audio/qaudiooutput.h diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/multimedia/audio/qaudiooutput_alsa_p.cpp index cf3726b..cf3726b 100644 --- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp +++ b/src/multimedia/multimedia/audio/qaudiooutput_alsa_p.cpp diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.h b/src/multimedia/multimedia/audio/qaudiooutput_alsa_p.h index e6ac231..e6ac231 100644 --- a/src/multimedia/audio/qaudiooutput_alsa_p.h +++ b/src/multimedia/multimedia/audio/qaudiooutput_alsa_p.h diff --git a/src/multimedia/audio/qaudiooutput_mac_p.cpp b/src/multimedia/multimedia/audio/qaudiooutput_mac_p.cpp index 9689101..9689101 100644 --- a/src/multimedia/audio/qaudiooutput_mac_p.cpp +++ b/src/multimedia/multimedia/audio/qaudiooutput_mac_p.cpp diff --git a/src/multimedia/audio/qaudiooutput_mac_p.h b/src/multimedia/multimedia/audio/qaudiooutput_mac_p.h index 752905c..752905c 100644 --- a/src/multimedia/audio/qaudiooutput_mac_p.h +++ b/src/multimedia/multimedia/audio/qaudiooutput_mac_p.h diff --git a/src/multimedia/audio/qaudiooutput_symbian_p.cpp b/src/multimedia/multimedia/audio/qaudiooutput_symbian_p.cpp index 3f8e933..3f8e933 100644 --- a/src/multimedia/audio/qaudiooutput_symbian_p.cpp +++ b/src/multimedia/multimedia/audio/qaudiooutput_symbian_p.cpp diff --git a/src/multimedia/audio/qaudiooutput_symbian_p.h b/src/multimedia/multimedia/audio/qaudiooutput_symbian_p.h index 00ccb24..00ccb24 100644 --- a/src/multimedia/audio/qaudiooutput_symbian_p.h +++ b/src/multimedia/multimedia/audio/qaudiooutput_symbian_p.h diff --git a/src/multimedia/audio/qaudiooutput_win32_p.cpp b/src/multimedia/multimedia/audio/qaudiooutput_win32_p.cpp index 13bce58..13bce58 100644 --- a/src/multimedia/audio/qaudiooutput_win32_p.cpp +++ b/src/multimedia/multimedia/audio/qaudiooutput_win32_p.cpp diff --git a/src/multimedia/audio/qaudiooutput_win32_p.h b/src/multimedia/multimedia/audio/qaudiooutput_win32_p.h index 68a40f7..68a40f7 100644 --- a/src/multimedia/audio/qaudiooutput_win32_p.h +++ b/src/multimedia/multimedia/audio/qaudiooutput_win32_p.h diff --git a/src/multimedia/multimedia/multimedia.pro b/src/multimedia/multimedia/multimedia.pro new file mode 100644 index 0000000..8d130bd --- /dev/null +++ b/src/multimedia/multimedia/multimedia.pro @@ -0,0 +1,14 @@ +TARGET = QtMultimedia +QPRO_PWD = $$PWD +QT = core gui + +DEFINES += QT_BUILD_MULTIMEDIA_LIB QT_NO_USING_NAMESPACE + +unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui + +include(../../qbase.pri) + +include(audio/audio.pri) +include(video/video.pri) + +symbian: TARGET.UID3 = 0x2001E627 diff --git a/src/multimedia/video/qabstractvideobuffer.cpp b/src/multimedia/multimedia/video/qabstractvideobuffer.cpp index e9d30d0..e9d30d0 100644 --- a/src/multimedia/video/qabstractvideobuffer.cpp +++ b/src/multimedia/multimedia/video/qabstractvideobuffer.cpp diff --git a/src/multimedia/video/qabstractvideobuffer.h b/src/multimedia/multimedia/video/qabstractvideobuffer.h index a8389db..a8389db 100644 --- a/src/multimedia/video/qabstractvideobuffer.h +++ b/src/multimedia/multimedia/video/qabstractvideobuffer.h diff --git a/src/multimedia/video/qabstractvideobuffer_p.h b/src/multimedia/multimedia/video/qabstractvideobuffer_p.h index c72f303..c72f303 100644 --- a/src/multimedia/video/qabstractvideobuffer_p.h +++ b/src/multimedia/multimedia/video/qabstractvideobuffer_p.h diff --git a/src/multimedia/video/qabstractvideosurface.cpp b/src/multimedia/multimedia/video/qabstractvideosurface.cpp index 3dabb6b..3dabb6b 100644 --- a/src/multimedia/video/qabstractvideosurface.cpp +++ b/src/multimedia/multimedia/video/qabstractvideosurface.cpp diff --git a/src/multimedia/video/qabstractvideosurface.h b/src/multimedia/multimedia/video/qabstractvideosurface.h index f2cae17..f2cae17 100644 --- a/src/multimedia/video/qabstractvideosurface.h +++ b/src/multimedia/multimedia/video/qabstractvideosurface.h diff --git a/src/multimedia/video/qabstractvideosurface_p.h b/src/multimedia/multimedia/video/qabstractvideosurface_p.h index 42df112..42df112 100644 --- a/src/multimedia/video/qabstractvideosurface_p.h +++ b/src/multimedia/multimedia/video/qabstractvideosurface_p.h diff --git a/src/multimedia/video/qimagevideobuffer.cpp b/src/multimedia/multimedia/video/qimagevideobuffer.cpp index e3e1585..e3e1585 100644 --- a/src/multimedia/video/qimagevideobuffer.cpp +++ b/src/multimedia/multimedia/video/qimagevideobuffer.cpp diff --git a/src/multimedia/video/qimagevideobuffer_p.h b/src/multimedia/multimedia/video/qimagevideobuffer_p.h index 82075d7..82075d7 100644 --- a/src/multimedia/video/qimagevideobuffer_p.h +++ b/src/multimedia/multimedia/video/qimagevideobuffer_p.h diff --git a/src/multimedia/video/qmemoryvideobuffer.cpp b/src/multimedia/multimedia/video/qmemoryvideobuffer.cpp index 2e892b7..2e892b7 100644 --- a/src/multimedia/video/qmemoryvideobuffer.cpp +++ b/src/multimedia/multimedia/video/qmemoryvideobuffer.cpp diff --git a/src/multimedia/video/qmemoryvideobuffer_p.h b/src/multimedia/multimedia/video/qmemoryvideobuffer_p.h index c66cf93..c66cf93 100644 --- a/src/multimedia/video/qmemoryvideobuffer_p.h +++ b/src/multimedia/multimedia/video/qmemoryvideobuffer_p.h diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/multimedia/video/qvideoframe.cpp index 2d66d9e..2d66d9e 100644 --- a/src/multimedia/video/qvideoframe.cpp +++ b/src/multimedia/multimedia/video/qvideoframe.cpp diff --git a/src/multimedia/video/qvideoframe.h b/src/multimedia/multimedia/video/qvideoframe.h index 668a738..668a738 100644 --- a/src/multimedia/video/qvideoframe.h +++ b/src/multimedia/multimedia/video/qvideoframe.h diff --git a/src/multimedia/video/qvideosurfaceformat.cpp b/src/multimedia/multimedia/video/qvideosurfaceformat.cpp index 1fc13a6..1fc13a6 100644 --- a/src/multimedia/video/qvideosurfaceformat.cpp +++ b/src/multimedia/multimedia/video/qvideosurfaceformat.cpp diff --git a/src/multimedia/video/qvideosurfaceformat.h b/src/multimedia/multimedia/video/qvideosurfaceformat.h index 9c73f5f..9c73f5f 100644 --- a/src/multimedia/video/qvideosurfaceformat.h +++ b/src/multimedia/multimedia/video/qvideosurfaceformat.h diff --git a/src/multimedia/video/video.pri b/src/multimedia/multimedia/video/video.pri index 0547a4c..0547a4c 100644 --- a/src/multimedia/video/video.pri +++ b/src/multimedia/multimedia/video/video.pri diff --git a/src/plugins/mediaservices/directshow/directshow.pro b/src/plugins/mediaservices/directshow/directshow.pro index ea133f9..973c2b1 100644 --- a/src/plugins/mediaservices/directshow/directshow.pro +++ b/src/plugins/mediaservices/directshow/directshow.pro @@ -1,7 +1,7 @@ -TARGET = dsengine +TARGET = qdsengine include(../../qpluginbase.pri) -QT += multimedia +QT += mediaservices HEADERS += dsserviceplugin.h SOURCES += dsserviceplugin.cpp diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowaudioendpointcontrol.h b/src/plugins/mediaservices/directshow/mediaplayer/directshowaudioendpointcontrol.h index 2faac13..d7e3499 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 <QtMultimedia/qmediacontrol.h> +#include <QtMediaservices/qmediacontrol.h> #include <dshow.h> diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp b/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp index 89821c4..53b8787 100644 --- a/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp +++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp @@ -57,76 +57,76 @@ namespace { struct QWMMetaDataKeyLookup { - QtMultimedia::MetaData key; + QtMediaservices::MetaData key; const wchar_t *token; }; } static const QWMMetaDataKeyLookup qt_wmMetaDataKeys[] = { - { QtMultimedia::Title, L"Title" }, - { QtMultimedia::SubTitle, L"WM/SubTitle" }, - { QtMultimedia::Author, L"Author" }, - { QtMultimedia::Comment, L"Comment" }, - { QtMultimedia::Description, L"Description" }, - { QtMultimedia::Category, L"WM/Category" }, - { QtMultimedia::Genre, L"WM/Genre" }, - //{ QtMultimedia::Date, 0 }, - { QtMultimedia::Year, L"WM/Year" }, - { QtMultimedia::UserRating, L"UserRating" }, - //{ QtMultimedia::MetaDatawords, 0 }, - { QtMultimedia::Language, L"Language" }, - { QtMultimedia::Publisher, L"WM/Publisher" }, - { QtMultimedia::Copyright, L"Copyright" }, - { QtMultimedia::ParentalRating, L"ParentalRating" }, - { QtMultimedia::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 - { QtMultimedia::Size, L"FileSize" }, - { QtMultimedia::MediaType, L"MediaType" }, - { QtMultimedia::Duration, L"Duration" }, + { QtMediaservices::Size, L"FileSize" }, + { QtMediaservices::MediaType, L"MediaType" }, + { QtMediaservices::Duration, L"Duration" }, // Audio - { QtMultimedia::AudioBitRate, L"AudioBitRate" }, - { QtMultimedia::AudioCodec, L"AudioCodec" }, - { QtMultimedia::ChannelCount, L"ChannelCount" }, - { QtMultimedia::SampleRate, L"Frequency" }, + { QtMediaservices::AudioBitRate, L"AudioBitRate" }, + { QtMediaservices::AudioCodec, L"AudioCodec" }, + { QtMediaservices::ChannelCount, L"ChannelCount" }, + { QtMediaservices::SampleRate, L"Frequency" }, // Music - { QtMultimedia::AlbumTitle, L"WM/AlbumTitle" }, - { QtMultimedia::AlbumArtist, L"WM/AlbumArtist" }, - { QtMultimedia::ContributingArtist, L"Author" }, - { QtMultimedia::Composer, L"WM/Composer" }, - { QtMultimedia::Conductor, L"WM/Conductor" }, - { QtMultimedia::Lyrics, L"WM/Lyrics" }, - { QtMultimedia::Mood, L"WM/Mood" }, - { QtMultimedia::TrackNumber, L"WM/TrackNumber" }, - //{ QtMultimedia::TrackCount, 0 }, - //{ QtMultimedia::CoverArtUriSmall, 0 }, - //{ QtMultimedia::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 - //{ QtMultimedia::Resolution, 0 }, - //{ QtMultimedia::PixelAspectRatio, 0 }, + //{ QtMediaservices::Resolution, 0 }, + //{ QtMediaservices::PixelAspectRatio, 0 }, // Video - //{ QtMultimedia::FrameRate, 0 }, - { QtMultimedia::VideoBitRate, L"VideoBitRate" }, - { QtMultimedia::VideoCodec, L"VideoCodec" }, + //{ QtMediaservices::FrameRate, 0 }, + { QtMediaservices::VideoBitRate, L"VideoBitRate" }, + { QtMediaservices::VideoCodec, L"VideoCodec" }, - //{ QtMultimedia::PosterUri, 0 }, + //{ QtMediaservices::PosterUri, 0 }, // Movie - { QtMultimedia::ChapterNumber, L"ChapterNumber" }, - { QtMultimedia::Director, L"WM/Director" }, - { QtMultimedia::LeadPerformer, L"LeadPerformer" }, - { QtMultimedia::Writer, L"WM/Writer" }, + { QtMediaservices::ChapterNumber, L"ChapterNumber" }, + { QtMediaservices::Director, L"WM/Director" }, + { QtMediaservices::LeadPerformer, L"LeadPerformer" }, + { QtMediaservices::Writer, L"WM/Writer" }, // Photos - { QtMultimedia::CameraManufacturer, L"CameraManufacturer" }, - { QtMultimedia::CameraModel, L"CameraModel" }, - { QtMultimedia::Event, L"Event" }, - { QtMultimedia::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(QtMultimedia::MetaData key) const +QVariant DirectShowMetaDataControl::metaData(QtMediaservices::MetaData key) const { QVariant value; @@ -277,19 +277,19 @@ QVariant DirectShowMetaDataControl::metaData(QtMultimedia::MetaData key) const BSTR string = 0; switch (key) { - case QtMultimedia::Author: + case QtMediaservices::Author: m_content->get_AuthorName(&string); break; - case QtMultimedia::Title: + case QtMediaservices::Title: m_content->get_Title(&string); break; - case QtMultimedia::ParentalRating: + case QtMediaservices::ParentalRating: m_content->get_Rating(&string); break; - case QtMultimedia::Description: + case QtMediaservices::Description: m_content->get_Description(&string); break; - case QtMultimedia::Copyright: + case QtMediaservices::Copyright: m_content->get_Copyright(&string); break; default: @@ -305,13 +305,13 @@ QVariant DirectShowMetaDataControl::metaData(QtMultimedia::MetaData key) const return value; } -void DirectShowMetaDataControl::setMetaData(QtMultimedia::MetaData, const QVariant &) +void DirectShowMetaDataControl::setMetaData(QtMediaservices::MetaData, const QVariant &) { } -QList<QtMultimedia::MetaData> DirectShowMetaDataControl::availableMetaData() const +QList<QtMediaservices::MetaData> DirectShowMetaDataControl::availableMetaData() const { - return QList<QtMultimedia::MetaData>(); + return QList<QtMediaservices::MetaData>(); } 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 9a81ba8..c67c6eb 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 <QtMultimedia/qmetadatacontrol.h> +#include <QtMediaservices/qmetadatacontrol.h> #include <qnetwork.h> @@ -72,9 +72,9 @@ public: bool isWritable() const; bool isMetaDataAvailable() const; - QVariant metaData(QtMultimedia::MetaData key) const; - void setMetaData(QtMultimedia::MetaData key, const QVariant &value); - QList<QtMultimedia::MetaData> availableMetaData() const; + QVariant metaData(QtMediaservices::MetaData key) const; + void setMetaData(QtMediaservices::MetaData key, const QVariant &value); + QList<QtMediaservices::MetaData> 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 19f65da..4dd9b0e 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 <QtMultimedia> +#include <QtMediaservices> QT_BEGIN_NAMESPACE diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowplayercontrol.h b/src/plugins/mediaservices/directshow/mediaplayer/directshowplayercontrol.h index dd25d30..b22a45b 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 <QtMultimedia/qmediacontent.h> -#include <QtMultimedia/qmediaplayercontrol.h> +#include <QtMediaservices/qmediacontent.h> +#include <QtMediaservices/qmediaplayercontrol.h> #include <QtCore/qcoreevent.h> diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowplayerservice.cpp b/src/plugins/mediaservices/directshow/mediaplayer/directshowplayerservice.cpp index a5f143f..93ae3ad 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 <QtMultimedia/qmediacontent.h> +#include <QtMediaservices/qmediacontent.h> #include <QtCore/qcoreapplication.h> #include <QtCore/qdatetime.h> diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowplayerservice.h b/src/plugins/mediaservices/directshow/mediaplayer/directshowplayerservice.h index d3ef809..1a90b7e 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 <QtMultimedia/qmediaplayer.h> -#include <QtMultimedia/qmediaresource.h> -#include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediatimerange.h> +#include <QtMediaservices/qmediaplayer.h> +#include <QtMediaservices/qmediaresource.h> +#include <QtMediaservices/qmediaservice.h> +#include <QtMediaservices/qmediatimerange.h> #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 acb2937..c4e9bed 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 <QtMultimedia/qvideooutputcontrol.h> +#include <QtMediaservices/qvideooutputcontrol.h> QT_BEGIN_HEADER diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowvideorenderercontrol.h b/src/plugins/mediaservices/directshow/mediaplayer/directshowvideorenderercontrol.h index 6b4f4a2..c341487 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 <QtMultimedia/qvideorenderercontrol.h> +#include <QtMediaservices/qvideorenderercontrol.h> #include <dshow.h> diff --git a/src/plugins/mediaservices/directshow/mediaplayer/mediasamplevideobuffer.h b/src/plugins/mediaservices/directshow/mediaplayer/mediasamplevideobuffer.h index 06dc31c..5820225 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 <QtMultimedia/qabstractvideobuffer.h> +#include <QtMediaservices/qabstractvideobuffer.h> #include <dshow.h> diff --git a/src/plugins/mediaservices/directshow/mediaplayer/vmr9videowindowcontrol.h b/src/plugins/mediaservices/directshow/mediaplayer/vmr9videowindowcontrol.h index beac433..9906fae 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 <QtMultimedia/qvideowindowcontrol.h> +#include <QtMediaservices/qvideowindowcontrol.h> #include <dshow.h> #include <d3d9.h> diff --git a/src/plugins/mediaservices/gstreamer/gstreamer.pro b/src/plugins/mediaservices/gstreamer/gstreamer.pro index d1bfe44..0273139 100644 --- a/src/plugins/mediaservices/gstreamer/gstreamer.pro +++ b/src/plugins/mediaservices/gstreamer/gstreamer.pro @@ -1,7 +1,7 @@ -TARGET = gstengine +TARGET = qgstengine include(../../qpluginbase.pri) -QT += multimedia +QT += mediaservices unix:contains(QT_CONFIG, alsa) { DEFINES += HAVE_ALSA diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp index eff6ea4..05b924a 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 { - QtMultimedia::MetaData key; + QtMediaservices::MetaData key; const char *token; }; static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] = { - { QtMultimedia::Title, GST_TAG_TITLE }, - //{ QtMultimedia::SubTitle, 0 }, - //{ QtMultimedia::Author, 0 }, - { QtMultimedia::Comment, GST_TAG_COMMENT }, - { QtMultimedia::Description, GST_TAG_DESCRIPTION }, - //{ QtMultimedia::Category, 0 }, - { QtMultimedia::Genre, GST_TAG_GENRE }, - { QtMultimedia::Year, "year" }, - //{ QtMultimedia::UserRating, 0 }, - - { QtMultimedia::Language, GST_TAG_LANGUAGE_CODE }, - - { QtMultimedia::Publisher, GST_TAG_ORGANIZATION }, - { QtMultimedia::Copyright, GST_TAG_COPYRIGHT }, - //{ QtMultimedia::ParentalRating, 0 }, - //{ QtMultimedia::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 - //{ QtMultimedia::Size, 0 }, - //{ QtMultimedia::MediaType, 0 }, - { QtMultimedia::Duration, GST_TAG_DURATION }, + //{ QtMediaservices::Size, 0 }, + //{ QtMediaservices::MediaType, 0 }, + { QtMediaservices::Duration, GST_TAG_DURATION }, // Audio - { QtMultimedia::AudioBitRate, GST_TAG_BITRATE }, - { QtMultimedia::AudioCodec, GST_TAG_AUDIO_CODEC }, - //{ QtMultimedia::ChannelCount, 0 }, - //{ QtMultimedia::Frequency, 0 }, + { QtMediaservices::AudioBitRate, GST_TAG_BITRATE }, + { QtMediaservices::AudioCodec, GST_TAG_AUDIO_CODEC }, + //{ QtMediaservices::ChannelCount, 0 }, + //{ QtMediaservices::Frequency, 0 }, // Music - { QtMultimedia::AlbumTitle, GST_TAG_ALBUM }, - { QtMultimedia::AlbumArtist, GST_TAG_ARTIST}, - { QtMultimedia::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) - { QtMultimedia::Composer, GST_TAG_COMPOSER }, + { QtMediaservices::Composer, GST_TAG_COMPOSER }, #endif - //{ QtMultimedia::Conductor, 0 }, - //{ QtMultimedia::Lyrics, 0 }, - //{ QtMultimedia::Mood, 0 }, - { QtMultimedia::TrackNumber, GST_TAG_TRACK_NUMBER }, + //{ QtMediaservices::Conductor, 0 }, + //{ QtMediaservices::Lyrics, 0 }, + //{ QtMediaservices::Mood, 0 }, + { QtMediaservices::TrackNumber, GST_TAG_TRACK_NUMBER }, - //{ QtMultimedia::CoverArtUrlSmall, 0 }, - //{ QtMultimedia::CoverArtUrlLarge, 0 }, + //{ QtMediaservices::CoverArtUrlSmall, 0 }, + //{ QtMediaservices::CoverArtUrlLarge, 0 }, // Image/Video - //{ QtMultimedia::Resolution, 0 }, - //{ QtMultimedia::PixelAspectRatio, 0 }, + //{ QtMediaservices::Resolution, 0 }, + //{ QtMediaservices::PixelAspectRatio, 0 }, // Video - //{ QtMultimedia::VideoFrameRate, 0 }, - //{ QtMultimedia::VideoBitRate, 0 }, - { QtMultimedia::VideoCodec, GST_TAG_VIDEO_CODEC }, + //{ QtMediaservices::VideoFrameRate, 0 }, + //{ QtMediaservices::VideoBitRate, 0 }, + { QtMediaservices::VideoCodec, GST_TAG_VIDEO_CODEC }, - //{ QtMultimedia::PosterUrl, 0 }, + //{ QtMediaservices::PosterUrl, 0 }, // Movie - //{ QtMultimedia::ChapterNumber, 0 }, - //{ QtMultimedia::Director, 0 }, - { QtMultimedia::LeadPerformer, GST_TAG_PERFORMER }, - //{ QtMultimedia::Writer, 0 }, + //{ QtMediaservices::ChapterNumber, 0 }, + //{ QtMediaservices::Director, 0 }, + { QtMediaservices::LeadPerformer, GST_TAG_PERFORMER }, + //{ QtMediaservices::Writer, 0 }, // Photos - //{ QtMultimedia::CameraManufacturer, 0 }, - //{ QtMultimedia::CameraModel, 0 }, - //{ QtMultimedia::Event, 0 }, - //{ QtMultimedia::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(QtMultimedia::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(QtMultimedia::MetaData key) const return QVariant(); } -void QGstreamerMetaDataProvider::setMetaData(QtMultimedia::MetaData key, QVariant const &value) +void QGstreamerMetaDataProvider::setMetaData(QtMediaservices::MetaData key, QVariant const &value) { Q_UNUSED(key); Q_UNUSED(value); } -QList<QtMultimedia::MetaData> QGstreamerMetaDataProvider::availableMetaData() const +QList<QtMediaservices::MetaData> QGstreamerMetaDataProvider::availableMetaData() const { - static QMap<QByteArray, QtMultimedia::MetaData> keysMap; + static QMap<QByteArray, QtMediaservices::MetaData> keysMap; if (keysMap.isEmpty()) { const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup); for (int i = 0; i < count; ++i) { @@ -170,9 +170,9 @@ QList<QtMultimedia::MetaData> QGstreamerMetaDataProvider::availableMetaData() co } } - QList<QtMultimedia::MetaData> res; + QList<QtMediaservices::MetaData> res; foreach (const QByteArray &key, m_session->tags().keys()) { - QtMultimedia::MetaData tag = keysMap.value(key, QtMultimedia::MetaData(-1)); + QtMediaservices::MetaData tag = keysMap.value(key, QtMultimedia::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 267c2d7..98803c2 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 <QtMultimedia/qmetadatacontrol.h> +#include <QtMediaservices/qmetadatacontrol.h> QT_BEGIN_HEADER @@ -61,9 +61,9 @@ public: bool isMetaDataAvailable() const; bool isWritable() const; - QVariant metaData(QtMultimedia::MetaData key) const; - void setMetaData(QtMultimedia::MetaData key, const QVariant &value); - QList<QtMultimedia::MetaData> availableMetaData() const; + QVariant metaData(QtMediaservices::MetaData key) const; + void setMetaData(QtMediaservices::MetaData key, const QVariant &value); + QList<QtMediaservices::MetaData> 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 1764eb0..bb77eff 100644 --- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.h +++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.h @@ -44,8 +44,8 @@ #include <QtCore/qobject.h> -#include <QtMultimedia/qmediaplayercontrol.h> -#include <QtMultimedia/qmediaplayer.h> +#include <QtMediaservies/qmediaplayercontrol.h> +#include <QtMediaservices/qmediaplayer.h> #include <limits.h> diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.cpp index 56cdb04..33454d4 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<m_streamTypes.count(); i++) { QMediaStreamsControl::StreamType streamType = m_streamTypes[i]; - QMap<QtMultimedia::MetaData, QVariant> streamProperties; + QMap<QtMediaservices::MetaData, QVariant> 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[QtMultimedia::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<QtMultimedia::MetaData, QVariant> streamProperties; -// streamProperties[QtMultimedia::Language] = QString::fromUtf8(languageCode); +// QMap<QtMediaservices::MetaData, QVariant> 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 867a0e0..61b5f51 100644 --- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.h +++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.h @@ -46,7 +46,7 @@ #include <QUrl> #include "qgstreamerplayercontrol.h" #include "qgstreamerbushelper.h" -#include <QtMultimedia/qmediaplayer.h> +#include <QtMediaservices/qmediaplayer.h> //#include <qmediastreamscontrol.h> #include <gst/gst.h> @@ -92,7 +92,7 @@ public: void setPlaybackRate(qreal rate); QMap<QByteArray ,QVariant> tags() const { return m_tags; } - QMap<QtMultimedia::MetaData,QVariant> streamProperties(int streamNumber) const { return m_streamProperties[streamNumber]; } + QMap<QtMediaservices::MetaData,QVariant> 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<QByteArray, QVariant> m_tags; - QList< QMap<QtMultimedia::MetaData,QVariant> > m_streamProperties; + QList< QMap<QtMediaservices::MetaData,QVariant> > m_streamProperties; // QList<QMediaStreamsControl::StreamType> m_streamTypes; // QMap<QMediaStreamsControl::StreamType, int> m_playbin2StreamOffset; diff --git a/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.cpp b/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.cpp index 98068ac..443e738 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 <QtMultimedia/qmediaserviceprovider.h> +#include <QtMediaservices/qmediaserviceprovider.h> #ifdef QMEDIA_GSTREAMER_CAPTURE #include <linux/types.h> diff --git a/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.h b/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.h index d6d6899..6908bb3 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 <QtMultimedia/qmediaserviceproviderplugin.h> +#include <QtMediaservices/qmediaserviceproviderplugin.h> QT_BEGIN_HEADER diff --git a/src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.h b/src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.h index 6762bab..35174cf 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 <QtMultimedia/qvideodevicecontrol.h> +#include <QtMediaservices/qvideodevicecontrol.h> #include <QtCore/qstringlist.h> diff --git a/src/plugins/mediaservices/gstreamer/qgstreamervideooutputcontrol.h b/src/plugins/mediaservices/gstreamer/qgstreamervideooutputcontrol.h index 7685239..c4d76a4 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 <QtMultimedia/qvideooutputcontrol.h> +#include <QtMediaservices/qvideooutputcontrol.h> #include <gst/gst.h> diff --git a/src/plugins/mediaservices/gstreamer/qgstreamervideooverlay.h b/src/plugins/mediaservices/gstreamer/qgstreamervideooverlay.h index 1188074..63079c8 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 <QtMultimedia/qvideowindowcontrol.h> +#include <QtMediaservices/qvideowindowcontrol.h> #include "qgstreamervideorendererinterface.h" diff --git a/src/plugins/mediaservices/gstreamer/qgstreamervideorenderer.h b/src/plugins/mediaservices/gstreamer/qgstreamervideorenderer.h index ba3f806..903ffbb 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 <QtMultimedia/qvideorenderercontrol.h> +#include <QtMediaservices/qvideorenderercontrol.h> #include "qvideosurfacegstsink.h" #include "qgstreamervideorendererinterface.h" diff --git a/src/plugins/mediaservices/gstreamer/qgstreamervideowidget.h b/src/plugins/mediaservices/gstreamer/qgstreamervideowidget.h index 28b48af..e99a3cf 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 <QtMultimedia/qvideowidgetcontrol.h> +#include <QtMediaservices/qvideowidgetcontrol.h> #include "qgstreamervideorendererinterface.h" diff --git a/src/plugins/mediaservices/mediaservices.pro b/src/plugins/mediaservices/mediaservices.pro index 19d678b..6a00a14 100644 --- a/src/plugins/mediaservices/mediaservices.pro +++ b/src/plugins/mediaservices/mediaservices.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs -contains(QT_CONFIG, mediaservice) { +contains(QT_CONFIG, media-backend) { win32:!wince*: SUBDIRS += directshow mac: SUBDIRS += qt7 diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.h b/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.h index 907d13d..a546ca1 100644 --- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.h +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.h @@ -45,8 +45,8 @@ #include <QtCore/qobject.h> #include <QtGui/qmacdefines_mac.h> -#include <QtMultimedia/qmediaplayercontrol.h> -#include <QtMultimedia/qmediaplayer.h> +#include <QtMediaservices/qmediaplayercontrol.h> +#include <QtMediaservices/qmediaplayer.h> QT_BEGIN_HEADER diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.mm index 0f4ac41..90c6035 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 <QtMultimedia/qmediaplaylistnavigator.h> +#include <QtMediaservices/qmediaplaylistnavigator.h> #include <QtCore/qurl.h> #include <QtCore/qdebug.h> diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h index f16807a..e13df95 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 <QtMultimedia/qmetadatacontrol.h> +#include <QtMediaservices/qmetadatacontrol.h> QT_BEGIN_HEADER @@ -61,9 +61,9 @@ public: bool isMetaDataAvailable() const; bool isWritable() const; - QVariant metaData(QtMultimedia::MetaData key) const; - void setMetaData(QtMultimedia::MetaData key, const QVariant &value); - QList<QtMultimedia::MetaData> availableMetaData() const; + QVariant metaData(QtMediaservices::MetaData key) const; + void setMetaData(QtMediaservices::MetaData key, const QVariant &value); + QList<QtMediaservices::MetaData> 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<QtMultimedia::MetaData, QVariant> m_tags; + QMap<QtMediaservices::MetaData, QVariant> m_tags; }; QT_END_NAMESPACE diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm index 59d01a2..e12daf5 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(QtMultimedia::MetaData key) const +QVariant QT7PlayerMetaDataControl::metaData(QtMediaservices::MetaData key) const { return m_tags.value(key); } -void QT7PlayerMetaDataControl::setMetaData(QtMultimedia::MetaData key, QVariant const &value) +void QT7PlayerMetaDataControl::setMetaData(QtMediaservices::MetaData key, QVariant const &value) { Q_UNUSED(key); Q_UNUSED(value); } -QList<QtMultimedia::MetaData> QT7PlayerMetaDataControl::availableMetaData() const +QList<QtMediaservices::MetaData> 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(QtMultimedia::AlbumArtist, metaMap.value(QLatin1String("ART"))); - m_tags.insert(QtMultimedia::AlbumTitle, metaMap.value(QLatin1String("alb"))); - m_tags.insert(QtMultimedia::Title, metaMap.value(QLatin1String("nam"))); - m_tags.insert(QtMultimedia::Date, metaMap.value(QLatin1String("day"))); - m_tags.insert(QtMultimedia::Genre, metaMap.value(QLatin1String("gnre"))); - m_tags.insert(QtMultimedia::TrackNumber, metaMap.value(QLatin1String("trk"))); - m_tags.insert(QtMultimedia::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 d4b30b8..3d3a3ff 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 <QtCore/qobject.h> -#include <QtMultimedia/qmediaservice.h> +#include <QtMediaservices/qmediaservice.h> QT_BEGIN_HEADER diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm index 205e862..0b3505e 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 <QtMultimedia/qmediaplaylistnavigator.h> -#include <QtMultimedia/qmediaplaylist.h> +#include <QtMediaservices/qmediaplaylistnavigator.h> +#include <QtMediaservices/qmediaplaylist.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.h b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.h index 0ba3041..780776c 100644 --- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.h +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.h @@ -45,8 +45,8 @@ #include <QtCore/qobject.h> #include <QtGui/qmacdefines_mac.h> -#include <QtMultimedia/qmediaplayercontrol.h> -#include <QtMultimedia/qmediaplayer.h> +#include <QtMediaservices/qmediaplayercontrol.h> +#include <QtMediaservices/qmediaplayer.h> QT_BEGIN_HEADER diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm index 65c9f7d..863b3c8 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 <QtNetwork/qnetworkcookie.h> -#include <QtMultimedia/qmediaplaylistnavigator.h> +#include <QtMediaservices/qmediaplaylistnavigator.h> #include <CoreFoundation/CoreFoundation.h> #include <Foundation/Foundation.h> diff --git a/src/plugins/mediaservices/qt7/qt7.pro b/src/plugins/mediaservices/qt7/qt7.pro index 8791d73..baac224 100644 --- a/src/plugins/mediaservices/qt7/qt7.pro +++ b/src/plugins/mediaservices/qt7/qt7.pro @@ -1,7 +1,7 @@ -TARGET = qt7 +TARGET = qqt7 include(../../qpluginbase.pri) -QT += opengl multimedia +QT += opengl mediaservices LIBS += -framework AppKit -framework AudioUnit \ -framework AudioToolbox -framework CoreAudio \ diff --git a/src/plugins/mediaservices/qt7/qt7movieviewoutput.h b/src/plugins/mediaservices/qt7/qt7movieviewoutput.h index 0fee41c..ed3eebc 100644 --- a/src/plugins/mediaservices/qt7/qt7movieviewoutput.h +++ b/src/plugins/mediaservices/qt7/qt7movieviewoutput.h @@ -44,8 +44,8 @@ #include <QtCore/qobject.h> -#include <QtMultimedia/qvideowindowcontrol.h> -#include <QtMultimedia/qmediaplayer.h> +#include <QtMediaservices/qvideowindowcontrol.h> +#include <QtMediaservices/qmediaplayer.h> #include <QtGui/qmacdefines_mac.h> #include "qt7videooutputcontrol.h" diff --git a/src/plugins/mediaservices/qt7/qt7movieviewrenderer.h b/src/plugins/mediaservices/qt7/qt7movieviewrenderer.h index 0b515ae..334ea6a 100644 --- a/src/plugins/mediaservices/qt7/qt7movieviewrenderer.h +++ b/src/plugins/mediaservices/qt7/qt7movieviewrenderer.h @@ -45,8 +45,8 @@ #include <QtCore/qobject.h> #include <QtCore/qmutex.h> -#include <QtMultimedia/qvideowindowcontrol.h> -#include <QtMultimedia/qmediaplayer.h> +#include <QtMediaservices/qvideowindowcontrol.h> +#include <QtMediaservices/qmediaplayer.h> #include <QtGui/qmacdefines_mac.h> #include "qt7videooutputcontrol.h" diff --git a/src/plugins/mediaservices/qt7/qt7serviceplugin.h b/src/plugins/mediaservices/qt7/qt7serviceplugin.h index c5afda1..7e8acf9 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 <QtMultimedia/qmediaserviceproviderplugin.h> +#include <QtMediaservices/qmediaserviceproviderplugin.h> QT_BEGIN_HEADER diff --git a/src/plugins/mediaservices/qt7/qt7serviceplugin.mm b/src/plugins/mediaservices/qt7/qt7serviceplugin.mm index c59a453..fe4ca44 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 <QtMultimedia/qmediaserviceprovider.h> +#include <QtMediaservices/qmediaserviceprovider.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/mediaservices/qt7/qt7videooutputcontrol.h b/src/plugins/mediaservices/qt7/qt7videooutputcontrol.h index 3c74cb8..39a13ee 100644 --- a/src/plugins/mediaservices/qt7/qt7videooutputcontrol.h +++ b/src/plugins/mediaservices/qt7/qt7videooutputcontrol.h @@ -45,11 +45,11 @@ #include <QtCore/qobject.h> #include <QtCore/qsize.h> -#include <QtMultimedia/qvideooutputcontrol.h> -#include <QtMultimedia/qvideowindowcontrol.h> -#include <QtMultimedia/qvideowidgetcontrol.h> -#include <QtMultimedia/qvideorenderercontrol.h> -#include <QtMultimedia/qmediaplayer.h> +#include <QtMediaservices/qvideooutputcontrol.h> +#include <QtMediaservices/qvideowindowcontrol.h> +#include <QtMediaservices/qvideowidgetcontrol.h> +#include <QtMediaservices/qvideorenderercontrol.h> +#include <QtMediaservices/qmediaplayer.h> #include <QtGui/qmacdefines_mac.h> diff --git a/src/src.pro b/src/src.pro index c74b0ca..e8a3e98 100644 --- a/src/src.pro +++ b/src/src.pro @@ -17,6 +17,7 @@ contains(QT_CONFIG, openvg): SRC_SUBDIRS += src_openvg contains(QT_CONFIG, xmlpatterns): SRC_SUBDIRS += src_xmlpatterns contains(QT_CONFIG, phonon): SRC_SUBDIRS += src_phonon contains(QT_CONFIG, multimedia): SRC_SUBDIRS += src_multimedia +contains(QT_CONFIG, mediaservices): SRC_SUBDIRS += src_mediaservices contains(QT_CONFIG, svg): SRC_SUBDIRS += src_svg contains(QT_CONFIG, webkit) { exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): SRC_SUBDIRS += src_javascriptcore @@ -66,8 +67,10 @@ src_qt3support.subdir = $$QT_SOURCE_TREE/src/qt3support src_qt3support.target = sub-qt3support src_phonon.subdir = $$QT_SOURCE_TREE/src/phonon src_phonon.target = sub-phonon -src_multimedia.subdir = $$QT_SOURCE_TREE/src/multimedia +src_multimedia.subdir = $$QT_SOURCE_TREE/src/multimedia/multimedia src_multimedia.target = sub-multimedia +src_mediaservices.subdir = $$QT_SOURCE_TREE/src/multimedia/mediaservices +src_mediaservices.target = sub-mediaservices src_activeqt.subdir = $$QT_SOURCE_TREE/src/activeqt src_activeqt.target = sub-activeqt src_plugins.subdir = $$QT_SOURCE_TREE/src/plugins @@ -105,6 +108,7 @@ src_declarative.target = sub-declarative src_phonon.depends = src_gui src_multimedia.depends = src_gui contains(QT_CONFIG, opengl):src_multimedia.depends += src_opengl + src_mediaservices.depends = src_multimedia src_tools_activeqt.depends = src_tools_idc src_gui src_declarative.depends = src_xml src_gui src_script src_network src_svg src_plugins.depends = src_gui src_sql src_svg src_multimedia @@ -112,7 +116,7 @@ src_declarative.target = sub-declarative src_imports.depends = src_gui src_declarative contains(QT_CONFIG, webkit) { src_webkit.depends = src_gui src_sql src_network src_xml - contains(QT_CONFIG, multimedia):src_webkit.depends += src_multimedia + contains(QT_CONFIG, mediaservices):src_webkit.depends += src_mediaservices contains(QT_CONFIG, xmlpatterns): src_webkit.depends += src_xmlpatterns contains(QT_CONFIG, declarative):src_declarative.depends += src_webkit src_imports.depends += src_webkit diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index c0004f7..12ebc75 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -16,6 +16,7 @@ unix:!embedded:contains(QT_CONFIG, dbus): SUBDIRS += dbus.pro contains(QT_CONFIG, script): SUBDIRS += script.pro contains(QT_CONFIG, webkit): SUBDIRS += webkit.pro contains(QT_CONFIG, multimedia): SUBDIRS += multimedia.pro +contains(QT_CONFIG, mediaservices): SUBDIRS += mediaservices.pro contains(QT_CONFIG, phonon): SUBDIRS += phonon.pro contains(QT_CONFIG, svg): SUBDIRS += svg.pro contains(QT_CONFIG, declarative): SUBDIRS += declarative.pro diff --git a/tests/auto/mediaservices.pro b/tests/auto/mediaservices.pro new file mode 100644 index 0000000..1b50cd7 --- /dev/null +++ b/tests/auto/mediaservices.pro @@ -0,0 +1,19 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qsoundeffect \ + qdeclarativeaudio \ + qdeclarativevideo \ + qgraphicsvideoitem \ + qmediacontent \ + qmediaobject \ + qmediaplayer \ + qmediaplaylist \ + qmediaplaylistnavigator \ + qmediapluginloader \ + qmediaresource \ + qmediaservice \ + qmediaserviceprovider \ + qmediatimerange \ + qvideowidget + + diff --git a/tests/auto/multimedia.pro b/tests/auto/multimedia.pro index f55d6e4..876b932 100644 --- a/tests/auto/multimedia.pro +++ b/tests/auto/multimedia.pro @@ -6,21 +6,7 @@ SUBDIRS=\ qaudioformat \ qaudioinput \ qaudiooutput \ - qsoundeffect \ - qdeclarativeaudio \ - qdeclarativevideo \ - qgraphicsvideoitem \ - qmediacontent \ - qmediaobject \ - qmediaplayer \ - qmediaplaylist \ - qmediaplaylistnavigator \ - qmediapluginloader \ - qmediaresource \ - qmediaservice \ - qmediaserviceprovider \ - qmediatimerange \ qvideoframe \ qvideosurfaceformat \ - qvideowidget \ + qvideowidget diff --git a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro index 7779efc..ecfe299 100644 --- a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro +++ b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro @@ -11,4 +11,4 @@ SOURCES += \ $$PWD/../../../src/imports/multimedia/qdeclarativemediabase.cpp \ $$PWD/../../../src/imports/multimedia/qmetadatacontrolmetaobject.cpp -QT += multimedia declarative +QT += mediaservices declarative diff --git a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro b/tests/auto/qdeclarativevideo/qdeclarativevideo.pro index 4cd4c71..c2bcdfe 100644 --- a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro +++ b/tests/auto/qdeclarativevideo/qdeclarativevideo.pro @@ -11,4 +11,4 @@ SOURCES += \ $$PWD/../../../src/imports/multimedia/qdeclarativemediabase.cpp \ $$PWD/../../../src/imports/multimedia/qmetadatacontrolmetaobject.cpp -QT += multimedia declarative +QT += mediaservices declarative diff --git a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro index da00baf..60e1933 100644 --- a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro +++ b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro @@ -1,5 +1,5 @@ load(qttest_p4) SOURCES += tst_qgraphicsvideoitem.cpp -QT += multimedia -requires(contains(QT_CONFIG, multimedia)) +QT += mediaservices +requires(contains(QT_CONFIG, mediaservices)) diff --git a/tests/auto/qmediacontent/qmediacontent.pro b/tests/auto/qmediacontent/qmediacontent.pro index 6c13c8b..e20b4db 100644 --- a/tests/auto/qmediacontent/qmediacontent.pro +++ b/tests/auto/qmediacontent/qmediacontent.pro @@ -2,5 +2,5 @@ load(qttest_p4) SOURCES += tst_qmediacontent.cpp -QT = core network multimedia +QT = core network mediaservices diff --git a/tests/auto/qmediaobject/qmediaobject.pro b/tests/auto/qmediaobject/qmediaobject.pro index e59bfdc..d6a0f7b 100644 --- a/tests/auto/qmediaobject/qmediaobject.pro +++ b/tests/auto/qmediaobject/qmediaobject.pro @@ -1,4 +1,4 @@ load(qttest_p4) SOURCES += tst_qmediaobject.cpp -QT = core multimedia +QT = core mediaservices diff --git a/tests/auto/qmediaplayer/qmediaplayer.pro b/tests/auto/qmediaplayer/qmediaplayer.pro index 21008f9..f355078 100644 --- a/tests/auto/qmediaplayer/qmediaplayer.pro +++ b/tests/auto/qmediaplayer/qmediaplayer.pro @@ -2,5 +2,5 @@ load(qttest_p4) SOURCES += tst_qmediaplayer.cpp -QT = core multimedia +QT = core mediaservices diff --git a/tests/auto/qmediaplaylist/qmediaplaylist.pro b/tests/auto/qmediaplaylist/qmediaplaylist.pro index b114bda..809473b 100644 --- a/tests/auto/qmediaplaylist/qmediaplaylist.pro +++ b/tests/auto/qmediaplaylist/qmediaplaylist.pro @@ -2,5 +2,5 @@ load(qttest_p4) SOURCES = tst_qmediaplaylist.cpp -QT = core multimedia +QT = core mediaservices diff --git a/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro b/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro index ea9bc0f..3265762 100644 --- a/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro +++ b/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro @@ -2,5 +2,5 @@ load(qttest_p4) SOURCES = tst_qmediaplaylistnavigator.cpp -QT = core multimedia +QT = core mediaservices diff --git a/tests/auto/qmediapluginloader/qmediapluginloader.pro b/tests/auto/qmediapluginloader/qmediapluginloader.pro index 66950e9..a47cc57 100644 --- a/tests/auto/qmediapluginloader/qmediapluginloader.pro +++ b/tests/auto/qmediapluginloader/qmediapluginloader.pro @@ -2,5 +2,5 @@ load(qttest_p4) SOURCES = tst_qmediapluginloader.cpp -QT = core multimedia +QT = core mediaservices diff --git a/tests/auto/qmediaresource/qmediaresource.pro b/tests/auto/qmediaresource/qmediaresource.pro index c8e3d9c..64669a2 100644 --- a/tests/auto/qmediaresource/qmediaresource.pro +++ b/tests/auto/qmediaresource/qmediaresource.pro @@ -2,5 +2,5 @@ load(qttest_p4) SOURCES = tst_qmediaresource.cpp -QT = core multimedia network +QT = core mediaservices network diff --git a/tests/auto/qmediaservice/qmediaservice.pro b/tests/auto/qmediaservice/qmediaservice.pro index f877665..8acd03a 100644 --- a/tests/auto/qmediaservice/qmediaservice.pro +++ b/tests/auto/qmediaservice/qmediaservice.pro @@ -2,5 +2,5 @@ load(qttest_p4) SOURCES = tst_qmediaservice.cpp -QT = core gui multimedia +QT = core gui mediaservices diff --git a/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro b/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro index 9aaa9e5..69b3864 100644 --- a/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro +++ b/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro @@ -2,5 +2,5 @@ load(qttest_p4) SOURCES = tst_qmediaserviceprovider.cpp -QT = core gui multimedia +QT = core gui mediaservices diff --git a/tests/auto/qmediatimerange/qmediatimerange.pro b/tests/auto/qmediatimerange/qmediatimerange.pro index b1b436e..98c415b 100644 --- a/tests/auto/qmediatimerange/qmediatimerange.pro +++ b/tests/auto/qmediatimerange/qmediatimerange.pro @@ -2,5 +2,5 @@ load(qttest_p4) SOURCES = tst_qmediatimerange.cpp -QT = core multimedia +QT = core media diff --git a/tests/auto/qsoundeffect/qsoundeffect.pro b/tests/auto/qsoundeffect/qsoundeffect.pro index eaa35b2..4ed7407 100644 --- a/tests/auto/qsoundeffect/qsoundeffect.pro +++ b/tests/auto/qsoundeffect/qsoundeffect.pro @@ -2,7 +2,7 @@ load(qttest_p4) SOURCES += tst_qsoundeffect.cpp -QT = core multimedia +QT = core media wince* { deploy.sources += 4.wav diff --git a/tests/auto/qvideowidget/qvideowidget.pro b/tests/auto/qvideowidget/qvideowidget.pro index ca0fc24..fde9030 100644 --- a/tests/auto/qvideowidget/qvideowidget.pro +++ b/tests/auto/qvideowidget/qvideowidget.pro @@ -2,5 +2,5 @@ load(qttest_p4) SOURCES = tst_qvideowidget.cpp -QT = core gui multimedia +QT = core gui media diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index dfd1196..2afc94b 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -247,8 +247,9 @@ Configure::Configure( int& argc, char** argv ) dictionary[ "PHONON" ] = "auto"; dictionary[ "PHONON_BACKEND" ] = "yes"; dictionary[ "MULTIMEDIA" ] = "yes"; + dictionary[ "MEDIASERVICES" ] = "yes"; dictionary[ "AUDIO_BACKEND" ] = "auto"; - dictionary[ "MEDIASERVICE"] = "auto"; + dictionary[ "MEDIA_BACKEND"] = "auto"; dictionary[ "WMSDK" ] = "auto"; dictionary[ "DIRECTSHOW" ] = "no"; dictionary[ "WEBKIT" ] = "auto"; @@ -905,14 +906,18 @@ void Configure::parseCmdLine() dictionary[ "MULTIMEDIA" ] = "no"; } else if( configCmdLine.at(i) == "-multimedia" ) { dictionary[ "MULTIMEDIA" ] = "yes"; + } else if( configCmdLine.at(i) == "-no-mediaservices" ) { + dictionary[ "MEDIASERVICES" ] = "no"; + } else if( configCmdLine.at(i) == "-mediaservices" ) { + dictionary[ "MEDIASERVICES" ] = "yes"; } else if( configCmdLine.at(i) == "-audio-backend" ) { dictionary[ "AUDIO_BACKEND" ] = "yes"; } else if( configCmdLine.at(i) == "-no-audio-backend" ) { dictionary[ "AUDIO_BACKEND" ] = "no"; - } else if( configCmdLine.at(i) == "-mediaservice") { - dictionary[ "MEDIASERVICE" ] = "yes"; - } else if (configCmdLine.at(i) == "-no-mediaservice") { - dictionary[ "MEDIASERVICE" ] = "no"; + } else if( configCmdLine.at(i) == "-media-backend") { + dictionary[ "MEDIA_BACKEND" ] = "yes"; + } else if (configCmdLine.at(i) == "-no-media-backend") { + dictionary[ "MEDIA_BACKEND" ] = "no"; } else if( configCmdLine.at(i) == "-no-phonon" ) { dictionary[ "PHONON" ] = "no"; } else if( configCmdLine.at(i) == "-phonon" ) { @@ -1598,7 +1603,7 @@ bool Configure::displayHelp() "[-qtnamespace <namespace>] [-qtlibinfix <infix>] [-no-phonon]\n" "[-phonon] [-no-phonon-backend] [-phonon-backend]\n" "[-no-multimedia] [-multimedia] [-no-audio-backend] [-audio-backend]\n" - "[-no-mediaservice] [-mediaservice]\n" + "[-no-mediaservices] [-mediaservices] [-no-media-backend] [-media-backend]\n" "[-no-script] [-script] [-no-scripttools] [-scripttools]\n" "[-no-webkit] [-webkit] [-graphicssystem raster|opengl|openvg]\n\n", 0, 7); @@ -1783,8 +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("MEDIASERVICE", "no","-no-mediaservice", "Do not compile in the platform-specific QtMultimedia media service."); - desc("MEDIASERVICE", "yes","-mediaservice", "Compile in the platform-specific QtMultimedia 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."); @@ -2066,7 +2073,7 @@ bool Configure::checkAvailability(const QString &part) && dictionary.value("QMAKESPEC") != "win32-msvc.net" // Leave for now, since we can't be sure if they are using 2002 or 2003 with this spec && dictionary.value("QMAKESPEC") != "win32-msvc2002" && dictionary.value("EXCEPTIONS") == "yes"; - } else if (part == "PHONON" || part == "MEDIASERVICE") { + } else if (part == "PHONON" || part == "MEDIA_BACKEND") { available = findFile("vmr9.h") && findFile("dshow.h") && findFile("dmo.h") && findFile("dmodshow.h") && (findFile("strmiids.lib") || findFile("libstrmiids.a")) && (findFile("dmoguids.lib") || findFile("libdmoguids.a")) @@ -2226,8 +2233,8 @@ void Configure::autoDetection() dictionary["DECLARATIVE"] = dictionary["SCRIPT"] == "yes" ? "yes" : "no"; if (dictionary["AUDIO_BACKEND"] == "auto") dictionary["AUDIO_BACKEND"] = checkAvailability("AUDIO_BACKEND") ? "yes" : "no"; - if (dictionary["MEDIASERVICE"] == "auto") - dictionary["MEDIASERVICE"] = checkAvailability("MEDIASERVICE") ? "yes" : "no"; + if (dictionary["MEDIA_BACKEND"] == "auto") + dictionary["MEDIA_BACKEND"] = checkAvailability("MEDIA_BACKEND") ? "yes" : "no"; if (dictionary["WMSDK"] == "auto") dictionary["WMSDK"] = checkAvailability("WMSDK") ? "yes" : "no"; @@ -2628,10 +2635,13 @@ void Configure::generateOutputVars() qtConfig += "multimedia"; if (dictionary["AUDIO_BACKEND"] == "yes") qtConfig += "audio-backend"; - if (dictionary["MEDIASERVICE"] == "yes") { - qtConfig += "mediaservice"; - if (dictionary["WMSDK"] == "yes") - qtConfig += "wmsdk"; + if (dictionary["MEDIASERVICES"] == "yes") { + qtConfig += "mediaservices"; + if (dictionary["MEDIA_BACKEND"] == "yes") { + qtConfig += "media-backend"; + if (dictionary["WMSDK"] == "yes") + qtConfig += "wmsdk"; + } } } @@ -3034,6 +3044,7 @@ void Configure::generateConfigfiles() if(dictionary["DECLARATIVE"] == "no") qconfigList += "QT_NO_DECLARATIVE"; if(dictionary["PHONON"] == "no") qconfigList += "QT_NO_PHONON"; if(dictionary["MULTIMEDIA"] == "no") qconfigList += "QT_NO_MULTIMEDIA"; + if(dictionary["MEDIASERVICES"] == "no") qconfigList += "QT_NO_MEDIASERVICES"; if(dictionary["XMLPATTERNS"] == "no") qconfigList += "QT_NO_XMLPATTERNS"; if(dictionary["SCRIPT"] == "no") qconfigList += "QT_NO_SCRIPT"; if(dictionary["SCRIPTTOOLS"] == "no") qconfigList += "QT_NO_SCRIPTTOOLS"; @@ -3336,6 +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 << "WebKit support.............." << dictionary[ "WEBKIT" ] << endl; cout << "Declarative support........." << dictionary[ "DECLARATIVE" ] << endl; cout << "QtScript support............" << dictionary[ "SCRIPT" ] << endl; |