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

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

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

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

@@ -90,20 +90,16 @@ QT_BEGIN_NAMESPACE
\sa QMediaObject, QMediaService, QVideoWidget, QMediaPlaylist
*/
namespace
static void qRegisterMediaPlayerMetaTypes()
{
class MediaPlayerRegisterMetaTypes
{
public:
MediaPlayerRegisterMetaTypes()
{
qRegisterMetaType<QMediaPlayer::State>("QMediaPlayer::State");
qRegisterMetaType<QMediaPlayer::MediaStatus>("QMediaPlayer::MediaStatus");
qRegisterMetaType<QMediaPlayer::Error>("QMediaPlayer::Error");
}
} _registerPlayerMetaTypes;
qRegisterMetaType<QMediaPlayer::State>("QMediaPlayer::State");
qRegisterMetaType<QMediaPlayer::MediaStatus>("QMediaPlayer::MediaStatus");
qRegisterMetaType<QMediaPlayer::Error>("QMediaPlayer::Error");
}
Q_CONSTRUCTOR_FUNCTION(qRegisterMediaPlayerMetaTypes)
#define MAX_NESTED_PLAYLISTS 16
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,
(QMediaPlaylistIOInterface_iid, QLatin1String("playlistformats"), Qt::CaseInsensitive))
namespace
static void qRegisterMediaPlaylistMetaTypes()
{
class QMediaPlaylistPrivateRegisterMetaTypes
{
public:
QMediaPlaylistPrivateRegisterMetaTypes()
{
qRegisterMetaType<QMediaPlaylist::Error>();
qRegisterMetaType<QMediaPlaylist::PlaybackMode>();
}
} _registerMetaTypes;
qRegisterMetaType<QMediaPlaylist::Error>();
qRegisterMetaType<QMediaPlaylist::PlaybackMode>();
}
Q_CONSTRUCTOR_FUNCTION(qRegisterMediaPlaylistMetaTypes)
/*!
\class QMediaPlaylist

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

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