diff options
author | Artem Dyomin <artem.dyomin@qt.io> | 2022-12-13 11:21:53 +0100 |
---|---|---|
committer | Artem Dyomin <artem.dyomin@qt.io> | 2022-12-15 08:32:21 +0000 |
commit | 7c05361507c38cbeef1fe65ab102c2d27653f743 (patch) | |
tree | 8afc0eb00fade9c25dbcdb4c24398751fa6b6775 /src | |
parent | 2177e24c2fa8bbd94d86265bb269fdf30e5bfb71 (diff) |
Include moc_*.cpp files in QtMM gstreamer plugin
The reason of the refactoring is following the common approach
that leads to reducing compilation time and binary size.
- logic hasn't been touched
- the same refactorings of main QtMM code, tests, examples,
other plugins are coming in the next commits
Task-number: QTBUG-103290
Change-Id: I6859614f1c68b278f95acd79b5e98fbb6585ad0b
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit adcc3e43231fd75cdacfbc534912162cd16b8d78)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src')
15 files changed, 38 insertions, 3 deletions
diff --git a/src/plugins/multimedia/gstreamer/audio/qgstreameraudiodecoder.cpp b/src/plugins/multimedia/gstreamer/audio/qgstreameraudiodecoder.cpp index b0e98ab45..0c1b13ebb 100644 --- a/src/plugins/multimedia/gstreamer/audio/qgstreameraudiodecoder.cpp +++ b/src/plugins/multimedia/gstreamer/audio/qgstreameraudiodecoder.cpp @@ -504,3 +504,5 @@ qint64 QGstreamerAudioDecoder::getPositionFromBuffer(GstBuffer* buffer) } QT_END_NAMESPACE + +#include "moc_qgstreameraudiodecoder_p.cpp" diff --git a/src/plugins/multimedia/gstreamer/audio/qgstreameraudiosource.cpp b/src/plugins/multimedia/gstreamer/audio/qgstreameraudiosource.cpp index 34a4ae0ff..f37672f8f 100644 --- a/src/plugins/multimedia/gstreamer/audio/qgstreameraudiosource.cpp +++ b/src/plugins/multimedia/gstreamer/audio/qgstreameraudiosource.cpp @@ -17,7 +17,6 @@ Q_DECLARE_METATYPE(GstSample *); QT_BEGIN_NAMESPACE - QGStreamerAudioSource::QGStreamerAudioSource(const QAudioDevice &device, QObject *parent) : QPlatformAudioSource(parent), m_info(device), diff --git a/src/plugins/multimedia/gstreamer/common/qgstappsrc.cpp b/src/plugins/multimedia/gstreamer/common/qgstappsrc.cpp index 053b3ce8e..4068acd03 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstappsrc.cpp +++ b/src/plugins/multimedia/gstreamer/common/qgstappsrc.cpp @@ -9,6 +9,8 @@ #include "qloggingcategory.h" Q_LOGGING_CATEGORY(qLcAppSrc, "qt.multimedia.appsrc") + +QT_BEGIN_NAMESPACE QGstAppSrc::QGstAppSrc(QObject *parent) : QObject(parent) @@ -270,3 +272,7 @@ void QGstAppSrc::eosOrIdle() m_noMoreData = true; emit noMoreData(); } + +QT_END_NAMESPACE + +#include "moc_qgstappsrc_p.cpp" diff --git a/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput.cpp b/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput.cpp index 455e98f51..353178896 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput.cpp +++ b/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput.cpp @@ -110,3 +110,5 @@ QAudioDevice QGstreamerAudioInput::audioInput() const } QT_END_NAMESPACE + +#include "moc_qgstreameraudioinput_p.cpp" diff --git a/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput.cpp b/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput.cpp index 9891e0b6c..0d32517c6 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput.cpp +++ b/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput.cpp @@ -95,3 +95,5 @@ void QGstreamerAudioOutput::setAudioDevice(const QAudioDevice &info) } QT_END_NAMESPACE + +#include "moc_qgstreameraudiooutput_p.cpp" diff --git a/src/plugins/multimedia/gstreamer/common/qgstreamermediaplayer.cpp b/src/plugins/multimedia/gstreamer/common/qgstreamermediaplayer.cpp index 9fd65aef2..e3b2cf600 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstreamermediaplayer.cpp +++ b/src/plugins/multimedia/gstreamer/common/qgstreamermediaplayer.cpp @@ -847,3 +847,5 @@ void QGstreamerMediaPlayer::setActiveTrack(TrackType type, int index) } QT_END_NAMESPACE + +#include "moc_qgstreamermediaplayer_p.cpp" diff --git a/src/plugins/multimedia/gstreamer/common/qgstreamervideooutput.cpp b/src/plugins/multimedia/gstreamer/common/qgstreamervideooutput.cpp index 919d43559..dc3e451f1 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstreamervideooutput.cpp +++ b/src/plugins/multimedia/gstreamer/common/qgstreamervideooutput.cpp @@ -161,3 +161,5 @@ void QGstreamerVideoOutput::flushSubtitles() } QT_END_NAMESPACE + +#include "moc_qgstreamervideooutput_p.cpp" diff --git a/src/plugins/multimedia/gstreamer/common/qgstreamervideooverlay.cpp b/src/plugins/multimedia/gstreamer/common/qgstreamervideooverlay.cpp index 0f9d79604..fbb6477bf 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstreamervideooverlay.cpp +++ b/src/plugins/multimedia/gstreamer/common/qgstreamervideooverlay.cpp @@ -215,3 +215,5 @@ bool QGstreamerVideoOverlay::processSyncMessage(const QGstreamerMessage &message } QT_END_NAMESPACE + +#include "moc_qgstreamervideooverlay_p.cpp" diff --git a/src/plugins/multimedia/gstreamer/common/qgstreamervideosink.cpp b/src/plugins/multimedia/gstreamer/common/qgstreamervideosink.cpp index a87089b38..1df0f5df6 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstreamervideosink.cpp +++ b/src/plugins/multimedia/gstreamer/common/qgstreamervideosink.cpp @@ -232,3 +232,5 @@ void QGstreamerVideoSink::updateGstContexts() } QT_END_NAMESPACE + +#include "moc_qgstreamervideosink_p.cpp" diff --git a/src/plugins/multimedia/gstreamer/common/qgstreamervideosink_p.h b/src/plugins/multimedia/gstreamer/common/qgstreamervideosink_p.h index e628280e9..b61b2b18a 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstreamervideosink_p.h +++ b/src/plugins/multimedia/gstreamer/common/qgstreamervideosink_p.h @@ -1,8 +1,8 @@ // Copyright (C) 2016 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 -#ifndef QGSTREAMERVIDEOWINDOW_H -#define QGSTREAMERVIDEOWINDOW_H +#ifndef QGSTREAMERVIDEOSINK_H +#define QGSTREAMERVIDEOSINK_H // // W A R N I N G diff --git a/src/plugins/multimedia/gstreamer/common/qgstvideorenderersink.cpp b/src/plugins/multimedia/gstreamer/common/qgstvideorenderersink.cpp index cbe802469..3a486957e 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstvideorenderersink.cpp +++ b/src/plugins/multimedia/gstreamer/common/qgstvideorenderersink.cpp @@ -629,3 +629,5 @@ gboolean QGstVideoRendererSink::event(GstBaseSink *base, GstEvent * event) } QT_END_NAMESPACE + +#include "moc_qgstvideorenderersink_p.cpp" diff --git a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamercamera.cpp b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamercamera.cpp index 60fddab55..3f8ca10f3 100644 --- a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamercamera.cpp +++ b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamercamera.cpp @@ -16,6 +16,8 @@ #include <QtCore/qdebug.h> +QT_BEGIN_NAMESPACE + QGstreamerCamera::QGstreamerCamera(QCamera *camera) : QPlatformCamera(camera) { @@ -699,3 +701,7 @@ int QGstreamerCamera::getV4L2Parameter(quint32 id) const } #endif + +QT_END_NAMESPACE + +#include "moc_qgstreamercamera_p.cpp" diff --git a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamerimagecapture.cpp b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamerimagecapture.cpp index 229698289..4da415881 100644 --- a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamerimagecapture.cpp +++ b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamerimagecapture.cpp @@ -270,3 +270,5 @@ void QGstreamerImageCapture::setImageSettings(const QImageEncoderSettings &setti } QT_END_NAMESPACE + +#include "moc_qgstreamerimagecapture_p.cpp" diff --git a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacapture.cpp b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacapture.cpp index 4a1c7f6b5..d4a10c012 100644 --- a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacapture.cpp +++ b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacapture.cpp @@ -302,3 +302,5 @@ QGstreamerVideoSink *QGstreamerMediaCapture::gstreamerVideoSink() const QT_END_NAMESPACE + +#include "moc_qgstreamermediacapture_p.cpp" diff --git a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamermediaencoder.cpp b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamermediaencoder.cpp index 43472f657..9849d6d91 100644 --- a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamermediaencoder.cpp +++ b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamermediaencoder.cpp @@ -23,6 +23,8 @@ Q_LOGGING_CATEGORY(qLcMediaEncoder, "qt.multimedia.encoder") +QT_BEGIN_NAMESPACE + QGstreamerMediaEncoder::QGstreamerMediaEncoder(QMediaRecorder *parent) : QPlatformMediaRecorder(parent), audioPauseControl(*this), @@ -394,3 +396,5 @@ void QGstreamerMediaEncoder::setCaptureSession(QPlatformMediaCaptureSession *ses gstPipeline.set("message-forward", true); gstPipeline.installMessageFilter(this); } + +QT_END_NAMESPACE |