summaryrefslogtreecommitdiffstats
path: root/src/plugins/mediaservices
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/mediaservices')
-rw-r--r--src/plugins/mediaservices/directshow/directshow.pro4
-rw-r--r--src/plugins/mediaservices/directshow/mediaplayer/directshowaudioendpointcontrol.h7
-rw-r--r--src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp116
-rw-r--r--src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.h8
-rw-r--r--src/plugins/mediaservices/directshow/mediaplayer/directshowpinenum.cpp2
-rw-r--r--src/plugins/mediaservices/directshow/mediaplayer/directshowplayercontrol.h4
-rw-r--r--src/plugins/mediaservices/directshow/mediaplayer/directshowplayerservice.cpp2
-rw-r--r--src/plugins/mediaservices/directshow/mediaplayer/directshowplayerservice.h8
-rw-r--r--src/plugins/mediaservices/directshow/mediaplayer/directshowvideooutputcontrol.h2
-rw-r--r--src/plugins/mediaservices/directshow/mediaplayer/directshowvideorenderercontrol.h2
-rw-r--r--src/plugins/mediaservices/directshow/mediaplayer/vmr9videowindowcontrol.h2
-rw-r--r--src/plugins/mediaservices/gstreamer/gstreamer.pro4
-rw-r--r--src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp108
-rw-r--r--src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.h8
-rw-r--r--src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp98
-rw-r--r--src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.h6
-rw-r--r--src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayerservice.h2
-rw-r--r--src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.cpp27
-rw-r--r--src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.h6
-rw-r--r--src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.cpp2
-rw-r--r--src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.h2
-rw-r--r--src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.h2
-rw-r--r--src/plugins/mediaservices/gstreamer/qgstreamervideooutputcontrol.h2
-rw-r--r--src/plugins/mediaservices/gstreamer/qgstreamervideooverlay.h2
-rw-r--r--src/plugins/mediaservices/gstreamer/qgstreamervideorenderer.h2
-rw-r--r--src/plugins/mediaservices/gstreamer/qgstreamervideowidget.h2
-rw-r--r--src/plugins/mediaservices/mediaservices.pro2
-rw-r--r--src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.h4
-rw-r--r--src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.mm2
-rw-r--r--src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h10
-rw-r--r--src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm20
-rw-r--r--src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.h2
-rw-r--r--src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm4
-rw-r--r--src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.h4
-rw-r--r--src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm17
-rw-r--r--src/plugins/mediaservices/qt7/qt7.pro4
-rw-r--r--src/plugins/mediaservices/qt7/qt7movieviewoutput.h4
-rw-r--r--src/plugins/mediaservices/qt7/qt7movieviewrenderer.h4
-rw-r--r--src/plugins/mediaservices/qt7/qt7serviceplugin.h2
-rw-r--r--src/plugins/mediaservices/qt7/qt7serviceplugin.mm2
-rw-r--r--src/plugins/mediaservices/qt7/qt7videooutputcontrol.h10
41 files changed, 289 insertions, 232 deletions
diff --git a/src/plugins/mediaservices/directshow/directshow.pro b/src/plugins/mediaservices/directshow/directshow.pro
index ea133f9..065e391 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 += multimedia 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..8d23751 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>
@@ -82,11 +82,6 @@ private:
#define QAudioEndpointSelector_iid "com.nokia.Qt.QAudioEndpointSelector/1.0"
-class Duck
-{
- uint quack;
-};
-
QT_END_NAMESPACE
QT_END_HEADER
diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp b/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp
index 89821c4..7f67a82 100644
--- a/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp
+++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp
@@ -57,76 +57,76 @@ namespace
{
struct QWMMetaDataKeyLookup
{
- 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..e368f00 100644
--- a/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.h
+++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.h
@@ -44,7 +44,7 @@
#include "directshowglobal.h"
-#include <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..02b1a3b 100644
--- a/src/plugins/mediaservices/directshow/mediaplayer/directshowpinenum.cpp
+++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowpinenum.cpp
@@ -41,7 +41,7 @@
#include "directshowpinenum.h"
-#include <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..6b5203e 100644
--- a/src/plugins/mediaservices/directshow/mediaplayer/directshowplayercontrol.h
+++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowplayercontrol.h
@@ -42,8 +42,8 @@
#ifndef DIRECTSHOWPLAYERCONTROL_H
#define DIRECTSHOWPLAYERCONTROL_H
-#include <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..8ad8cff 100644
--- a/src/plugins/mediaservices/directshow/mediaplayer/directshowplayerservice.cpp
+++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowplayerservice.cpp
@@ -49,7 +49,7 @@
#include "directshowvideorenderercontrol.h"
#include "vmr9videowindowcontrol.h"
-#include <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..a3f94e1 100644
--- a/src/plugins/mediaservices/directshow/mediaplayer/directshowplayerservice.h
+++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowplayerservice.h
@@ -42,10 +42,10 @@
#ifndef DIRECTSHOWPLAYERSERVICE_H
#define DIRECTSHOWPLAYERSERVICE_H
-#include <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..9b857ce 100644
--- a/src/plugins/mediaservices/directshow/mediaplayer/directshowvideooutputcontrol.h
+++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowvideooutputcontrol.h
@@ -42,7 +42,7 @@
#ifndef DIRECTSHOWVIDEOUTPUTCONTROL_H
#define DIRECTSHOWVIDEOOUPUTCONTROL_H
-#include <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..adaa0f8 100644
--- a/src/plugins/mediaservices/directshow/mediaplayer/directshowvideorenderercontrol.h
+++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowvideorenderercontrol.h
@@ -42,7 +42,7 @@
#ifndef DIRECTSHOWVIDEORENDERERCONTROL_H
#define DIRECTSHOWVIDEORENDERERCONTROL_H
-#include <QtMultimedia/qvideorenderercontrol.h>
+#include <QtMediaServices/qvideorenderercontrol.h>
#include <dshow.h>
diff --git a/src/plugins/mediaservices/directshow/mediaplayer/vmr9videowindowcontrol.h b/src/plugins/mediaservices/directshow/mediaplayer/vmr9videowindowcontrol.h
index beac433..702dfd6 100644
--- a/src/plugins/mediaservices/directshow/mediaplayer/vmr9videowindowcontrol.h
+++ b/src/plugins/mediaservices/directshow/mediaplayer/vmr9videowindowcontrol.h
@@ -42,7 +42,7 @@
#ifndef VMR9VIDEOWINDOWCONTROL_H
#define VMR9VIDEOWINDOWCONTROL_H
-#include <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..f51d024 100644
--- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
+++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
@@ -49,77 +49,77 @@ QT_BEGIN_NAMESPACE
struct QGstreamerMetaDataKeyLookup
{
- 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, QtMediaServices::MetaData(-1));
if (tag != -1)
res.append(tag);
}
diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.h b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.h
index 267c2d7..4cf716a 100644
--- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.h
+++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.h
@@ -42,7 +42,7 @@
#ifndef QGSTREAMERMETADATAPROVIDER_H
#define QGSTREAMERMETADATAPROVIDER_H
-#include <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.cpp b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
index e646693..6dd914a 100644
--- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
+++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
@@ -62,6 +62,7 @@ QGstreamerPlayerControl::QGstreamerPlayerControl(QGstreamerPlayerSession *sessio
, m_state(QMediaPlayer::StoppedState)
, m_mediaStatus(QMediaPlayer::NoMedia)
, m_bufferProgress(-1)
+ , m_seekToStartPending(false)
, m_stream(0)
, m_fifoNotifier(0)
, m_fifoCanWrite(false)
@@ -107,7 +108,7 @@ QGstreamerPlayerControl::~QGstreamerPlayerControl()
qint64 QGstreamerPlayerControl::position() const
{
- return m_session->position();
+ return m_seekToStartPending ? 0 : m_session->position();
}
qint64 QGstreamerPlayerControl::duration() const
@@ -170,37 +171,77 @@ void QGstreamerPlayerControl::setPlaybackRate(qreal rate)
void QGstreamerPlayerControl::setPosition(qint64 pos)
{
- m_session->seek(pos);
+ if (m_mediaStatus == QMediaPlayer::EndOfMedia) {
+ m_mediaStatus = QMediaPlayer::LoadedMedia;
+ emit mediaStatusChanged(m_mediaStatus);
+ }
+
+ if (m_session->seek(pos))
+ m_seekToStartPending = false;
}
void QGstreamerPlayerControl::play()
{
- if (m_session->play()) {
- if (m_state != QMediaPlayer::PlayingState)
- emit stateChanged(m_state = QMediaPlayer::PlayingState);
- }
+ playOrPause(QMediaPlayer::PlayingState);
}
void QGstreamerPlayerControl::pause()
{
- if (m_session->pause()) {
- if (m_state != QMediaPlayer::PausedState)
- emit stateChanged(m_state = QMediaPlayer::PausedState);
- }
+ playOrPause(QMediaPlayer::PausedState);
}
-void QGstreamerPlayerControl::stop()
+void QGstreamerPlayerControl::playOrPause(QMediaPlayer::State newState)
{
- if (m_state != QMediaPlayer::StoppedState) {
+ QMediaPlayer::State oldState = m_state;
+ QMediaPlayer::MediaStatus oldMediaStatus = m_mediaStatus;
+
+ if (m_mediaStatus == QMediaPlayer::EndOfMedia)
+ m_mediaStatus = QMediaPlayer::BufferedMedia;
+
+ if (m_seekToStartPending) {
m_session->pause();
if (!m_session->seek(0)) {
m_bufferProgress = -1;
m_session->stop();
- m_session->pause();
+ m_mediaStatus = QMediaPlayer::LoadingMedia;
}
+ m_seekToStartPending = false;
+ }
+
+ bool ok = false;
+ if (newState == QMediaPlayer::PlayingState)
+ ok = m_session->play();
+ else
+ ok = m_session->pause();
+
+ if (!ok)
+ return;
+
+ m_state = newState;
+
+ if (m_mediaStatus == QMediaPlayer::EndOfMedia || m_mediaStatus == QMediaPlayer::LoadedMedia) {
+ if (m_bufferProgress == -1 || m_bufferProgress == 100)
+ m_mediaStatus = QMediaPlayer::BufferedMedia;
+ else
+ m_mediaStatus = QMediaPlayer::BufferingMedia;
+ }
+
+ if (m_state != oldState)
+ emit stateChanged(m_state);
+ if (m_mediaStatus != oldMediaStatus)
+ emit mediaStatusChanged(m_mediaStatus);
+
+}
+
+void QGstreamerPlayerControl::stop()
+{
+ if (m_state != QMediaPlayer::StoppedState) {
+ m_state = QMediaPlayer::StoppedState;
+ m_session->pause();
+ m_seekToStartPending = true;
+ updateState(m_session->state());
emit positionChanged(0);
- if (m_state != QMediaPlayer::StoppedState)
- emit stateChanged(m_state = QMediaPlayer::StoppedState);
+ emit stateChanged(m_state);
}
}
@@ -244,6 +285,7 @@ void QGstreamerPlayerControl::setMedia(const QMediaContent &content, QIODevice *
m_currentResource = content;
m_stream = stream;
+ m_seekToStartPending = false;
QUrl url;
@@ -255,7 +297,7 @@ void QGstreamerPlayerControl::setMedia(const QMediaContent &content, QIODevice *
url = content.canonicalUrl();
}
- m_session->load(url);
+ m_session->load(url);
if (m_fifoFd[1] >= 0) {
m_fifoCanWrite = true;
@@ -296,24 +338,34 @@ bool QGstreamerPlayerControl::isVideoAvailable() const
void QGstreamerPlayerControl::updateState(QMediaPlayer::State state)
{
QMediaPlayer::MediaStatus oldStatus = m_mediaStatus;
+ QMediaPlayer::State oldState = m_state;
switch (state) {
case QMediaPlayer::StoppedState:
- if (m_state != QMediaPlayer::StoppedState)
- emit stateChanged(m_state = QMediaPlayer::StoppedState);
+ m_state = QMediaPlayer::StoppedState;
+ if (m_currentResource.isNull())
+ m_mediaStatus = QMediaPlayer::NoMedia;
+ else
+ m_mediaStatus = QMediaPlayer::LoadingMedia;
break;
case QMediaPlayer::PlayingState:
case QMediaPlayer::PausedState:
- if (m_state == QMediaPlayer::StoppedState)
+ if (m_state == QMediaPlayer::StoppedState) {
m_mediaStatus = QMediaPlayer::LoadedMedia;
- else {
- if (m_bufferProgress == -1)
+ } else {
+ if (m_bufferProgress == -1 || m_bufferProgress == 100)
m_mediaStatus = QMediaPlayer::BufferedMedia;
}
break;
}
+ //EndOfMedia status should be kept, until reset by pause, play or setMedia
+ if (oldStatus == QMediaPlayer::EndOfMedia)
+ m_mediaStatus = QMediaPlayer::EndOfMedia;
+
+ if (m_state != oldState)
+ emit stateChanged(m_state);
if (m_mediaStatus != oldStatus)
emit mediaStatusChanged(m_mediaStatus);
}
@@ -321,9 +373,7 @@ void QGstreamerPlayerControl::updateState(QMediaPlayer::State state)
void QGstreamerPlayerControl::processEOS()
{
m_mediaStatus = QMediaPlayer::EndOfMedia;
- m_state = QMediaPlayer::StoppedState;
-
- emit stateChanged(m_state);
+ stop();
emit mediaStatusChanged(m_mediaStatus);
}
diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.h b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.h
index 0c53945..c95f37a 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 <QtMediaServices/qmediaplayercontrol.h>
+#include <QtMediaServices/qmediaplayer.h>
#include <limits.h>
@@ -114,11 +114,13 @@ private Q_SLOTS:
private:
bool openFifo();
void closeFifo();
+ void playOrPause(QMediaPlayer::State state);
QGstreamerPlayerSession *m_session;
QMediaPlayer::State m_state;
QMediaPlayer::MediaStatus m_mediaStatus;
int m_bufferProgress;
+ bool m_seekToStartPending;
QMediaContent m_currentResource;
QIODevice *m_stream;
QSocketNotifier *m_fifoNotifier;
diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayerservice.h b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayerservice.h
index f60c72e..1283966 100644
--- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayerservice.h
+++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayerservice.h
@@ -45,7 +45,7 @@
#include <QtCore/qobject.h>
#include <QtCore/qiodevice.h>
-#include <QtMultimedia/qmediaservice.h>
+#include <QtMediaServices/qmediaservice.h>
#include "qgstreamervideooutputcontrol.h"
diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.cpp
index 56cdb04..6a44aa1 100644
--- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.cpp
+++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.cpp
@@ -182,7 +182,7 @@ void QGstreamerPlayerSession::setPlaybackRate(qreal rate)
m_playbackRate = rate;
if (m_playbin) {
gst_element_seek(m_playbin, rate, GST_FORMAT_TIME,
- GstSeekFlags(GST_SEEK_FLAG_ACCURATE | GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_SEGMENT),
+ GstSeekFlags(GST_SEEK_FLAG_ACCURATE | GST_SEEK_FLAG_FLUSH),
GST_SEEK_TYPE_NONE,0,
GST_SEEK_TYPE_NONE,0 );
}
@@ -464,8 +464,16 @@ bool QGstreamerPlayerSession::seek(qint64 ms)
{
//seek locks when the video output sink is changing and pad is blocked
if (m_playbin && !m_pendingVideoSink && m_state != QMediaPlayer::StoppedState) {
+
gint64 position = qMax(ms,qint64(0)) * 1000000;
- return gst_element_seek_simple(m_playbin, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, position);
+ return gst_element_seek(m_playbin,
+ m_playbackRate,
+ GST_FORMAT_TIME,
+ GstSeekFlags(GST_SEEK_FLAG_ACCURATE | GST_SEEK_FLAG_FLUSH),
+ GST_SEEK_TYPE_SET,
+ position,
+ GST_SEEK_TYPE_NONE,
+ 0);
}
return false;
@@ -666,8 +674,11 @@ void QGstreamerPlayerSession::busMessage(const QGstreamerMessage &message)
setSeekable(true);
- if (!qFuzzyCompare(m_playbackRate, qreal(1.0)))
- setPlaybackRate(m_playbackRate);
+ if (!qFuzzyCompare(m_playbackRate, qreal(1.0))) {
+ qreal rate = m_playbackRate;
+ m_playbackRate = 1.0;
+ setPlaybackRate(rate);
+ }
if (m_renderer)
m_renderer->precessNewStream();
@@ -812,7 +823,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 +845,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 +900,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..6499a84 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..0ca7d54 100644
--- a/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.cpp
+++ b/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.cpp
@@ -52,7 +52,7 @@
#ifdef QMEDIA_GSTREAMER_CAPTURE
#include "qgstreamercaptureservice.h"
#endif
-#include <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..e0a5dfd 100644
--- a/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.h
+++ b/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.h
@@ -43,7 +43,7 @@
#ifndef QGSTREAMERSERVICEPLUGIN_H
#define QGSTREAMERSERVICEPLUGIN_H
-#include <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..7994f9c 100644
--- a/src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.h
+++ b/src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.h
@@ -42,7 +42,7 @@
#ifndef QGSTREAMERVIDEOINPUTDEVICECONTROL_H
#define QGSTREAMERVIDEOINPUTDEVICECONTROL_H
-#include <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..6d7d47f 100644
--- a/src/plugins/mediaservices/gstreamer/qgstreamervideooutputcontrol.h
+++ b/src/plugins/mediaservices/gstreamer/qgstreamervideooutputcontrol.h
@@ -42,7 +42,7 @@
#ifndef QGSTREAMERVIDEOOUTPUTCONTROL_H
#define QGSTREAMERVIDEOOUTPUTCONTROL_H
-#include <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..f44c25b 100644
--- a/src/plugins/mediaservices/gstreamer/qgstreamervideooverlay.h
+++ b/src/plugins/mediaservices/gstreamer/qgstreamervideooverlay.h
@@ -42,7 +42,7 @@
#ifndef QGSTREAMERVIDEOOVERLAY_H
#define QGSTREAMERVIDEOOVERLAY_H
-#include <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..0fbbd63 100644
--- a/src/plugins/mediaservices/gstreamer/qgstreamervideorenderer.h
+++ b/src/plugins/mediaservices/gstreamer/qgstreamervideorenderer.h
@@ -42,7 +42,7 @@
#ifndef QGSTREAMERVIDEORENDERER_H
#define QGSTREAMERVIDEORENDERER_H
-#include <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..d54a1fc 100644
--- a/src/plugins/mediaservices/gstreamer/qgstreamervideowidget.h
+++ b/src/plugins/mediaservices/gstreamer/qgstreamervideowidget.h
@@ -42,7 +42,7 @@
#ifndef QGSTREAMERVIDEOWIDGET_H
#define QGSTREAMERVIDEOWIDGET_H
-#include <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..5ac97b1 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..ba22552 100644
--- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.mm
+++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.mm
@@ -42,7 +42,7 @@
#include "qt7playercontrol.h"
#include "qt7playersession.h"
-#include <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..8cbc29a 100644
--- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h
+++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h
@@ -42,7 +42,7 @@
#ifndef QT7PLAYERMETADATACONTROL_H
#define QT7PLAYERMETADATACONTROL_H
-#include <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..2ea778d 100644
--- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm
+++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm
@@ -72,18 +72,18 @@ bool QT7PlayerMetaDataControl::isWritable() const
return false;
}
-QVariant QT7PlayerMetaDataControl::metaData(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..9a22c31 100644
--- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.h
+++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.h
@@ -43,7 +43,7 @@
#define QT7PLAYERSERVICE_H
#include <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..cf79622 100644
--- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm
+++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm
@@ -54,8 +54,8 @@
#include "qt7movievideowidget.h"
#include "qt7playermetadata.h"
-#include <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..2450cf8 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..0405bbd 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>
@@ -153,10 +153,9 @@
QT_BEGIN_NAMESPACE
-static CFStringRef qString2CFStringRef(const QString &string)
+static inline NSString *qString2CFStringRef(const QString &string)
{
- return CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(string.unicode()),
- string.length());
+ return [NSString stringWithCharacters:reinterpret_cast<const UniChar *>(string.unicode()) length:string.length()];
}
QT7PlayerSession::QT7PlayerSession(QObject *parent)
@@ -391,10 +390,10 @@ void QT7PlayerSession::setMedia(const QMediaContent &content, QIODevice *stream)
foreach (const QNetworkCookie &requestCookie, cookieList) {
NSMutableDictionary *p = [NSMutableDictionary dictionaryWithObjectsAndKeys:
- (NSString*)qString2CFStringRef(requestCookie.name()), NSHTTPCookieName,
- (NSString*)qString2CFStringRef(requestCookie.value()), NSHTTPCookieValue,
- (NSString*)qString2CFStringRef(requestCookie.domain()), NSHTTPCookieDomain,
- (NSString*)qString2CFStringRef(requestCookie.path()), NSHTTPCookiePath,
+ qString2CFStringRef(requestCookie.name()), NSHTTPCookieName,
+ qString2CFStringRef(requestCookie.value()), NSHTTPCookieValue,
+ qString2CFStringRef(requestCookie.domain()), NSHTTPCookieDomain,
+ qString2CFStringRef(requestCookie.path()), NSHTTPCookiePath,
nil
];
if (requestCookie.isSessionCookie())
@@ -407,7 +406,7 @@ void QT7PlayerSession::setMedia(const QMediaContent &content, QIODevice *stream)
}
NSError *err = 0;
- NSString *urlString = (NSString *)qString2CFStringRef(request.url().toString());
+ NSString *urlString = qString2CFStringRef(request.url().toString());
NSDictionary *attr = [NSDictionary dictionaryWithObjectsAndKeys:
[NSURL URLWithString:urlString], QTMovieURLAttribute,
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..d6bfd14 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..fa4db4d 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..3871e10 100644
--- a/src/plugins/mediaservices/qt7/qt7serviceplugin.h
+++ b/src/plugins/mediaservices/qt7/qt7serviceplugin.h
@@ -43,7 +43,7 @@
#ifndef QT7SERVICEPLUGIN_H
#define QT7SERVICEPLUGIN_H
-#include <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..92b472f 100644
--- a/src/plugins/mediaservices/qt7/qt7serviceplugin.mm
+++ b/src/plugins/mediaservices/qt7/qt7serviceplugin.mm
@@ -45,7 +45,7 @@
#include "qt7serviceplugin.h"
#include "qt7playerservice.h"
-#include <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..76066ba 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>