diff options
Diffstat (limited to 'src/plugins')
40 files changed, 191 insertions, 191 deletions
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> |