diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-02-12 08:53:01 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-02-17 08:27:44 +0000 |
| commit | b94b47d472c70124c38d4feb546df26d8015b3be (patch) | |
| tree | ab744206fb98b100a4bcfcaa6a2d55c8b9f7ed3f /src/multimedia/recording | |
| parent | 4b45c95b5601acbdcd8aee52cf0d8af136b982e3 (diff) | |
Kill QMediaSource and QMediaSink
Those aren't used anymore, get rid of them.
Change-Id: I5a17f18a3c87c2c13a9009b1f99ef9e708f7636a
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia/recording')
| -rw-r--r-- | src/multimedia/recording/qmediarecorder.cpp | 19 | ||||
| -rw-r--r-- | src/multimedia/recording/qmediarecorder.h | 4 |
2 files changed, 4 insertions, 19 deletions
diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp index 6097752df..5190afa8d 100644 --- a/src/multimedia/recording/qmediarecorder.cpp +++ b/src/multimedia/recording/qmediarecorder.cpp @@ -41,7 +41,6 @@ #include "qmediarecorder_p.h" #include <qmediarecordercontrol.h> -#include "qmediasource_p.h" #include <qmediaservice.h> #include <qaudiodeviceinfo.h> #include <qcamera.h> @@ -53,6 +52,7 @@ #include <QtCore/qurl.h> #include <QtCore/qstringlist.h> #include <QtCore/qmetaobject.h> +#include <QtCore/qtimer.h> #include <qaudioformat.h> @@ -149,23 +149,8 @@ void QMediaRecorderPrivate::restartCamera() } } -class QAudioRecorderObject : public QMediaSource -{ -public: - QAudioRecorderObject(QObject *parent, QMediaService *service) - : QMediaSource(parent, service) - { - } - - ~QAudioRecorderObject() override - { - } -}; - /*! - Constructs a media recorder which records the media produced by \a mediaSource. - - The \a parent is passed to QMediaSource. + Constructs a media recorder which records the media produced by a microphone and camera. */ QMediaRecorder::QMediaRecorder(QMediaRecorder::CaptureMode mode, QObject *parent) diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h index 1d1c815a3..4b7cfa109 100644 --- a/src/multimedia/recording/qmediarecorder.h +++ b/src/multimedia/recording/qmediarecorder.h @@ -40,10 +40,10 @@ #ifndef QMEDIARECORDER_H #define QMEDIARECORDER_H +#include <QtCore/qobject.h> +#include <QtMultimedia/qtmultimediaglobal.h> #include <QtMultimedia/qmultimedia.h> -#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qmediaencodersettings.h> -#include <QtMultimedia/qmediasink.h> #include <QtMultimedia/qmediaenumdebug.h> #include <QtMultimedia/qmediametadata.h> |