diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2011-10-06 14:31:58 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-07 06:16:34 +0200 |
commit | 03f22bcdaf1f80083618856d6e4140d3062f175b (patch) | |
tree | fdfbf0895f4fbd91fb1f4a247cf09e28a1056096 /src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp | |
parent | 55bc4f2b46b0099d187db16e049d760cd55626e6 (diff) | |
download | qtmultimedia-03f22bcdaf1f80083618856d6e4140d3062f175b.tar.gz |
Rename QtMultimediaKit to QtMultimedia.
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>
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp')
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp index f22b2642a..a73ec4bc7 100644 --- a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp @@ -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"); - - QMapIterator<QtMultimediaKit::MetaData, QVariant> i(tags); + 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<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())); } } |