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

Use Q_CONSTRUCTOR_FUNCTION macro to register multimedia meta types.

Browse Source 
Task-number: QTBUG-39131
Change-Id: I2493c9e3e6f0065d0441a74ff240d7d91fbe059c
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
This commit is contained in:
Yoann Lopes
2014-05-26 16:20:49 +02:00
committed by The Qt Project
parent 5a0e49369d
commit efa4628e74
25 changed files with 147 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/multimedia/audio/qaudio.cpp
View File

@@ -45,23 +45,15 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace QAudio static void qRegisterAudioMetaTypes()
{ {
qRegisterMetaType<QAudio::Error>();
class RegisterMetaTypes qRegisterMetaType<QAudio::State>();
{ qRegisterMetaType<QAudio::Mode>();
public:
RegisterMetaTypes()
{
qRegisterMetaType<QAudio::Error>();
qRegisterMetaType<QAudio::State>();
qRegisterMetaType<QAudio::Mode>();
}
} _register;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterAudioMetaTypes)
/*! /*!
\namespace QAudio \namespace QAudio
\brief The QAudio namespace contains enums used by the audio classes. \brief The QAudio namespace contains enums used by the audio classes.

14
src/multimedia/audio/qaudiobuffer.cpp
View File

@@ -47,18 +47,14 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace
static void qRegisterAudioBufferMetaTypes()
{ {
class QAudioBufferPrivateRegisterMetaTypes qRegisterMetaType<QAudioBuffer>();
{
public:
QAudioBufferPrivateRegisterMetaTypes()
{
qRegisterMetaType<QAudioBuffer>();
}
} _registerMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterAudioBufferMetaTypes)
class QAudioBufferPrivate : public QSharedData class QAudioBufferPrivate : public QSharedData
{ {

15
src/multimedia/audio/qaudiodecoder.cpp
View File

@@ -72,19 +72,14 @@ QT_BEGIN_NAMESPACE
\sa QAudioBuffer \sa QAudioBuffer
*/ */
namespace static void qRegisterAudioDecoderMetaTypes()
{ {
class AudioDecoderRegisterMetaTypes qRegisterMetaType<QAudioDecoder::State>("QAudioDecoder::State");
{ qRegisterMetaType<QAudioDecoder::Error>("QAudioDecoder::Error");
public:
AudioDecoderRegisterMetaTypes()
{
qRegisterMetaType<QAudioDecoder::State>("QAudioDecoder::State");
qRegisterMetaType<QAudioDecoder::Error>("QAudioDecoder::Error");
}
} _registerPlayerMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterAudioDecoderMetaTypes)
class QAudioDecoderPrivate : public QMediaObjectPrivate class QAudioDecoderPrivate : public QMediaObjectPrivate
{ {
Q_DECLARE_NON_CONST_PUBLIC(QAudioDecoder) Q_DECLARE_NON_CONST_PUBLIC(QAudioDecoder)

13
src/multimedia/audio/qaudiodeviceinfo.cpp
View File

@@ -47,18 +47,13 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace static void qRegisterAudioDeviceInfoMetaTypes()
{ {
class QAudioInfoPrivateRegisterMetaTypes qRegisterMetaType<QAudioDeviceInfo>();
{
public:
QAudioInfoPrivateRegisterMetaTypes()
{
qRegisterMetaType<QAudioDeviceInfo>();
}
} _registerMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterAudioDeviceInfoMetaTypes)
class QAudioDeviceInfoPrivate : public QSharedData class QAudioDeviceInfoPrivate : public QSharedData
{ {
public: public:

16
src/multimedia/audio/qaudioformat.cpp
View File

@@ -44,20 +44,14 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace static void qRegisterAudioFormatMetaTypes()
{ {
class QAudioFormatPrivateRegisterMetaTypes qRegisterMetaType<QAudioFormat>();
{ qRegisterMetaType<QAudioFormat::SampleType>();
public: qRegisterMetaType<QAudioFormat::Endian>();
QAudioFormatPrivateRegisterMetaTypes()
{
qRegisterMetaType<QAudioFormat>();
qRegisterMetaType<QAudioFormat::SampleType>();
qRegisterMetaType<QAudioFormat::Endian>();
}
} _registerMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterAudioFormatMetaTypes)
class QAudioFormatPrivate : public QSharedData class QAudioFormatPrivate : public QSharedData
{ {

29
src/multimedia/camera/qcamera.cpp
View File

@@ -56,26 +56,21 @@
#include <QDebug> #include <QDebug>
namespace QT_BEGIN_NAMESPACE
static void qRegisterCameraMetaTypes()
{ {
class CameraRegisterMetaTypes qRegisterMetaType<QCamera::Error>("QCamera::Error");
{ qRegisterMetaType<QCamera::State>("QCamera::State");
public: qRegisterMetaType<QCamera::Status>("QCamera::Status");
CameraRegisterMetaTypes() qRegisterMetaType<QCamera::CaptureModes>("QCamera::CaptureModes");
{ qRegisterMetaType<QCamera::LockType>("QCamera::LockType");
qRegisterMetaType<QCamera::Error>("QCamera::Error"); qRegisterMetaType<QCamera::LockStatus>("QCamera::LockStatus");
qRegisterMetaType<QCamera::State>("QCamera::State"); qRegisterMetaType<QCamera::LockChangeReason>("QCamera::LockChangeReason");
qRegisterMetaType<QCamera::Status>("QCamera::Status"); qRegisterMetaType<QCamera::Position>("QCamera::Position");
qRegisterMetaType<QCamera::CaptureModes>("QCamera::CaptureModes");
qRegisterMetaType<QCamera::LockType>("QCamera::LockType");
qRegisterMetaType<QCamera::LockStatus>("QCamera::LockStatus");
qRegisterMetaType<QCamera::LockChangeReason>("QCamera::LockChangeReason");
qRegisterMetaType<QCamera::Position>("QCamera::Position");
}
} _registerCameraMetaTypes;
} }
QT_BEGIN_NAMESPACE Q_CONSTRUCTOR_FUNCTION(qRegisterCameraMetaTypes)
/*! /*!
\class QCamera \class QCamera

16
src/multimedia/camera/qcameraexposure.cpp
View File

@@ -65,20 +65,14 @@ QT_BEGIN_NAMESPACE
//#define DEBUG_EXPOSURE_CHANGES 1 //#define DEBUG_EXPOSURE_CHANGES 1
namespace static void qRegisterCameraExposureMetaTypes()
{ {
class CameraExposureRegisterMetaTypes qRegisterMetaType<QCameraExposure::ExposureMode>("QCameraExposure::ExposureMode");
{ qRegisterMetaType<QCameraExposure::FlashModes>("QCameraExposure::FlashModes");
public: qRegisterMetaType<QCameraExposure::MeteringMode>("QCameraExposure::MeteringMode");
CameraExposureRegisterMetaTypes()
{
qRegisterMetaType<QCameraExposure::ExposureMode>("QCameraExposure::ExposureMode");
qRegisterMetaType<QCameraExposure::FlashModes>("QCameraExposure::FlashModes");
qRegisterMetaType<QCameraExposure::MeteringMode>("QCameraExposure::MeteringMode");
}
} _registerCameraExposureMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterCameraExposureMetaTypes)
class QCameraExposurePrivate class QCameraExposurePrivate

16
src/multimedia/camera/qcamerafocus.cpp
View File

@@ -55,19 +55,15 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace static void qRegisterCameraFocusMetaTypes()
{ {
class CameraFocusRegisterMetaTypes qRegisterMetaType<QCameraFocus::FocusModes>("QCameraFocus::FocusModes");
{ qRegisterMetaType<QCameraFocus::FocusPointMode>("QCameraFocus::FocusPointMode");
public:
CameraFocusRegisterMetaTypes()
{
qRegisterMetaType<QCameraFocus::FocusModes>("QCameraFocus::FocusModes");
qRegisterMetaType<QCameraFocus::FocusPointMode>("QCameraFocus::FocusPointMode");
}
} _registerCameraFocusMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterCameraFocusMetaTypes)
class QCameraFocusFakeZoomControl : public QCameraZoomControl class QCameraFocusFakeZoomControl : public QCameraZoomControl
{ {
public: public:

17
src/multimedia/camera/qcameraimagecapture.cpp
View File

@@ -83,20 +83,15 @@ QT_BEGIN_NAMESPACE
\value CaptureToBuffer Capture the image to a buffer for further processing. \value CaptureToBuffer Capture the image to a buffer for further processing.
*/ */
namespace static void qRegisterCameraImageCaptureMetaTypes()
{ {
class MediaRecorderRegisterMetaTypes qRegisterMetaType<QCameraImageCapture::Error>("QCameraImageCapture::Error");
{ qRegisterMetaType<QCameraImageCapture::CaptureDestination>("QCameraImageCapture::CaptureDestination");
public: qRegisterMetaType<QCameraImageCapture::CaptureDestinations>("QCameraImageCapture::CaptureDestinations");
MediaRecorderRegisterMetaTypes()
{
qRegisterMetaType<QCameraImageCapture::Error>("QCameraImageCapture::Error");
qRegisterMetaType<QCameraImageCapture::CaptureDestination>("QCameraImageCapture::CaptureDestination");
qRegisterMetaType<QCameraImageCapture::CaptureDestinations>("QCameraImageCapture::CaptureDestinations");
}
} _registerRecorderMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterCameraImageCaptureMetaTypes)
class QCameraImageCapturePrivate class QCameraImageCapturePrivate
{ {

13
src/multimedia/camera/qcameraimageprocessing.cpp
View File

@@ -52,20 +52,15 @@
#include <QtCore/QDebug> #include <QtCore/QDebug>
namespace QT_BEGIN_NAMESPACE
{
class QCameraImageProcessingPrivateRegisterMetaTypes static void qRegisterCameraImageProcessingMetaTypes()
{
public:
QCameraImageProcessingPrivateRegisterMetaTypes()
{ {
qRegisterMetaType<QCameraImageProcessing::WhiteBalanceMode>(); qRegisterMetaType<QCameraImageProcessing::WhiteBalanceMode>();
} }
} _registerMetaTypes;
}
Q_CONSTRUCTOR_FUNCTION(qRegisterCameraImageProcessingMetaTypes)
QT_BEGIN_NAMESPACE
/*! /*!
\class QCameraImageProcessing \class QCameraImageProcessing

13
src/multimedia/controls/qcameraimageprocessingcontrol.cpp
View File

@@ -44,18 +44,13 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace static void qRegisterCameraImageProcessingControlMetaTypes()
{ {
class QCameraImageProcessingControlPrivateRegisterMetaTypes qRegisterMetaType<QCameraImageProcessingControl::ProcessingParameter>();
{
public:
QCameraImageProcessingControlPrivateRegisterMetaTypes()
{
qRegisterMetaType<QCameraImageProcessingControl::ProcessingParameter>();
}
} _registerMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterCameraImageProcessingControlMetaTypes)
/*! /*!
\class QCameraImageProcessingControl \class QCameraImageProcessingControl
\inmodule QtMultimedia \inmodule QtMultimedia

14
src/multimedia/controls/qmediastreamscontrol.cpp
View File

@@ -44,18 +44,14 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace static void qRegisterMediaStreamControlMetaTypes()
{ {
class QMediaStreamsControlPrivateRegisterMetaTypes qRegisterMetaType<QMediaStreamsControl::StreamType>();
{
public:
QMediaStreamsControlPrivateRegisterMetaTypes()
{
qRegisterMetaType<QMediaStreamsControl::StreamType>();
}
} _registerMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterMediaStreamControlMetaTypes)
/*! /*!
\class QMediaStreamsControl \class QMediaStreamsControl
\inmodule QtMultimedia \inmodule QtMultimedia

13
src/multimedia/playback/qmediacontent.cpp
View File

@@ -48,18 +48,13 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace static void qRegisterMediaContentMetaTypes()
{ {
class QMediaContentPrivateRegisterMetaTypes qRegisterMetaType<QMediaContent>();
{
public:
QMediaContentPrivateRegisterMetaTypes()
{
qRegisterMetaType<QMediaContent>();
}
} _registerMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterMediaContentMetaTypes)
class QMediaContentPrivate : public QSharedData class QMediaContentPrivate : public QSharedData
{ {

18
src/multimedia/playback/qmediaplayer.cpp
View File

@@ -90,20 +90,16 @@ QT_BEGIN_NAMESPACE
\sa QMediaObject, QMediaService, QVideoWidget, QMediaPlaylist \sa QMediaObject, QMediaService, QVideoWidget, QMediaPlaylist
*/ */
namespace static void qRegisterMediaPlayerMetaTypes()
{ {
class MediaPlayerRegisterMetaTypes qRegisterMetaType<QMediaPlayer::State>("QMediaPlayer::State");
{ qRegisterMetaType<QMediaPlayer::MediaStatus>("QMediaPlayer::MediaStatus");
public: qRegisterMetaType<QMediaPlayer::Error>("QMediaPlayer::Error");
MediaPlayerRegisterMetaTypes()
{
qRegisterMetaType<QMediaPlayer::State>("QMediaPlayer::State");
qRegisterMetaType<QMediaPlayer::MediaStatus>("QMediaPlayer::MediaStatus");
qRegisterMetaType<QMediaPlayer::Error>("QMediaPlayer::Error");
}
} _registerPlayerMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterMediaPlayerMetaTypes)
#define MAX_NESTED_PLAYLISTS 16 #define MAX_NESTED_PLAYLISTS 16
class QMediaPlayerPrivate : public QMediaObjectPrivate class QMediaPlayerPrivate : public QMediaObjectPrivate

15
src/multimedia/playback/qmediaplaylist.cpp
View File

@@ -61,19 +61,14 @@ QT_BEGIN_NAMESPACE
Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, playlistIOLoader, Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, playlistIOLoader,
(QMediaPlaylistIOInterface_iid, QLatin1String("playlistformats"), Qt::CaseInsensitive)) (QMediaPlaylistIOInterface_iid, QLatin1String("playlistformats"), Qt::CaseInsensitive))
namespace static void qRegisterMediaPlaylistMetaTypes()
{ {
class QMediaPlaylistPrivateRegisterMetaTypes qRegisterMetaType<QMediaPlaylist::Error>();
{ qRegisterMetaType<QMediaPlaylist::PlaybackMode>();
public:
QMediaPlaylistPrivateRegisterMetaTypes()
{
qRegisterMetaType<QMediaPlaylist::Error>();
qRegisterMetaType<QMediaPlaylist::PlaybackMode>();
}
} _registerMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterMediaPlaylistMetaTypes)
/*! /*!
\class QMediaPlaylist \class QMediaPlaylist

16
src/multimedia/playback/qmediaresource.cpp
View File

@@ -47,19 +47,15 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace static void qRegisterMediaResourceMetaTypes()
{ {
class QMediaResourcePrivateRegisterMetaTypes qRegisterMetaType<QMediaResource>();
{ qRegisterMetaType<QMediaResourceList>();
public:
QMediaResourcePrivateRegisterMetaTypes()
{
qRegisterMetaType<QMediaResource>();
qRegisterMetaType<QMediaResourceList>();
}
} _registerMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterMediaResourceMetaTypes)
/*! /*!
\class QMediaResource \class QMediaResource

20
src/multimedia/qmultimedia.cpp
View File

@@ -41,21 +41,17 @@ QT_BEGIN_NAMESPACE
*/ */
namespace static void qRegisterMultimediaMetaTypes()
{ {
class QMultimediaNamespacePrivateRegisterMetaTypes qRegisterMetaType<QMultimedia::AvailabilityStatus>();
{ qRegisterMetaType<QMultimedia::SupportEstimate>();
public: qRegisterMetaType<QMultimedia::EncodingMode>();
QMultimediaNamespacePrivateRegisterMetaTypes() qRegisterMetaType<QMultimedia::EncodingQuality>();
{
qRegisterMetaType<QMultimedia::AvailabilityStatus>();
qRegisterMetaType<QMultimedia::SupportEstimate>();
qRegisterMetaType<QMultimedia::EncodingMode>();
qRegisterMetaType<QMultimedia::EncodingQuality>();
}
} _registerMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterMultimediaMetaTypes)
/*! /*!
\enum QMultimedia::SupportEstimate \enum QMultimedia::SupportEstimate

17
src/multimedia/radio/qradiodata.cpp
View File

@@ -50,20 +50,15 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
static void qRegisterRadioDataMetaTypes()
namespace
{ {
class QRadioDataPrivateRegisterMetaTypes qRegisterMetaType<QRadioData::Error>();
{ qRegisterMetaType<QRadioData::ProgramType>();
public:
QRadioDataPrivateRegisterMetaTypes()
{
qRegisterMetaType<QRadioData::Error>();
qRegisterMetaType<QRadioData::ProgramType>();
}
} _registerMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterRadioDataMetaTypes)
/*! /*!
\class QRadioData \class QRadioData
\brief The QRadioData class provides interfaces to the RDS functionality of the system radio. \brief The QRadioData class provides interfaces to the RDS functionality of the system radio.

21
src/multimedia/radio/qradiotuner.cpp
View File

@@ -52,22 +52,17 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace static void qRegisterRadioTunerMetaTypes()
{ {
class QRadioTunerPrivateRegisterMetaTypes qRegisterMetaType<QRadioTuner::Band>();
{ qRegisterMetaType<QRadioTuner::Error>();
public: qRegisterMetaType<QRadioTuner::SearchMode>();
QRadioTunerPrivateRegisterMetaTypes() qRegisterMetaType<QRadioTuner::State>();
{ qRegisterMetaType<QRadioTuner::StereoMode>();
qRegisterMetaType<QRadioTuner::Band>();
qRegisterMetaType<QRadioTuner::Error>();
qRegisterMetaType<QRadioTuner::SearchMode>();
qRegisterMetaType<QRadioTuner::State>();
qRegisterMetaType<QRadioTuner::StereoMode>();
}
} _registerMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterRadioTunerMetaTypes)
/*! /*!
\class QRadioTuner \class QRadioTuner

18
src/multimedia/recording/qmediaencodersettings.cpp
View File

@@ -43,20 +43,16 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace static void qRegisterEncoderSettingsMetaTypes()
{ {
class QMediaEncoderSettingsPrivateRegisterMetaTypes qRegisterMetaType<QAudioEncoderSettings>();
{ qRegisterMetaType<QVideoEncoderSettings>();
public: qRegisterMetaType<QImageEncoderSettings>();
QMediaEncoderSettingsPrivateRegisterMetaTypes()
{
qRegisterMetaType<QAudioEncoderSettings>();
qRegisterMetaType<QVideoEncoderSettings>();
qRegisterMetaType<QImageEncoderSettings>();
}
} _registerMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterEncoderSettingsMetaTypes)
class QAudioEncoderSettingsPrivate : public QSharedData class QAudioEncoderSettingsPrivate : public QSharedData
{ {
public: public:

18
src/multimedia/recording/qmediarecorder.cpp
View File

@@ -80,20 +80,16 @@ QT_BEGIN_NAMESPACE
\sa QAudioRecorder \sa QAudioRecorder
*/ */
namespace static void qRegisterMediaRecorderMetaTypes()
{ {
class MediaRecorderRegisterMetaTypes qRegisterMetaType<QMediaRecorder::State>("QMediaRecorder::State");
{ qRegisterMetaType<QMediaRecorder::Status>("QMediaRecorder::Status");
public: qRegisterMetaType<QMediaRecorder::Error>("QMediaRecorder::Error");
MediaRecorderRegisterMetaTypes()
{
qRegisterMetaType<QMediaRecorder::State>("QMediaRecorder::State");
qRegisterMetaType<QMediaRecorder::Status>("QMediaRecorder::Status");
qRegisterMetaType<QMediaRecorder::Error>("QMediaRecorder::Error");
}
} _registerRecorderMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterMediaRecorderMetaTypes)
QMediaRecorderPrivate::QMediaRecorderPrivate(): QMediaRecorderPrivate::QMediaRecorderPrivate():
mediaObject(0), mediaObject(0),
control(0), control(0),

16
src/multimedia/video/qabstractvideobuffer.cpp
View File

@@ -48,19 +48,15 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace static void qRegisterAbstractVideoBufferMetaTypes()
{ {
class QAbstractVideoBufferPrivateRegisterMetaTypes qRegisterMetaType<QAbstractVideoBuffer::HandleType>();
{ qRegisterMetaType<QAbstractVideoBuffer::MapMode>();
public:
QAbstractVideoBufferPrivateRegisterMetaTypes()
{
qRegisterMetaType<QAbstractVideoBuffer::HandleType>();
qRegisterMetaType<QAbstractVideoBuffer::MapMode>();
}
} _registerMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterAbstractVideoBufferMetaTypes)
/*! /*!
\class QAbstractVideoBuffer \class QAbstractVideoBuffer
\brief The QAbstractVideoBuffer class is an abstraction for video data. \brief The QAbstractVideoBuffer class is an abstraction for video data.

13
src/multimedia/video/qabstractvideosurface.cpp
View File

@@ -50,18 +50,13 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace static void qRegisterAbstractVideoSurfaceMetaTypes()
{ {
class QAbstractVideoSurfacePrivateRegisterMetaTypes qRegisterMetaType<QAbstractVideoSurface::Error>();
{
public:
QAbstractVideoSurfacePrivateRegisterMetaTypes()
{
qRegisterMetaType<QAbstractVideoSurface::Error>();
}
} _registerMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterAbstractVideoSurfaceMetaTypes)
class QAbstractVideoSurfacePrivate { class QAbstractVideoSurfacePrivate {
public: public:

17
src/multimedia/video/qvideoframe.cpp
View File

@@ -55,20 +55,15 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace static void qRegisterVideoFrameMetaTypes()
{ {
class QVideoFramePrivateRegisterMetaTypes qRegisterMetaType<QVideoFrame>();
{ qRegisterMetaType<QVideoFrame::FieldType>();
public: qRegisterMetaType<QVideoFrame::PixelFormat>();
QVideoFramePrivateRegisterMetaTypes()
{
qRegisterMetaType<QVideoFrame>();
qRegisterMetaType<QVideoFrame::FieldType>();
qRegisterMetaType<QVideoFrame::PixelFormat>();
}
} _registerMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterVideoFrameMetaTypes)
class QVideoFramePrivate : public QSharedData class QVideoFramePrivate : public QSharedData
{ {

17
src/multimedia/video/qvideosurfaceformat.cpp
View File

@@ -49,20 +49,15 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace static void qRegisterVideoSurfaceFormatMetaTypes()
{ {
class QVideoSurfaceFormatPrivateRegisterMetaTypes qRegisterMetaType<QVideoSurfaceFormat>();
{ qRegisterMetaType<QVideoSurfaceFormat::Direction>();
public: qRegisterMetaType<QVideoSurfaceFormat::YCbCrColorSpace>();
QVideoSurfaceFormatPrivateRegisterMetaTypes()
{
qRegisterMetaType<QVideoSurfaceFormat>();
qRegisterMetaType<QVideoSurfaceFormat::Direction>();
qRegisterMetaType<QVideoSurfaceFormat::YCbCrColorSpace>();
}
} _registerMetaTypes;
} }
Q_CONSTRUCTOR_FUNCTION(qRegisterVideoSurfaceFormatMetaTypes)
class QVideoSurfaceFormatPrivate : public QSharedData class QVideoSurfaceFormatPrivate : public QSharedData
{ {