Use Q_CONSTRUCTOR_FUNCTION macro to register multimedia meta types.
Task-number: QTBUG-39131 Change-Id: I2493c9e3e6f0065d0441a74ff240d7d91fbe059c Reviewed-by: Christian Stromme <christian.stromme@digia.com>
This commit is contained in:
committed by
The Qt Project
parent
5a0e49369d
commit
efa4628e74
@@ -48,19 +48,15 @@
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
namespace
|
||||
static void qRegisterAbstractVideoBufferMetaTypes()
|
||||
{
|
||||
class QAbstractVideoBufferPrivateRegisterMetaTypes
|
||||
{
|
||||
public:
|
||||
QAbstractVideoBufferPrivateRegisterMetaTypes()
|
||||
{
|
||||
qRegisterMetaType<QAbstractVideoBuffer::HandleType>();
|
||||
qRegisterMetaType<QAbstractVideoBuffer::MapMode>();
|
||||
}
|
||||
} _registerMetaTypes;
|
||||
qRegisterMetaType<QAbstractVideoBuffer::HandleType>();
|
||||
qRegisterMetaType<QAbstractVideoBuffer::MapMode>();
|
||||
}
|
||||
|
||||
Q_CONSTRUCTOR_FUNCTION(qRegisterAbstractVideoBufferMetaTypes)
|
||||
|
||||
|
||||
/*!
|
||||
\class QAbstractVideoBuffer
|
||||
\brief The QAbstractVideoBuffer class is an abstraction for video data.
|
||||
|
||||
@@ -50,18 +50,13 @@
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
namespace
|
||||
static void qRegisterAbstractVideoSurfaceMetaTypes()
|
||||
{
|
||||
class QAbstractVideoSurfacePrivateRegisterMetaTypes
|
||||
{
|
||||
public:
|
||||
QAbstractVideoSurfacePrivateRegisterMetaTypes()
|
||||
{
|
||||
qRegisterMetaType<QAbstractVideoSurface::Error>();
|
||||
}
|
||||
} _registerMetaTypes;
|
||||
qRegisterMetaType<QAbstractVideoSurface::Error>();
|
||||
}
|
||||
|
||||
Q_CONSTRUCTOR_FUNCTION(qRegisterAbstractVideoSurfaceMetaTypes)
|
||||
|
||||
|
||||
class QAbstractVideoSurfacePrivate {
|
||||
public:
|
||||
|
||||
@@ -55,20 +55,15 @@
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
namespace
|
||||
static void qRegisterVideoFrameMetaTypes()
|
||||
{
|
||||
class QVideoFramePrivateRegisterMetaTypes
|
||||
{
|
||||
public:
|
||||
QVideoFramePrivateRegisterMetaTypes()
|
||||
{
|
||||
qRegisterMetaType<QVideoFrame>();
|
||||
qRegisterMetaType<QVideoFrame::FieldType>();
|
||||
qRegisterMetaType<QVideoFrame::PixelFormat>();
|
||||
}
|
||||
} _registerMetaTypes;
|
||||
qRegisterMetaType<QVideoFrame>();
|
||||
qRegisterMetaType<QVideoFrame::FieldType>();
|
||||
qRegisterMetaType<QVideoFrame::PixelFormat>();
|
||||
}
|
||||
|
||||
Q_CONSTRUCTOR_FUNCTION(qRegisterVideoFrameMetaTypes)
|
||||
|
||||
|
||||
class QVideoFramePrivate : public QSharedData
|
||||
{
|
||||
|
||||
@@ -49,20 +49,15 @@
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
namespace
|
||||
static void qRegisterVideoSurfaceFormatMetaTypes()
|
||||
{
|
||||
class QVideoSurfaceFormatPrivateRegisterMetaTypes
|
||||
{
|
||||
public:
|
||||
QVideoSurfaceFormatPrivateRegisterMetaTypes()
|
||||
{
|
||||
qRegisterMetaType<QVideoSurfaceFormat>();
|
||||
qRegisterMetaType<QVideoSurfaceFormat::Direction>();
|
||||
qRegisterMetaType<QVideoSurfaceFormat::YCbCrColorSpace>();
|
||||
}
|
||||
} _registerMetaTypes;
|
||||
qRegisterMetaType<QVideoSurfaceFormat>();
|
||||
qRegisterMetaType<QVideoSurfaceFormat::Direction>();
|
||||
qRegisterMetaType<QVideoSurfaceFormat::YCbCrColorSpace>();
|
||||
}
|
||||
|
||||
Q_CONSTRUCTOR_FUNCTION(qRegisterVideoSurfaceFormatMetaTypes)
|
||||
|
||||
|
||||
class QVideoSurfaceFormatPrivate : public QSharedData
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user