diff options
author | Artem Dyomin <artem.dyomin@qt.io> | 2022-12-12 14:38:47 +0100 |
---|---|---|
committer | Artem Dyomin <artem.dyomin@qt.io> | 2022-12-15 08:32:28 +0000 |
commit | f70b19a137518679f0ca4a5f9bc9009f28f8ed68 (patch) | |
tree | 4b3081a11f6e8b168565541b815dd42781d7eaf0 /src | |
parent | 7c05361507c38cbeef1fe65ab102c2d27653f743 (diff) |
Include moc_*.cpp files in main QtMM code
The reason of the refactoring is following the common approach
that leads to reducing compilation time and binary size.
- logic hasn't been touched
- some headers have been decoupled into header and cpp
- the same refactorings of examples, tests, plugins
are coming in the next commits
Task-number: QTBUG-103290
Change-Id: I6716cef5116769230c36e8d584d9ba6ec40aabb2
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 49e1615c98816d8e19fd364a493478d1d6e42eb1)
Diffstat (limited to 'src')
19 files changed, 134 insertions, 38 deletions
diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt index cc0a86958..33fc6d868 100644 --- a/src/multimedia/CMakeLists.txt +++ b/src/multimedia/CMakeLists.txt @@ -25,7 +25,7 @@ qt_internal_add_module(Multimedia audio/qaudiohelpers.cpp audio/qaudiohelpers_p.h audio/qaudiosource.cpp audio/qaudiosource.h audio/qaudiosink.cpp audio/qaudiosink.h - audio/qaudiosystem_p.h + audio/qaudiosystem.cpp audio/qaudiosystem_p.h audio/qsamplecache_p.cpp audio/qsamplecache_p.h audio/qsoundeffect.cpp audio/qsoundeffect.h audio/qwavedecoder.cpp audio/qwavedecoder.h @@ -43,7 +43,7 @@ qt_internal_add_module(Multimedia platform/qplatformmediaformatinfo.cpp platform/qplatformmediaformatinfo_p.h platform/qplatformmediaintegration.cpp platform/qplatformmediaintegration_p.h platform/qplatformmediaplayer.cpp platform/qplatformmediaplayer_p.h - platform/qplatformmediaplugin_p.h + platform/qplatformmediaplugin.cpp platform/qplatformmediaplugin_p.h platform/qplatformvideodevices.cpp platform/qplatformvideodevices_p.h platform/qplatformvideosink.cpp platform/qplatformvideosink_p.h playback/qmediaplayer.cpp playback/qmediaplayer.h playback/qmediaplayer_p.h diff --git a/src/multimedia/audio/qaudiodevice.cpp b/src/multimedia/audio/qaudiodevice.cpp index ce7d80f6d..f4f51d5a2 100644 --- a/src/multimedia/audio/qaudiodevice.cpp +++ b/src/multimedia/audio/qaudiodevice.cpp @@ -369,3 +369,5 @@ QDebug operator<<(QDebug dbg, QAudioDevice::Mode mode) #endif QT_END_NAMESPACE + +#include "moc_qaudiodevice.cpp" diff --git a/src/multimedia/audio/qaudiosystem.cpp b/src/multimedia/audio/qaudiosystem.cpp new file mode 100644 index 000000000..ef7552492 --- /dev/null +++ b/src/multimedia/audio/qaudiosystem.cpp @@ -0,0 +1,19 @@ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +#include "qaudiosystem_p.h" + +QT_BEGIN_NAMESPACE + +QPlatformAudioSink::QPlatformAudioSink(QObject *parent) : QObject(parent) { } + +qreal QPlatformAudioSink::volume() const +{ + return 1.0; +} + +QPlatformAudioSource::QPlatformAudioSource(QObject *parent) : QObject(parent) { } + +QT_END_NAMESPACE + +#include "moc_qaudiosystem_p.cpp" diff --git a/src/multimedia/audio/qaudiosystem_p.h b/src/multimedia/audio/qaudiosystem_p.h index cfb21fd22..e85968b86 100644 --- a/src/multimedia/audio/qaudiosystem_p.h +++ b/src/multimedia/audio/qaudiosystem_p.h @@ -33,7 +33,7 @@ class Q_MULTIMEDIA_EXPORT QPlatformAudioSink : public QObject Q_OBJECT public: - QPlatformAudioSink(QObject *parent) : QObject(parent) {} + QPlatformAudioSink(QObject *parent); virtual void start(QIODevice *device) = 0; virtual QIODevice* start() = 0; virtual void stop() = 0; @@ -49,7 +49,7 @@ public: virtual void setFormat(const QAudioFormat& fmt) = 0; virtual QAudioFormat format() const = 0; virtual void setVolume(qreal) {} - virtual qreal volume() const { return 1.0; } + virtual qreal volume() const; QElapsedTimer elapsedTime; @@ -63,7 +63,7 @@ class Q_MULTIMEDIA_EXPORT QPlatformAudioSource : public QObject Q_OBJECT public: - QPlatformAudioSource(QObject *parent) : QObject(parent) {} + QPlatformAudioSource(QObject *parent); virtual void start(QIODevice *device) = 0; virtual QIODevice* start() = 0; virtual void stop() = 0; diff --git a/src/multimedia/camera/qcameradevice.cpp b/src/multimedia/camera/qcameradevice.cpp index 1cef724dc..c94860963 100644 --- a/src/multimedia/camera/qcameradevice.cpp +++ b/src/multimedia/camera/qcameradevice.cpp @@ -432,3 +432,5 @@ QDebug operator<<(QDebug d, const QCameraDevice &camera) #endif QT_END_NAMESPACE + +#include "moc_qcameradevice.cpp" diff --git a/src/multimedia/platform/qplatformaudiodecoder.cpp b/src/multimedia/platform/qplatformaudiodecoder.cpp index ea4dbfaa6..99dfdee98 100644 --- a/src/multimedia/platform/qplatformaudiodecoder.cpp +++ b/src/multimedia/platform/qplatformaudiodecoder.cpp @@ -79,3 +79,5 @@ void QPlatformAudioDecoder::durationChanged(qint64 duration) } QT_END_NAMESPACE + +#include "moc_qplatformaudiodecoder_p.cpp" diff --git a/src/multimedia/platform/qplatformmediacapture.cpp b/src/multimedia/platform/qplatformmediacapture.cpp index effa82adf..b9b271942 100644 --- a/src/multimedia/platform/qplatformmediacapture.cpp +++ b/src/multimedia/platform/qplatformmediacapture.cpp @@ -14,3 +14,4 @@ QPlatformMediaCaptureSession::~QPlatformMediaCaptureSession() QT_END_NAMESPACE +#include "moc_qplatformmediacapture_p.cpp" diff --git a/src/multimedia/platform/qplatformmediaplugin.cpp b/src/multimedia/platform/qplatformmediaplugin.cpp new file mode 100644 index 000000000..7828fa08e --- /dev/null +++ b/src/multimedia/platform/qplatformmediaplugin.cpp @@ -0,0 +1,14 @@ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +#include "qplatformmediaplugin_p.h" + +QT_BEGIN_NAMESPACE + +QPlatformMediaPlugin::QPlatformMediaPlugin(QObject *parent) : QObject(parent) { } + +QPlatformMediaPlugin::~QPlatformMediaPlugin() = default; + +QT_END_NAMESPACE + +#include "moc_qplatformmediaplugin_p.cpp" diff --git a/src/multimedia/platform/qplatformmediaplugin_p.h b/src/multimedia/platform/qplatformmediaplugin_p.h index c14f799fa..4c8b9e458 100644 --- a/src/multimedia/platform/qplatformmediaplugin_p.h +++ b/src/multimedia/platform/qplatformmediaplugin_p.h @@ -30,10 +30,8 @@ class Q_MULTIMEDIA_EXPORT QPlatformMediaPlugin : public QObject { Q_OBJECT public: - explicit QPlatformMediaPlugin(QObject *parent = nullptr) - : QObject(parent) - {} - ~QPlatformMediaPlugin() = default; + explicit QPlatformMediaPlugin(QObject *parent = nullptr); + ~QPlatformMediaPlugin() override; virtual QPlatformMediaIntegration *create(const QString &key) = 0; diff --git a/src/multimedia/qmediaformat.cpp b/src/multimedia/qmediaformat.cpp index f6c35d630..2e84a6575 100644 --- a/src/multimedia/qmediaformat.cpp +++ b/src/multimedia/qmediaformat.cpp @@ -890,3 +890,5 @@ void QMediaFormat::resolveForEncoding(ResolveFlags flags) \internal */ QT_END_NAMESPACE + +#include "moc_qmediaformat.cpp" diff --git a/src/multimedia/qmediametadata.cpp b/src/multimedia/qmediametadata.cpp index 2ebf18ca3..96568f167 100644 --- a/src/multimedia/qmediametadata.cpp +++ b/src/multimedia/qmediametadata.cpp @@ -512,3 +512,5 @@ QString QMediaMetaData::metaDataKeyToString(QMediaMetaData::Key key) */ QT_END_NAMESPACE + +#include "moc_qmediametadata.cpp" diff --git a/src/multimedia/video/qvideooutputorientationhandler.cpp b/src/multimedia/video/qvideooutputorientationhandler.cpp index 7cc8b7e33..c34e9e92a 100644 --- a/src/multimedia/video/qvideooutputorientationhandler.cpp +++ b/src/multimedia/video/qvideooutputorientationhandler.cpp @@ -48,3 +48,5 @@ void QVideoOutputOrientationHandler::screenOrientationChanged(Qt::ScreenOrientat } QT_END_NAMESPACE + +#include "moc_qvideooutputorientationhandler_p.cpp" diff --git a/src/multimedia/video/qvideowindow.cpp b/src/multimedia/video/qvideowindow.cpp index b61cdbbb3..0c6377419 100644 --- a/src/multimedia/video/qvideowindow.cpp +++ b/src/multimedia/video/qvideowindow.cpp @@ -518,3 +518,5 @@ void QVideoWindow::setVideoFrame(const QVideoFrame &frame) } QT_END_NAMESPACE + +#include "moc_qvideowindow_p.cpp" diff --git a/src/multimediaquick/CMakeLists.txt b/src/multimediaquick/CMakeLists.txt index 530841a6c..4508e0c4e 100644 --- a/src/multimediaquick/CMakeLists.txt +++ b/src/multimediaquick/CMakeLists.txt @@ -21,13 +21,13 @@ qt_internal_add_qml_module(MultimediaQuickPrivate qquickimagecapture.cpp qquickimagecapture_p.h qquickimagepreviewprovider.cpp qquickimagepreviewprovider_p.h # qquickplaylist.cpp qquickplaylist_p.h - qquickmediaplayer_p.h - qquicksoundeffect_p.h + qquickmediaplayer.cpp qquickmediaplayer_p.h + qquicksoundeffect.cpp qquicksoundeffect_p.h qquickvideooutput.cpp qquickvideooutput_p.h qsgvideonode_p.cpp qsgvideonode_p.h qsgvideotexture.cpp qsgvideotexture_p.h qtmultimediaquickglobal_p.h - qtmultimediaquicktypes_p.h + qtmultimediaquicktypes.cpp qtmultimediaquicktypes_p.h QML_FILES ${qml_files} PUBLIC_LIBRARIES diff --git a/src/multimediaquick/qquickmediaplayer.cpp b/src/multimediaquick/qquickmediaplayer.cpp new file mode 100644 index 000000000..2645446cf --- /dev/null +++ b/src/multimediaquick/qquickmediaplayer.cpp @@ -0,0 +1,27 @@ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +#include "qquickmediaplayer_p.h" +#include <QtQml/qqmlcontext.h> + +QT_BEGIN_NAMESPACE + +QQuickMediaPlayer::QQuickMediaPlayer(QObject *parent) : QMediaPlayer(parent) { } + +void QQuickMediaPlayer::qmlSetSource(const QUrl &source) +{ + if (m_source == source) + return; + m_source = source; + const QQmlContext *context = qmlContext(this); + setSource(context ? context->resolvedUrl(source) : source); + emit sourceChanged(source); +} + +QUrl QQuickMediaPlayer::qmlSource() const +{ + return m_source; +} +QT_END_NAMESPACE + +#include "moc_qquickmediaplayer_p.cpp" diff --git a/src/multimediaquick/qquickmediaplayer_p.h b/src/multimediaquick/qquickmediaplayer_p.h index d1f766d14..337f7ef6a 100644 --- a/src/multimediaquick/qquickmediaplayer_p.h +++ b/src/multimediaquick/qquickmediaplayer_p.h @@ -17,8 +17,8 @@ #include <QMediaPlayer> #include <QtQml/qqml.h> -#include <QtQml/qqmlcontext.h> #include <qtmultimediaquickexports.h> +#include <qurl.h> #include <private/qglobal_p.h> QT_BEGIN_NAMESPACE @@ -30,20 +30,11 @@ class Q_MULTIMEDIAQUICK_EXPORT QQuickMediaPlayer : public QMediaPlayer QML_NAMED_ELEMENT(MediaPlayer) public: - QQuickMediaPlayer(QObject *parent = nullptr) : QMediaPlayer(parent) {} + QQuickMediaPlayer(QObject *parent = nullptr); - void qmlSetSource(const QUrl &source) - { - if (m_source == source) - return; + void qmlSetSource(const QUrl &source); - m_source = source; - const QQmlContext *context = qmlContext(this); - setSource(context ? context->resolvedUrl(source) : source); - emit sourceChanged(source); - } - - QUrl qmlSource() const { return m_source; } + QUrl qmlSource() const; Q_SIGNALS: void sourceChanged(const QUrl &source); diff --git a/src/multimediaquick/qquicksoundeffect.cpp b/src/multimediaquick/qquicksoundeffect.cpp new file mode 100644 index 000000000..89530f07f --- /dev/null +++ b/src/multimediaquick/qquicksoundeffect.cpp @@ -0,0 +1,29 @@ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +#include "qquicksoundeffect_p.h" +#include <QtQml/qqmlcontext.h> + +QT_BEGIN_NAMESPACE + +QQuickSoundEffect::QQuickSoundEffect(QObject *parent) : QSoundEffect(parent) { } + +void QQuickSoundEffect::qmlSetSource(const QUrl &source) +{ + if (m_source == source) + return; + + m_source = source; + const QQmlContext *context = qmlContext(this); + setSource(context ? context->resolvedUrl(source) : source); + emit sourceChanged(source); +} + +QUrl QQuickSoundEffect::qmlSource() const +{ + return m_source; +} + +QT_END_NAMESPACE + +#include "moc_qquicksoundeffect_p.cpp" diff --git a/src/multimediaquick/qquicksoundeffect_p.h b/src/multimediaquick/qquicksoundeffect_p.h index 38e071ec8..8a7246420 100644 --- a/src/multimediaquick/qquicksoundeffect_p.h +++ b/src/multimediaquick/qquicksoundeffect_p.h @@ -17,8 +17,8 @@ #include <QSoundEffect> #include <QtQml/qqml.h> -#include <QtQml/qqmlcontext.h> #include <qtmultimediaquickexports.h> +#include <qurl.h> QT_BEGIN_NAMESPACE @@ -29,20 +29,11 @@ class Q_MULTIMEDIAQUICK_EXPORT QQuickSoundEffect : public QSoundEffect QML_NAMED_ELEMENT(SoundEffect) public: - QQuickSoundEffect(QObject *parent = nullptr) : QSoundEffect(parent) {} + QQuickSoundEffect(QObject *parent = nullptr); - void qmlSetSource(const QUrl &source) - { - if (m_source == source) - return; + void qmlSetSource(const QUrl &source); - m_source = source; - const QQmlContext *context = qmlContext(this); - setSource(context ? context->resolvedUrl(source) : source); - emit sourceChanged(source); - } - - QUrl qmlSource() const { return m_source; } + QUrl qmlSource() const; Q_SIGNALS: void sourceChanged(const QUrl &source); diff --git a/src/multimediaquick/qtmultimediaquicktypes.cpp b/src/multimediaquick/qtmultimediaquicktypes.cpp new file mode 100644 index 000000000..7ba5711a5 --- /dev/null +++ b/src/multimediaquick/qtmultimediaquicktypes.cpp @@ -0,0 +1,12 @@ +// Copyright (C) 2022 The Qt Company +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +#include "qtmultimediaquicktypes_p.h" + +QT_BEGIN_NAMESPACE + +// TODO... + +QT_END_NAMESPACE + +#include "moc_qtmultimediaquicktypes_p.cpp" |