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

Rename QtMultimediaKit to QtMultimedia.

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

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

4
src/plugins/audiocapture/audiocapture.pro
View File

@@ -1,11 +1,11 @@
load(qt_module)
TARGET = qtmedia_audioengine
QT += multimediakit-private
QT += multimedia-private
PLUGIN_TYPE=mediaservice
load(qt_plugin)
DESTDIR = $$QT.multimediakit.plugins/$${PLUGIN_TYPE}
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
# Input
HEADERS += audioencodercontrol.h \

10
src/plugins/audiocapture/audioencodercontrol.cpp
View File

@@ -60,12 +60,12 @@ AudioEncoderControl::AudioEncoderControl(QObject *parent)
fmt.setByteOrder(QAudioFormat::LittleEndian);
m_session->setFormat(fmt);
m_settings.setEncodingMode(QtMultimediaKit::ConstantQualityEncoding);
m_settings.setEncodingMode(QtMultimedia::ConstantQualityEncoding);
m_settings.setCodec("audio/pcm");
m_settings.setBitRate(8000);
m_settings.setChannelCount(1);
m_settings.setSampleRate(8000);
m_settings.setQuality(QtMultimediaKit::LowQuality);
m_settings.setQuality(QtMultimedia::LowQuality);
}
AudioEncoderControl::~AudioEncoderControl()
@@ -130,14 +130,14 @@ void AudioEncoderControl::setAudioSettings(const QAudioEncoderSettings &settings
{
QAudioFormat fmt = m_session->format();
if (settings.encodingMode() == QtMultimediaKit::ConstantQualityEncoding) {
if (settings.quality() == QtMultimediaKit::LowQuality) {
if (settings.encodingMode() == QtMultimedia::ConstantQualityEncoding) {
if (settings.quality() == QtMultimedia::LowQuality) {
fmt.setSampleSize(8);
fmt.setChannels(1);
fmt.setFrequency(8000);
fmt.setSampleType(QAudioFormat::UnSignedInt);
} else if (settings.quality() == QtMultimediaKit::NormalQuality) {
} else if (settings.quality() == QtMultimedia::NormalQuality) {
fmt.setSampleSize(16);
fmt.setChannels(1);
fmt.setFrequency(22050);

5
src/plugins/directshow/directshow.pro
View File

@@ -6,11 +6,8 @@ TARGET = $$qtLibraryTarget(dsengine)
PLUGIN_TYPE=mediaservice
include (../../../common.pri)
INCLUDEPATH+=../../multimediakit \
../../multimediakit/audio \
../../multimediakit/video
qtAddLibrary(QtMultimediaKit)
QT += multimedia
DEPENDPATH += .

114
src/plugins/directshow/player/directshowmetadatacontrol.cpp
View File

@@ -54,76 +54,76 @@ namespace
{
struct QWMMetaDataKeyLookup
{
QtMultimediaKit::MetaData key;
QtMultimedia::MetaData key;
const wchar_t *token;
};
}
static const QWMMetaDataKeyLookup qt_wmMetaDataKeys[] =
{
{ QtMultimediaKit::Title, L"Title" },
{ QtMultimediaKit::SubTitle, L"WM/SubTitle" },
{ QtMultimediaKit::Author, L"Author" },
{ QtMultimediaKit::Comment, L"Comment" },
{ QtMultimediaKit::Description, L"Description" },
{ QtMultimediaKit::Category, L"WM/Category" },
{ QtMultimediaKit::Genre, L"WM/Genre" },
//{ QtMultimediaKit::Date, 0 },
{ QtMultimediaKit::Year, L"WM/Year" },
{ QtMultimediaKit::UserRating, L"UserRating" },
//{ QtMultimediaKit::MetaDatawords, 0 },
{ QtMultimediaKit::Language, L"Language" },
{ QtMultimediaKit::Publisher, L"WM/Publisher" },
{ QtMultimediaKit::Copyright, L"Copyright" },
{ QtMultimediaKit::ParentalRating, L"ParentalRating" },
{ QtMultimediaKit::RatingOrganisation, L"RatingOrganisation" },
{ 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" },
// Media
{ QtMultimediaKit::Size, L"FileSize" },
{ QtMultimediaKit::MediaType, L"MediaType" },
{ QtMultimediaKit::Duration, L"Duration" },
{ QtMultimedia::Size, L"FileSize" },
{ QtMultimedia::MediaType, L"MediaType" },
{ QtMultimedia::Duration, L"Duration" },
// Audio
{ QtMultimediaKit::AudioBitRate, L"AudioBitRate" },
{ QtMultimediaKit::AudioCodec, L"AudioCodec" },
{ QtMultimediaKit::ChannelCount, L"ChannelCount" },
{ QtMultimediaKit::SampleRate, L"Frequency" },
{ QtMultimedia::AudioBitRate, L"AudioBitRate" },
{ QtMultimedia::AudioCodec, L"AudioCodec" },
{ QtMultimedia::ChannelCount, L"ChannelCount" },
{ QtMultimedia::SampleRate, L"Frequency" },
// Music
{ QtMultimediaKit::AlbumTitle, L"WM/AlbumTitle" },
{ QtMultimediaKit::AlbumArtist, L"WM/AlbumArtist" },
{ QtMultimediaKit::ContributingArtist, L"Author" },
{ QtMultimediaKit::Composer, L"WM/Composer" },
{ QtMultimediaKit::Conductor, L"WM/Conductor" },
{ QtMultimediaKit::Lyrics, L"WM/Lyrics" },
{ QtMultimediaKit::Mood, L"WM/Mood" },
{ QtMultimediaKit::TrackNumber, L"WM/TrackNumber" },
//{ QtMultimediaKit::TrackCount, 0 },
//{ QtMultimediaKit::CoverArtUriSmall, 0 },
//{ QtMultimediaKit::CoverArtUriLarge, 0 },
{ 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 },
// Image/Video
//{ QtMultimediaKit::Resolution, 0 },
//{ QtMultimediaKit::PixelAspectRatio, 0 },
//{ QtMultimedia::Resolution, 0 },
//{ QtMultimedia::PixelAspectRatio, 0 },
// Video
//{ QtMultimediaKit::FrameRate, 0 },
{ QtMultimediaKit::VideoBitRate, L"VideoBitRate" },
{ QtMultimediaKit::VideoCodec, L"VideoCodec" },
//{ QtMultimedia::FrameRate, 0 },
{ QtMultimedia::VideoBitRate, L"VideoBitRate" },
{ QtMultimedia::VideoCodec, L"VideoCodec" },
//{ QtMultimediaKit::PosterUri, 0 },
//{ QtMultimedia::PosterUri, 0 },
// Movie
{ QtMultimediaKit::ChapterNumber, L"ChapterNumber" },
{ QtMultimediaKit::Director, L"WM/Director" },
{ QtMultimediaKit::LeadPerformer, L"LeadPerformer" },
{ QtMultimediaKit::Writer, L"WM/Writer" },
{ QtMultimedia::ChapterNumber, L"ChapterNumber" },
{ QtMultimedia::Director, L"WM/Director" },
{ QtMultimedia::LeadPerformer, L"LeadPerformer" },
{ QtMultimedia::Writer, L"WM/Writer" },
// Photos
{ QtMultimediaKit::CameraManufacturer, L"CameraManufacturer" },
{ QtMultimediaKit::CameraModel, L"CameraModel" },
{ QtMultimediaKit::Event, L"Event" },
{ QtMultimediaKit::Subject, L"Subject" }
{ QtMultimedia::CameraManufacturer, L"CameraManufacturer" },
{ QtMultimedia::CameraModel, L"CameraModel" },
{ QtMultimedia::Event, L"Event" },
{ QtMultimedia::Subject, L"Subject" }
};
static QVariant getValue(IWMHeaderInfo *header, const wchar_t *key)
@@ -249,7 +249,7 @@ bool DirectShowMetaDataControl::isMetaDataAvailable() const
#endif
}
QVariant DirectShowMetaDataControl::metaData(QtMultimediaKit::MetaData key) const
QVariant DirectShowMetaDataControl::metaData(QtMultimedia::MetaData key) const
{
QVariant value;
@@ -269,19 +269,19 @@ QVariant DirectShowMetaDataControl::metaData(QtMultimediaKit::MetaData key) cons
BSTR string = 0;
switch (key) {
case QtMultimediaKit::Author:
case QtMultimedia::Author:
m_content->get_AuthorName(&string);
break;
case QtMultimediaKit::Title:
case QtMultimedia::Title:
m_content->get_Title(&string);
break;
case QtMultimediaKit::ParentalRating:
case QtMultimedia::ParentalRating:
m_content->get_Rating(&string);
break;
case QtMultimediaKit::Description:
case QtMultimedia::Description:
m_content->get_Description(&string);
break;
case QtMultimediaKit::Copyright:
case QtMultimedia::Copyright:
m_content->get_Copyright(&string);
break;
default:
@@ -297,9 +297,9 @@ QVariant DirectShowMetaDataControl::metaData(QtMultimediaKit::MetaData key) cons
return value;
}
QList<QtMultimediaKit::MetaData> DirectShowMetaDataControl::availableMetaData() const
QList<QtMultimedia::MetaData> DirectShowMetaDataControl::availableMetaData() const
{
return QList<QtMultimediaKit::MetaData>();
return QList<QtMultimedia::MetaData>();
}
QVariant DirectShowMetaDataControl::extendedMetaData(const QString &) const

4
src/plugins/directshow/player/directshowmetadatacontrol.h
View File

@@ -67,8 +67,8 @@ public:
bool isMetaDataAvailable() const;
QVariant metaData(QtMultimediaKit::MetaData key) const;
QList<QtMultimediaKit::MetaData> availableMetaData() const;
QVariant metaData(QtMultimedia::MetaData key) const;
QList<QtMultimedia::MetaData> availableMetaData() const;
QVariant extendedMetaData(const QString &key) const;
QStringList availableExtendedMetaData() const;

4
src/plugins/fakeradio/fakeradio.pro
View File

@@ -1,11 +1,11 @@
load(qt_module)
TARGET = qtmedia_fakeradio
QT += multimediakit-private
QT += multimedia-private
PLUGIN_TYPE = mediaservice
load(qt_plugin)
DESTDIR = $$QT.multimediakit.plugins/$${PLUGIN_TYPE}
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
HEADERS += \
fakeradioserviceplugin.h \

4
src/plugins/fakeradio/fakeradiotunercontrol.cpp
View File

@@ -79,9 +79,9 @@ bool FakeRadioTunerControl::isAvailable() const
return true;
}
QtMultimediaKit::AvailabilityError FakeRadioTunerControl::availabilityError() const
QtMultimedia::AvailabilityError FakeRadioTunerControl::availabilityError() const
{
return QtMultimediaKit::NoError;
return QtMultimedia::NoError;
}
QRadioTuner::State FakeRadioTunerControl::state() const

2
src/plugins/fakeradio/fakeradiotunercontrol.h
View File

@@ -60,7 +60,7 @@ public:
~FakeRadioTunerControl();
bool isAvailable() const;
QtMultimediaKit::AvailabilityError availabilityError() const;
QtMultimedia::AvailabilityError availabilityError() const;
QRadioTuner::State state() const;

30
src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
View File

@@ -55,7 +55,7 @@
#define IMAGE_DONE_SIGNAL "image-done"
Q_DECLARE_METATYPE(QVideoFrame)
Q_DECLARE_METATYPE(QtMultimediaKit::MetaData)
Q_DECLARE_METATYPE(QtMultimedia::MetaData)
namespace
{
@@ -65,7 +65,7 @@ public:
CameraRegisterMetaTypes()
{
qRegisterMetaType<QVideoFrame>("QVideoFrame");
qRegisterMetaType<QtMultimediaKit::MetaData>("QtMultimediaKit::MetaData");
qRegisterMetaType<QtMultimedia::MetaData>("QtMultimedia::MetaData");
}
} _registerCameraMetaTypes;
}
@@ -140,26 +140,26 @@ gboolean CameraBinImageCapture::metadataEventProbe(GstPad *pad, GstEvent *event,
qDebug() << "Capture event probe" << extendedTags;
#endif
QMap<QtMultimediaKit::MetaData, QVariant> tags;
tags[QtMultimediaKit::ISOSpeedRatings] = extendedTags.value("capturing-iso-speed");
tags[QtMultimediaKit::DigitalZoomRatio] = extendedTags.value("capturing-digital-zoom-ratio");
tags[QtMultimediaKit::ExposureTime] = extendedTags.value("capturing-shutter-speed");
tags[QtMultimediaKit::WhiteBalance] = extendedTags.value("capturing-white-balance");
tags[QtMultimediaKit::Flash] = extendedTags.value("capturing-flash-fired");
tags[QtMultimediaKit::FocalLengthIn35mmFilm] = extendedTags.value("capturing-focal-length");
tags[QtMultimediaKit::MeteringMode] = extendedTags.value("capturing-metering-mode");
tags[QtMultimediaKit::ExposureMode] = extendedTags.value("capturing-exposure-mode");
tags[QtMultimediaKit::FNumber] = extendedTags.value("capturing-focal-ratio");
tags[QtMultimediaKit::ExposureMode] = extendedTags.value("capturing-exposure-mode");
QMap<QtMultimedia::MetaData, QVariant> tags;
tags[QtMultimedia::ISOSpeedRatings] = extendedTags.value("capturing-iso-speed");
tags[QtMultimedia::DigitalZoomRatio] = extendedTags.value("capturing-digital-zoom-ratio");
tags[QtMultimedia::ExposureTime] = extendedTags.value("capturing-shutter-speed");
tags[QtMultimedia::WhiteBalance] = extendedTags.value("capturing-white-balance");
tags[QtMultimedia::Flash] = extendedTags.value("capturing-flash-fired");
tags[QtMultimedia::FocalLengthIn35mmFilm] = extendedTags.value("capturing-focal-length");
tags[QtMultimedia::MeteringMode] = extendedTags.value("capturing-metering-mode");
tags[QtMultimedia::ExposureMode] = extendedTags.value("capturing-exposure-mode");
tags[QtMultimedia::FNumber] = extendedTags.value("capturing-focal-ratio");
tags[QtMultimedia::ExposureMode] = extendedTags.value("capturing-exposure-mode");
QMapIterator<QtMultimediaKit::MetaData, QVariant> i(tags);
QMapIterator<QtMultimedia::MetaData, QVariant> i(tags);
while (i.hasNext()) {
i.next();
if (i.value().isValid()) {
QMetaObject::invokeMethod(self, "imageMetadataAvailable",
Qt::QueuedConnection,
Q_ARG(int, self->m_requestId),
Q_ARG(QtMultimediaKit::MetaData, i.key()),
Q_ARG(QtMultimedia::MetaData, i.key()),
Q_ARG(QVariant, i.value()));
}
}

104
src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
View File

@@ -46,77 +46,77 @@
struct QGstreamerMetaDataKeyLookup
{
QtMultimediaKit::MetaData key;
QtMultimedia::MetaData key;
const char *token;
};
static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] =
{
{ QtMultimediaKit::Title, GST_TAG_TITLE },
//{ QtMultimediaKit::SubTitle, 0 },
//{ QtMultimediaKit::Author, 0 },
{ QtMultimediaKit::Comment, GST_TAG_COMMENT },
{ QtMultimediaKit::Description, GST_TAG_DESCRIPTION },
//{ QtMultimediaKit::Category, 0 },
{ QtMultimediaKit::Genre, GST_TAG_GENRE },
//{ QtMultimediaKit::Year, 0 },
//{ QtMultimediaKit::UserRating, 0 },
{ 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, 0 },
//{ QtMultimedia::UserRating, 0 },
{ QtMultimediaKit::Language, GST_TAG_LANGUAGE_CODE },
{ QtMultimedia::Language, GST_TAG_LANGUAGE_CODE },
{ QtMultimediaKit::Publisher, GST_TAG_ORGANIZATION },
{ QtMultimediaKit::Copyright, GST_TAG_COPYRIGHT },
//{ QtMultimediaKit::ParentalRating, 0 },
//{ QtMultimediaKit::RatingOrganisation, 0 },
{ QtMultimedia::Publisher, GST_TAG_ORGANIZATION },
{ QtMultimedia::Copyright, GST_TAG_COPYRIGHT },
//{ QtMultimedia::ParentalRating, 0 },
//{ QtMultimedia::RatingOrganisation, 0 },
// Media
//{ QtMultimediaKit::Size, 0 },
//{ QtMultimediaKit::MediaType, 0 },
{ QtMultimediaKit::Duration, GST_TAG_DURATION },
//{ QtMultimedia::Size, 0 },
//{ QtMultimedia::MediaType, 0 },
{ QtMultimedia::Duration, GST_TAG_DURATION },
// Audio
{ QtMultimediaKit::AudioBitRate, GST_TAG_BITRATE },
{ QtMultimediaKit::AudioCodec, GST_TAG_AUDIO_CODEC },
//{ QtMultimediaKit::ChannelCount, 0 },
//{ QtMultimediaKit::SampleRate, 0 },
{ QtMultimedia::AudioBitRate, GST_TAG_BITRATE },
{ QtMultimedia::AudioCodec, GST_TAG_AUDIO_CODEC },
//{ QtMultimedia::ChannelCount, 0 },
//{ QtMultimedia::SampleRate, 0 },
// Music
{ QtMultimediaKit::AlbumTitle, GST_TAG_ALBUM },
{ QtMultimediaKit::AlbumArtist, GST_TAG_ARTIST},
{ QtMultimediaKit::ContributingArtist, GST_TAG_PERFORMER },
{ QtMultimedia::AlbumTitle, GST_TAG_ALBUM },
{ QtMultimedia::AlbumArtist, GST_TAG_ARTIST},
{ QtMultimedia::ContributingArtist, GST_TAG_PERFORMER },
#if (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19)
{ QtMultimediaKit::Composer, GST_TAG_COMPOSER },
{ QtMultimedia::Composer, GST_TAG_COMPOSER },
#endif
//{ QtMultimediaKit::Conductor, 0 },
//{ QtMultimediaKit::Lyrics, 0 },
//{ QtMultimediaKit::Mood, 0 },
{ QtMultimediaKit::TrackNumber, GST_TAG_TRACK_NUMBER },
//{ QtMultimedia::Conductor, 0 },
//{ QtMultimedia::Lyrics, 0 },
//{ QtMultimedia::Mood, 0 },
{ QtMultimedia::TrackNumber, GST_TAG_TRACK_NUMBER },
//{ QtMultimediaKit::CoverArtUrlSmall, 0 },
//{ QtMultimediaKit::CoverArtUrlLarge, 0 },
//{ QtMultimedia::CoverArtUrlSmall, 0 },
//{ QtMultimedia::CoverArtUrlLarge, 0 },
// Image/Video
//{ QtMultimediaKit::Resolution, 0 },
//{ QtMultimediaKit::PixelAspectRatio, 0 },
//{ QtMultimedia::Resolution, 0 },
//{ QtMultimedia::PixelAspectRatio, 0 },
// Video
//{ QtMultimediaKit::VideoFrameRate, 0 },
//{ QtMultimediaKit::VideoBitRate, 0 },
{ QtMultimediaKit::VideoCodec, GST_TAG_VIDEO_CODEC },
//{ QtMultimedia::VideoFrameRate, 0 },
//{ QtMultimedia::VideoBitRate, 0 },
{ QtMultimedia::VideoCodec, GST_TAG_VIDEO_CODEC },
//{ QtMultimediaKit::PosterUrl, 0 },
//{ QtMultimedia::PosterUrl, 0 },
// Movie
//{ QtMultimediaKit::ChapterNumber, 0 },
//{ QtMultimediaKit::Director, 0 },
{ QtMultimediaKit::LeadPerformer, GST_TAG_PERFORMER },
//{ QtMultimediaKit::Writer, 0 },
//{ QtMultimedia::ChapterNumber, 0 },
//{ QtMultimedia::Director, 0 },
{ QtMultimedia::LeadPerformer, GST_TAG_PERFORMER },
//{ QtMultimedia::Writer, 0 },
// Photos
//{ QtMultimediaKit::CameraManufacturer, 0 },
//{ QtMultimediaKit::CameraModel, 0 },
//{ QtMultimediaKit::Event, 0 },
//{ QtMultimediaKit::Subject, 0 }
//{ QtMultimedia::CameraManufacturer, 0 },
//{ QtMultimedia::CameraModel, 0 },
//{ QtMultimedia::Event, 0 },
//{ QtMultimedia::Subject, 0 }
};
CameraBinMetaData::CameraBinMetaData(QObject *parent)
@@ -124,7 +124,7 @@ CameraBinMetaData::CameraBinMetaData(QObject *parent)
{
}
QVariant CameraBinMetaData::metaData(QtMultimediaKit::MetaData key) const
QVariant CameraBinMetaData::metaData(QtMultimedia::MetaData key) const
{
static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
@@ -138,7 +138,7 @@ QVariant CameraBinMetaData::metaData(QtMultimediaKit::MetaData key) const
return QVariant();
}
void CameraBinMetaData::setMetaData(QtMultimediaKit::MetaData key, const QVariant &value)
void CameraBinMetaData::setMetaData(QtMultimedia::MetaData key, const QVariant &value)
{
static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
@@ -156,9 +156,9 @@ void CameraBinMetaData::setMetaData(QtMultimediaKit::MetaData key, const QVarian
}
}
QList<QtMultimediaKit::MetaData> CameraBinMetaData::availableMetaData() const
QList<QtMultimedia::MetaData> CameraBinMetaData::availableMetaData() const
{
static QMap<QByteArray, QtMultimediaKit::MetaData> keysMap;
static QMap<QByteArray, QtMultimedia::MetaData> keysMap;
if (keysMap.isEmpty()) {
const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
for (int i = 0; i < count; ++i) {
@@ -166,9 +166,9 @@ QList<QtMultimediaKit::MetaData> CameraBinMetaData::availableMetaData() const
}
}
QList<QtMultimediaKit::MetaData> res;
QList<QtMultimedia::MetaData> res;
foreach (const QByteArray &key, m_values.keys()) {
QtMultimediaKit::MetaData tag = keysMap.value(key, QtMultimediaKit::MetaData(-1));
QtMultimedia::MetaData tag = keysMap.value(key, QtMultimedia::MetaData(-1));
if (tag != -1)
res.append(tag);
}

6
src/plugins/gstreamer/camerabin/camerabinmetadata.h
View File

@@ -57,9 +57,9 @@ public:
bool isMetaDataAvailable() const { return true; }
bool isWritable() const { return true; }
QVariant metaData(QtMultimediaKit::MetaData key) const;
void setMetaData(QtMultimediaKit::MetaData key, const QVariant &value);
QList<QtMultimediaKit::MetaData> availableMetaData() const;
QVariant metaData(QtMultimedia::MetaData key) const;
void setMetaData(QtMultimedia::MetaData key, const QVariant &value);
QList<QtMultimedia::MetaData> availableMetaData() const;
QVariant extendedMetaData(QString const &name) const;
void setExtendedMetaData(QString const &name, QVariant const &value);

4
src/plugins/gstreamer/gstreamer.pro
View File

@@ -2,11 +2,11 @@
load(qt_module)
TARGET = qgstengine
QT += multimediakit-private network multimediakitwidgets-private
QT += multimedia-private network multimediawidgets-private
PLUGIN_TYPE=mediaservice
load(qt_plugin)
DESTDIR = $$QT.multimediakit.plugins/$${PLUGIN_TYPE}
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
unix:!maemo*:contains(QT_CONFIG, alsa) {
DEFINES += HAVE_ALSA

4
src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
View File

@@ -199,8 +199,8 @@ GstElement *QGstreamerAudioEncode::createEncoder()
}
if (encoderElement) {
if (m_audioSettings.encodingMode() == QtMultimediaKit::ConstantQualityEncoding) {
QtMultimediaKit::EncodingQuality qualityValue = m_audioSettings.quality();
if (m_audioSettings.encodingMode() == QtMultimedia::ConstantQualityEncoding) {
QtMultimedia::EncodingQuality qualityValue = m_audioSettings.quality();
if (codec == QLatin1String("audio/vorbis")) {
double qualityTable[] = {

104
src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp
View File

@@ -46,77 +46,77 @@
struct QGstreamerMetaDataKeyLookup
{
QtMultimediaKit::MetaData key;
QtMultimedia::MetaData key;
const char *token;
};
static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] =
{
{ QtMultimediaKit::Title, GST_TAG_TITLE },
//{ QtMultimediaKit::SubTitle, 0 },
//{ QtMultimediaKit::Author, 0 },
{ QtMultimediaKit::Comment, GST_TAG_COMMENT },
{ QtMultimediaKit::Description, GST_TAG_DESCRIPTION },
//{ QtMultimediaKit::Category, 0 },
{ QtMultimediaKit::Genre, GST_TAG_GENRE },
//{ QtMultimediaKit::Year, 0 },
//{ QtMultimediaKit::UserRating, 0 },
{ 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, 0 },
//{ QtMultimedia::UserRating, 0 },
{ QtMultimediaKit::Language, GST_TAG_LANGUAGE_CODE },
{ QtMultimedia::Language, GST_TAG_LANGUAGE_CODE },
{ QtMultimediaKit::Publisher, GST_TAG_ORGANIZATION },
{ QtMultimediaKit::Copyright, GST_TAG_COPYRIGHT },
//{ QtMultimediaKit::ParentalRating, 0 },
//{ QtMultimediaKit::RatingOrganisation, 0 },
{ QtMultimedia::Publisher, GST_TAG_ORGANIZATION },
{ QtMultimedia::Copyright, GST_TAG_COPYRIGHT },
//{ QtMultimedia::ParentalRating, 0 },
//{ QtMultimedia::RatingOrganisation, 0 },
// Media
//{ QtMultimediaKit::Size, 0 },
//{ QtMultimediaKit::MediaType, 0 },
{ QtMultimediaKit::Duration, GST_TAG_DURATION },
//{ QtMultimedia::Size, 0 },
//{ QtMultimedia::MediaType, 0 },
{ QtMultimedia::Duration, GST_TAG_DURATION },
// Audio
{ QtMultimediaKit::AudioBitRate, GST_TAG_BITRATE },
{ QtMultimediaKit::AudioCodec, GST_TAG_AUDIO_CODEC },
//{ QtMultimediaKit::ChannelCount, 0 },
//{ QtMultimediaKit::SampleRate, 0 },
{ QtMultimedia::AudioBitRate, GST_TAG_BITRATE },
{ QtMultimedia::AudioCodec, GST_TAG_AUDIO_CODEC },
//{ QtMultimedia::ChannelCount, 0 },
//{ QtMultimedia::SampleRate, 0 },
// Music
{ QtMultimediaKit::AlbumTitle, GST_TAG_ALBUM },
{ QtMultimediaKit::AlbumArtist, GST_TAG_ARTIST},
{ QtMultimediaKit::ContributingArtist, GST_TAG_PERFORMER },
{ QtMultimedia::AlbumTitle, GST_TAG_ALBUM },
{ QtMultimedia::AlbumArtist, GST_TAG_ARTIST},
{ QtMultimedia::ContributingArtist, GST_TAG_PERFORMER },
#if (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19)
{ QtMultimediaKit::Composer, GST_TAG_COMPOSER },
{ QtMultimedia::Composer, GST_TAG_COMPOSER },
#endif
//{ QtMultimediaKit::Conductor, 0 },
//{ QtMultimediaKit::Lyrics, 0 },
//{ QtMultimediaKit::Mood, 0 },
{ QtMultimediaKit::TrackNumber, GST_TAG_TRACK_NUMBER },
//{ QtMultimedia::Conductor, 0 },
//{ QtMultimedia::Lyrics, 0 },
//{ QtMultimedia::Mood, 0 },
{ QtMultimedia::TrackNumber, GST_TAG_TRACK_NUMBER },
//{ QtMultimediaKit::CoverArtUrlSmall, 0 },
//{ QtMultimediaKit::CoverArtUrlLarge, 0 },
//{ QtMultimedia::CoverArtUrlSmall, 0 },
//{ QtMultimedia::CoverArtUrlLarge, 0 },
// Image/Video
//{ QtMultimediaKit::Resolution, 0 },
//{ QtMultimediaKit::PixelAspectRatio, 0 },
//{ QtMultimedia::Resolution, 0 },
//{ QtMultimedia::PixelAspectRatio, 0 },
// Video
//{ QtMultimediaKit::VideoFrameRate, 0 },
//{ QtMultimediaKit::VideoBitRate, 0 },
{ QtMultimediaKit::VideoCodec, GST_TAG_VIDEO_CODEC },
//{ QtMultimedia::VideoFrameRate, 0 },
//{ QtMultimedia::VideoBitRate, 0 },
{ QtMultimedia::VideoCodec, GST_TAG_VIDEO_CODEC },
//{ QtMultimediaKit::PosterUrl, 0 },
//{ QtMultimedia::PosterUrl, 0 },
// Movie
//{ QtMultimediaKit::ChapterNumber, 0 },
//{ QtMultimediaKit::Director, 0 },
{ QtMultimediaKit::LeadPerformer, GST_TAG_PERFORMER },
//{ QtMultimediaKit::Writer, 0 },
//{ QtMultimedia::ChapterNumber, 0 },
//{ QtMultimedia::Director, 0 },
{ QtMultimedia::LeadPerformer, GST_TAG_PERFORMER },
//{ QtMultimedia::Writer, 0 },
// Photos
//{ QtMultimediaKit::CameraManufacturer, 0 },
//{ QtMultimediaKit::CameraModel, 0 },
//{ QtMultimediaKit::Event, 0 },
//{ QtMultimediaKit::Subject, 0 }
//{ QtMultimedia::CameraManufacturer, 0 },
//{ QtMultimedia::CameraModel, 0 },
//{ QtMultimedia::Event, 0 },
//{ QtMultimedia::Subject, 0 }
};
QGstreamerCaptureMetaDataControl::QGstreamerCaptureMetaDataControl(QObject *parent)
@@ -124,7 +124,7 @@ QGstreamerCaptureMetaDataControl::QGstreamerCaptureMetaDataControl(QObject *pare
{
}
QVariant QGstreamerCaptureMetaDataControl::metaData(QtMultimediaKit::MetaData key) const
QVariant QGstreamerCaptureMetaDataControl::metaData(QtMultimedia::MetaData key) const
{
static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
@@ -138,7 +138,7 @@ QVariant QGstreamerCaptureMetaDataControl::metaData(QtMultimediaKit::MetaData ke
return QVariant();
}
void QGstreamerCaptureMetaDataControl::setMetaData(QtMultimediaKit::MetaData key, const QVariant &value)
void QGstreamerCaptureMetaDataControl::setMetaData(QtMultimedia::MetaData key, const QVariant &value)
{
static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
@@ -156,9 +156,9 @@ void QGstreamerCaptureMetaDataControl::setMetaData(QtMultimediaKit::MetaData key
}
}
QList<QtMultimediaKit::MetaData> QGstreamerCaptureMetaDataControl::availableMetaData() const
QList<QtMultimedia::MetaData> QGstreamerCaptureMetaDataControl::availableMetaData() const
{
static QMap<QByteArray, QtMultimediaKit::MetaData> keysMap;
static QMap<QByteArray, QtMultimedia::MetaData> keysMap;
if (keysMap.isEmpty()) {
const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
for (int i = 0; i < count; ++i) {
@@ -166,9 +166,9 @@ QList<QtMultimediaKit::MetaData> QGstreamerCaptureMetaDataControl::availableMeta
}
}
QList<QtMultimediaKit::MetaData> res;
QList<QtMultimedia::MetaData> res;
foreach (const QByteArray &key, m_values.keys()) {
QtMultimediaKit::MetaData tag = keysMap.value(key, QtMultimediaKit::MetaData(-1));
QtMultimedia::MetaData tag = keysMap.value(key, QtMultimedia::MetaData(-1));
if (tag != -1)
res.append(tag);
}

6
src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h
View File

@@ -57,9 +57,9 @@ public:
bool isMetaDataAvailable() const { return true; }
bool isWritable() const { return true; }
QVariant metaData(QtMultimediaKit::MetaData key) const;
void setMetaData(QtMultimediaKit::MetaData key, const QVariant &value);
QList<QtMultimediaKit::MetaData> availableMetaData() const;
QVariant metaData(QtMultimedia::MetaData key) const;
void setMetaData(QtMultimedia::MetaData key, const QVariant &value);
QList<QtMultimedia::MetaData> availableMetaData() const;
QVariant extendedMetaData(QString const &name) const;
void setExtendedMetaData(QString const &name, QVariant const &value);

4
src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp
View File

@@ -171,8 +171,8 @@ GstElement *QGstreamerVideoEncode::createEncoder()
gst_object_unref(GST_OBJECT(pad));
if (encoderElement) {
if (m_videoSettings.encodingMode() == QtMultimediaKit::ConstantQualityEncoding) {
QtMultimediaKit::EncodingQuality qualityValue = m_videoSettings.quality();
if (m_videoSettings.encodingMode() == QtMultimedia::ConstantQualityEncoding) {
QtMultimedia::EncodingQuality qualityValue = m_videoSettings.quality();
if (codec == QLatin1String("video/h264")) {
//constant quantizer mode

102
src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
View File

@@ -47,77 +47,77 @@
struct QGstreamerMetaDataKeyLookup
{
QtMultimediaKit::MetaData key;
QtMultimedia::MetaData key;
const char *token;
};
static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] =
{
{ QtMultimediaKit::Title, GST_TAG_TITLE },
//{ QtMultimediaKit::SubTitle, 0 },
//{ QtMultimediaKit::Author, 0 },
{ QtMultimediaKit::Comment, GST_TAG_COMMENT },
{ QtMultimediaKit::Description, GST_TAG_DESCRIPTION },
//{ QtMultimediaKit::Category, 0 },
{ QtMultimediaKit::Genre, GST_TAG_GENRE },
{ QtMultimediaKit::Year, "year" },
//{ QtMultimediaKit::UserRating, 0 },
{ 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 },
{ QtMultimediaKit::Language, GST_TAG_LANGUAGE_CODE },
{ QtMultimedia::Language, GST_TAG_LANGUAGE_CODE },
{ QtMultimediaKit::Publisher, GST_TAG_ORGANIZATION },
{ QtMultimediaKit::Copyright, GST_TAG_COPYRIGHT },
//{ QtMultimediaKit::ParentalRating, 0 },
//{ QtMultimediaKit::RatingOrganisation, 0 },
{ QtMultimedia::Publisher, GST_TAG_ORGANIZATION },
{ QtMultimedia::Copyright, GST_TAG_COPYRIGHT },
//{ QtMultimedia::ParentalRating, 0 },
//{ QtMultimedia::RatingOrganisation, 0 },
// Media
//{ QtMultimediaKit::Size, 0 },
//{ QtMultimediaKit::MediaType, 0 },
{ QtMultimediaKit::Duration, GST_TAG_DURATION },
//{ QtMultimedia::Size, 0 },
//{ QtMultimedia::MediaType, 0 },
{ QtMultimedia::Duration, GST_TAG_DURATION },
// Audio
{ QtMultimediaKit::AudioBitRate, GST_TAG_BITRATE },
{ QtMultimediaKit::AudioCodec, GST_TAG_AUDIO_CODEC },
//{ QtMultimediaKit::ChannelCount, 0 },
//{ QtMultimediaKit::SampleRate, 0 },
{ QtMultimedia::AudioBitRate, GST_TAG_BITRATE },
{ QtMultimedia::AudioCodec, GST_TAG_AUDIO_CODEC },
//{ QtMultimedia::ChannelCount, 0 },
//{ QtMultimedia::SampleRate, 0 },
// Music
{ QtMultimediaKit::AlbumTitle, GST_TAG_ALBUM },
{ QtMultimediaKit::AlbumArtist, GST_TAG_ARTIST},
{ QtMultimediaKit::ContributingArtist, GST_TAG_PERFORMER },
{ QtMultimedia::AlbumTitle, GST_TAG_ALBUM },
{ QtMultimedia::AlbumArtist, GST_TAG_ARTIST},
{ QtMultimedia::ContributingArtist, GST_TAG_PERFORMER },
#if (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19)
{ QtMultimediaKit::Composer, GST_TAG_COMPOSER },
{ QtMultimedia::Composer, GST_TAG_COMPOSER },
#endif
//{ QtMultimediaKit::Conductor, 0 },
//{ QtMultimediaKit::Lyrics, 0 },
//{ QtMultimediaKit::Mood, 0 },
{ QtMultimediaKit::TrackNumber, GST_TAG_TRACK_NUMBER },
//{ QtMultimedia::Conductor, 0 },
//{ QtMultimedia::Lyrics, 0 },
//{ QtMultimedia::Mood, 0 },
{ QtMultimedia::TrackNumber, GST_TAG_TRACK_NUMBER },
//{ QtMultimediaKit::CoverArtUrlSmall, 0 },
//{ QtMultimediaKit::CoverArtUrlLarge, 0 },
//{ QtMultimedia::CoverArtUrlSmall, 0 },
//{ QtMultimedia::CoverArtUrlLarge, 0 },
// Image/Video
{ QtMultimediaKit::Resolution, "resolution" },
{ QtMultimediaKit::PixelAspectRatio, "pixel-aspect-ratio" },
{ QtMultimedia::Resolution, "resolution" },
{ QtMultimedia::PixelAspectRatio, "pixel-aspect-ratio" },
// Video
//{ QtMultimediaKit::VideoFrameRate, 0 },
//{ QtMultimediaKit::VideoBitRate, 0 },
{ QtMultimediaKit::VideoCodec, GST_TAG_VIDEO_CODEC },
//{ QtMultimedia::VideoFrameRate, 0 },
//{ QtMultimedia::VideoBitRate, 0 },
{ QtMultimedia::VideoCodec, GST_TAG_VIDEO_CODEC },
//{ QtMultimediaKit::PosterUrl, 0 },
//{ QtMultimedia::PosterUrl, 0 },
// Movie
//{ QtMultimediaKit::ChapterNumber, 0 },
//{ QtMultimediaKit::Director, 0 },
{ QtMultimediaKit::LeadPerformer, GST_TAG_PERFORMER },
//{ QtMultimediaKit::Writer, 0 },
//{ QtMultimedia::ChapterNumber, 0 },
//{ QtMultimedia::Director, 0 },
{ QtMultimedia::LeadPerformer, GST_TAG_PERFORMER },
//{ QtMultimedia::Writer, 0 },
// Photos
//{ QtMultimediaKit::CameraManufacturer, 0 },
//{ QtMultimediaKit::CameraModel, 0 },
//{ QtMultimediaKit::Event, 0 },
//{ QtMultimediaKit::Subject, 0 }
//{ QtMultimedia::CameraManufacturer, 0 },
//{ QtMultimedia::CameraModel, 0 },
//{ QtMultimedia::Event, 0 },
//{ QtMultimedia::Subject, 0 }
};
QGstreamerMetaDataProvider::QGstreamerMetaDataProvider(QGstreamerPlayerSession *session, QObject *parent)
@@ -140,7 +140,7 @@ bool QGstreamerMetaDataProvider::isWritable() const
return false;
}
QVariant QGstreamerMetaDataProvider::metaData(QtMultimediaKit::MetaData key) const
QVariant QGstreamerMetaDataProvider::metaData(QtMultimedia::MetaData key) const
{
static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
@@ -152,9 +152,9 @@ QVariant QGstreamerMetaDataProvider::metaData(QtMultimediaKit::MetaData key) con
return QVariant();
}
QList<QtMultimediaKit::MetaData> QGstreamerMetaDataProvider::availableMetaData() const
QList<QtMultimedia::MetaData> QGstreamerMetaDataProvider::availableMetaData() const
{
static QMap<QByteArray, QtMultimediaKit::MetaData> keysMap;
static QMap<QByteArray, QtMultimedia::MetaData> keysMap;
if (keysMap.isEmpty()) {
const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
for (int i = 0; i < count; ++i) {
@@ -162,9 +162,9 @@ QList<QtMultimediaKit::MetaData> QGstreamerMetaDataProvider::availableMetaData()
}
}
QList<QtMultimediaKit::MetaData> res;
QList<QtMultimedia::MetaData> res;
foreach (const QByteArray &key, m_session->tags().keys()) {
QtMultimediaKit::MetaData tag = keysMap.value(key, QtMultimediaKit::MetaData(-1));
QtMultimedia::MetaData tag = keysMap.value(key, QtMultimedia::MetaData(-1));
if (tag != -1)
res.append(tag);
}

4
src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h
View File

@@ -58,8 +58,8 @@ public:
bool isMetaDataAvailable() const;
bool isWritable() const;
QVariant metaData(QtMultimediaKit::MetaData key) const;
QList<QtMultimediaKit::MetaData> availableMetaData() const;
QVariant metaData(QtMultimedia::MetaData key) const;
QList<QtMultimedia::MetaData> availableMetaData() const;
QVariant extendedMetaData(const QString &key) const ;
QStringList availableExtendedMetaData() const;

8
src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
View File

@@ -1219,7 +1219,7 @@ void QGstreamerPlayerSession::getStreamsInfo()
for (int i=0; i<m_streamTypes.count(); i++) {
QMediaStreamsControl::StreamType streamType = m_streamTypes[i];
QMap<QtMultimediaKit::MetaData, QVariant> streamProperties;
QMap<QtMultimedia::MetaData, QVariant> streamProperties;
int streamIndex = i - m_playbin2StreamOffset[streamType];
@@ -1241,7 +1241,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[QtMultimediaKit::Language] = QString::fromUtf8(languageCode);
streamProperties[QtMultimedia::Language] = QString::fromUtf8(languageCode);
//qDebug() << "language for setream" << i << QString::fromUtf8(languageCode);
g_free (languageCode);
@@ -1301,8 +1301,8 @@ void QGstreamerPlayerSession::getStreamsInfo()
break;
}
QMap<QtMultimediaKit::MetaData, QVariant> streamProperties;
streamProperties[QtMultimediaKit::Language] = QString::fromUtf8(languageCode);
QMap<QtMultimedia::MetaData, QVariant> streamProperties;
streamProperties[QtMultimedia::Language] = QString::fromUtf8(languageCode);
m_streamProperties.append(streamProperties);
m_streamTypes.append(streamType);

4
src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h
View File

@@ -103,7 +103,7 @@ public:
QMediaTimeRange availablePlaybackRanges() const;
QMap<QByteArray ,QVariant> tags() const { return m_tags; }
QMap<QtMultimediaKit::MetaData,QVariant> streamProperties(int streamNumber) const { return m_streamProperties[streamNumber]; }
QMap<QtMultimedia::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); }
@@ -195,7 +195,7 @@ private:
#endif
QMap<QByteArray, QVariant> m_tags;
QList< QMap<QtMultimediaKit::MetaData,QVariant> > m_streamProperties;
QList< QMap<QtMultimedia::MetaData,QVariant> > m_streamProperties;
QList<QMediaStreamsControl::StreamType> m_streamTypes;
QMap<QMediaStreamsControl::StreamType, int> m_playbin2StreamOffset;

2
src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp
View File

@@ -62,7 +62,7 @@ QMediaStreamsControl::StreamType QGstreamerStreamsControl::streamType(int stream
return m_session->streamType(streamNumber);
}
QVariant QGstreamerStreamsControl::metaData(int streamNumber, QtMultimediaKit::MetaData key)
QVariant QGstreamerStreamsControl::metaData(int streamNumber, QtMultimedia::MetaData key)
{
return m_session->streamProperties(streamNumber).value(key);
}

2
src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h
View File

@@ -58,7 +58,7 @@ public:
virtual int streamCount();
virtual StreamType streamType(int streamNumber);
virtual QVariant metaData(int streamNumber, QtMultimediaKit::MetaData key);
virtual QVariant metaData(int streamNumber, QtMultimedia::MetaData key);
virtual bool isActive(int streamNumber);
virtual void setActive(int streamNumber, bool state);

8
src/plugins/gstreamer/qgstreamerserviceplugin.cpp
View File

@@ -260,7 +260,7 @@ namespace {
}
}
QtMultimediaKit::SupportEstimate QGstreamerServicePlugin::hasSupport(const QString &mimeType,
QtMultimedia::SupportEstimate QGstreamerServicePlugin::hasSupport(const QString &mimeType,
const QStringList& codecs) const
{
if (m_supportedMimeTypeSet.isEmpty())
@@ -294,12 +294,12 @@ QtMultimediaKit::SupportEstimate QGstreamerServicePlugin::hasSupport(const QStri
}
}
if (supportedCodecCount > 0 && supportedCodecCount == codecs.size())
return QtMultimediaKit::ProbablySupported;
return QtMultimedia::ProbablySupported;
if (supportedCodecCount == 0 && !containsMimeType)
return QtMultimediaKit::NotSupported;
return QtMultimedia::NotSupported;
return QtMultimediaKit::MaybeSupported;
return QtMultimedia::MaybeSupported;
}
void QGstreamerServicePlugin::updateSupportedMimeTypes() const

2
src/plugins/gstreamer/qgstreamerserviceplugin.h
View File

@@ -70,7 +70,7 @@ public:
QString deviceDescription(const QByteArray &service, const QByteArray &device);
QVariant deviceProperty(const QByteArray &service, const QByteArray &device, const QByteArray &property);
QtMultimediaKit::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const;
QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const;
QStringList supportedMimeTypes() const;
private:

6
src/plugins/m3u/m3u.pro
View File

@@ -1,11 +1,11 @@
load(qt_module)
TARGET = qtmultimediakit_m3u
QT += multimediakit-private
TARGET = qtmultimedia_m3u
QT += multimedia-private
PLUGIN_TYPE=playlistformats
load(qt_plugin)
DESTDIR = $$QT.multimediakit.plugins/$${PLUGIN_TYPE}
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
HEADERS += qm3uhandler.h

2
src/plugins/m3u/main.cpp
View File

@@ -44,4 +44,4 @@
Q_EXPORT_STATIC_PLUGIN(QM3uPlaylistPlugin)
Q_EXPORT_PLUGIN2(qtmultimediakit_m3u, QM3uPlaylistPlugin)
Q_EXPORT_PLUGIN2(qtmultimedia_m3u, QM3uPlaylistPlugin)

2
src/plugins/plugins.pro
View File

@@ -1,6 +1,6 @@
######################################################################
#
# QtMultimediaKit
# QtMultimedia
#
######################################################################

4
src/plugins/pulseaudio/pulseaudio.pro
View File

@@ -1,11 +1,11 @@
load(qt_module)
TARGET = qtmedia_pulse
QT += multimediakit-private
QT += multimedia-private
PLUGIN_TYPE = audio
load(qt_plugin)
DESTDIR = $$QT.multimediakit.plugins/$${PLUGIN_TYPE}
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
CONFIG += link_pkgconfig
PKGCONFIG += libpulse

6
src/plugins/qt7/mediaplayer/qt7playermetadata.h
View File

@@ -58,8 +58,8 @@ public:
bool isMetaDataAvailable() const;
bool isWritable() const;
QVariant metaData(QtMultimediaKit::MetaData key) const;
QList<QtMultimediaKit::MetaData> availableMetaData() const;
QVariant metaData(QtMultimedia::MetaData key) const;
QList<QtMultimedia::MetaData> availableMetaData() const;
QVariant extendedMetaData(const QString &key) const ;
QStringList availableExtendedMetaData() const;
@@ -69,7 +69,7 @@ private slots:
private:
QT7PlayerSession *m_session;
QMap<QtMultimediaKit::MetaData, QVariant> m_tags;
QMap<QtMultimedia::MetaData, QVariant> m_tags;
};
QT_END_NAMESPACE

18
src/plugins/qt7/mediaplayer/qt7playermetadata.mm
View File

@@ -72,12 +72,12 @@ bool QT7PlayerMetaDataControl::isWritable() const
return false;
}
QVariant QT7PlayerMetaDataControl::metaData(QtMultimediaKit::MetaData key) const
QVariant QT7PlayerMetaDataControl::metaData(QtMultimedia::MetaData key) const
{
return m_tags.value(key);
}
QList<QtMultimediaKit::MetaData> QT7PlayerMetaDataControl::availableMetaData() const
QList<QtMultimedia::MetaData> QT7PlayerMetaDataControl::availableMetaData() const
{
return m_tags.keys();
}
@@ -244,13 +244,13 @@ void QT7PlayerMetaDataControl::updateTags()
metaMap.insert(QLatin1String("nam"), QString::fromUtf8([name UTF8String]));
#endif // QUICKTIME_C_API_AVAILABLE
m_tags.insert(QtMultimediaKit::AlbumArtist, metaMap.value(QLatin1String("ART")));
m_tags.insert(QtMultimediaKit::AlbumTitle, metaMap.value(QLatin1String("alb")));
m_tags.insert(QtMultimediaKit::Title, metaMap.value(QLatin1String("nam")));
m_tags.insert(QtMultimediaKit::Date, metaMap.value(QLatin1String("day")));
m_tags.insert(QtMultimediaKit::Genre, metaMap.value(QLatin1String("gnre")));
m_tags.insert(QtMultimediaKit::TrackNumber, metaMap.value(QLatin1String("trk")));
m_tags.insert(QtMultimediaKit::Description, metaMap.value(QLatin1String("des")));
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")));
}
if (!wasEmpty || !m_tags.isEmpty())

2
src/plugins/qt7/qcvdisplaylink.h
View File

@@ -45,7 +45,7 @@
#include <QtCore/qobject.h>
#include <QtCore/qmutex.h>
#include <qtmultimediakitdefs.h>
#include <qtmultimediadefs.h>
#include <QuartzCore/CVDisplayLink.h>

4
src/plugins/qt7/qt7.pro
View File

@@ -1,11 +1,11 @@
load(qt_module)
TARGET = qqt7engine
QT += multimediakit-private multimediakitwidgets-private network
QT += multimedia-private multimediawidgets-private network
PLUGIN_TYPE = mediaservice
load(qt_plugin)
DESTDIR = $$QT.multimediakit.plugins/$${PLUGIN_TYPE}
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
!simulator {
QT += opengl

2
src/plugins/qt7/qt7backend.h
View File

@@ -42,7 +42,7 @@
#ifndef QT7BACKEND_H
#define QT7BACKEND_H
#include "qtmultimediakitdefs.h"
#include "qtmultimediadefs.h"
#include <QtCore/QString>

2
src/plugins/qt7/qt7serviceplugin.h
View File

@@ -61,7 +61,7 @@ public:
void release(QMediaService *service);
QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const;
QtMultimediaKit::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const;
QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const;
QStringList supportedMimeTypes() const;
private:

6
src/plugins/qt7/qt7serviceplugin.mm
View File

@@ -96,14 +96,14 @@ QMediaServiceProviderHint::Features QT7ServicePlugin::supportedFeatures(
return QMediaServiceProviderHint::Features();
}
QtMultimediaKit::SupportEstimate QT7ServicePlugin::hasSupport(const QString &mimeType, const QStringList& codecs) const
QtMultimedia::SupportEstimate QT7ServicePlugin::hasSupport(const QString &mimeType, const QStringList& codecs) const
{
Q_UNUSED(codecs);
if (m_supportedMimeTypes.contains(mimeType))
return QtMultimediaKit::ProbablySupported;
return QtMultimedia::ProbablySupported;
return QtMultimediaKit::MaybeSupported;
return QtMultimedia::MaybeSupported;
}
QStringList QT7ServicePlugin::supportedMimeTypes() const

2
src/plugins/simulator/qsimulatormultimediadata_p.h
View File

@@ -53,7 +53,7 @@
// We mean it.
//
#include "qtmultimediakitdefs.h"
#include "qtmultimediadefs.h"
#include <QtCore/QMetaType>
#include <QtCore/QDateTime>
#include <qcamera.h>

6
src/plugins/v4l/radio/v4lradiocontrol.cpp
View File

@@ -88,12 +88,12 @@ bool V4LRadioControl::isAvailable() const
return available;
}
QtMultimediaKit::AvailabilityError V4LRadioControl::availabilityError() const
QtMultimedia::AvailabilityError V4LRadioControl::availabilityError() const
{
if (fd > 0)
return QtMultimediaKit::NoError;
return QtMultimedia::NoError;
else
return QtMultimediaKit::ResourceError;
return QtMultimedia::ResourceError;
}
QRadioTuner::State V4LRadioControl::state() const

2
src/plugins/v4l/radio/v4lradiocontrol.h
View File

@@ -65,7 +65,7 @@ public:
~V4LRadioControl();
bool isAvailable() const;
QtMultimediaKit::AvailabilityError availabilityError() const;
QtMultimedia::AvailabilityError availabilityError() const;
QRadioTuner::State state() const;

4
src/plugins/v4l/v4l.pro
View File

@@ -1,11 +1,11 @@
load(qt_module)
TARGET = qtmedia_v4lengine
QT += multimediakit-private
QT += multimedia-private
PLUGIN_TYPE = mediaservice
load(qt_plugin)
DESTDIR = $$QT.multimediakit.plugins/$${PLUGIN_TYPE}
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
HEADERS += v4lserviceplugin.h
SOURCES += v4lserviceplugin.cpp

24
src/plugins/wmf/player/mfmetadatacontrol.cpp
View File

@@ -65,7 +65,7 @@ bool MFMetaDataControl::isMetaDataAvailable() const
return m_content || m_metaData;
}
QVariant MFMetaDataControl::metaData(QtMultimediaKit::MetaData key) const
QVariant MFMetaDataControl::metaData(QtMultimedia::MetaData key) const
{
QVariant value;
if (!isMetaDataAvailable())
@@ -113,7 +113,7 @@ QVariant MFMetaDataControl::convertValue(const PROPVARIANT& var) const
return value;
}
QList<QtMultimediaKit::MetaData> MFMetaDataControl::availableMetaData() const
QList<QtMultimedia::MetaData> MFMetaDataControl::availableMetaData() const
{
return m_availableMetaDatas;
}
@@ -173,15 +173,15 @@ void MFMetaDataControl::updateSource(IMFPresentationDescriptor* sourcePD, IMFMed
continue;
bool common = true;
if (key == PKEY_Author) {
m_availableMetaDatas.push_back(QtMultimediaKit::Author);
m_availableMetaDatas.push_back(QtMultimedia::Author);
} else if (key == PKEY_Title) {
m_availableMetaDatas.push_back(QtMultimediaKit::Title);
m_availableMetaDatas.push_back(QtMultimedia::Title);
} else if (key == PKEY_ParentalRating) {
m_availableMetaDatas.push_back(QtMultimediaKit::ParentalRating);
m_availableMetaDatas.push_back(QtMultimedia::ParentalRating);
} else if (key == PKEY_Comment) {
m_availableMetaDatas.push_back(QtMultimediaKit::Description);
m_availableMetaDatas.push_back(QtMultimedia::Description);
} else if (key == PKEY_Copyright) {
m_availableMetaDatas.push_back(QtMultimediaKit::Copyright);
m_availableMetaDatas.push_back(QtMultimedia::Copyright);
//TODO: add more common keys
} else {
common = false;
@@ -213,15 +213,15 @@ void MFMetaDataControl::updateSource(IMFPresentationDescriptor* sourcePD, IMFMed
#endif
bool common = true;
if (wcscmp(sName, L"Author") == 0) {
m_availableMetaDatas.push_back(QtMultimediaKit::Author);
m_availableMetaDatas.push_back(QtMultimedia::Author);
} else if (wcscmp(sName, L"Title") == 0) {
m_availableMetaDatas.push_back(QtMultimediaKit::Title);
m_availableMetaDatas.push_back(QtMultimedia::Title);
} else if (wcscmp(sName, L"Rating") == 0) {
m_availableMetaDatas.push_back(QtMultimediaKit::ParentalRating);
m_availableMetaDatas.push_back(QtMultimedia::ParentalRating);
} else if (wcscmp(sName, L"Description") == 0) {
m_availableMetaDatas.push_back(QtMultimediaKit::Description);
m_availableMetaDatas.push_back(QtMultimedia::Description);
} else if (wcscmp(sName, L"Copyright") == 0) {
m_availableMetaDatas.push_back(QtMultimediaKit::Copyright);
m_availableMetaDatas.push_back(QtMultimedia::Copyright);
//TODO: add more common keys
} else {
common = false;

6
src/plugins/wmf/player/mfmetadatacontrol.h
View File

@@ -56,8 +56,8 @@ public:
bool isMetaDataAvailable() const;
QVariant metaData(QtMultimediaKit::MetaData key) const;
QList<QtMultimediaKit::MetaData> availableMetaData() const;
QVariant metaData(QtMultimedia::MetaData key) const;
QList<QtMultimedia::MetaData> availableMetaData() const;
QVariant extendedMetaData(const QString &key) const;
QStringList availableExtendedMetaData() const;
@@ -69,7 +69,7 @@ private:
IPropertyStore *m_content; //for Windows7
IMFMetadata *m_metaData; //for Vista
QList<QtMultimediaKit::MetaData> m_availableMetaDatas;
QList<QtMultimedia::MetaData> m_availableMetaDatas;
QList<PROPERTYKEY> m_commonKeys; //for Windows7
QStringList m_commonNames; //for Vista

4
src/plugins/wmf/wmf.pro
View File

@@ -1,12 +1,12 @@
load(qt_module)
TARGET = wmfengine
QT += multimediakit-private network multimediakitwidgets-private
QT += multimedia-private network multimediawidgets-private
PLUGIN_TYPE=mediaservice
load(qt_plugin)
DESTDIR = $$QT.multimediakit.plugins/$${PLUGIN_TYPE}
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
DEPENDPATH += .