diff options
Diffstat (limited to 'src/multimedia')
19 files changed, 81 insertions, 91 deletions
diff --git a/src/multimedia/doc/src/cameraoverview.qdoc b/src/multimedia/doc/src/cameraoverview.qdoc index bd378bcea..c15916fb7 100644 --- a/src/multimedia/doc/src/cameraoverview.qdoc +++ b/src/multimedia/doc/src/cameraoverview.qdoc @@ -215,7 +215,7 @@ Signals from the \e mediaEncoder can be connected to slots to react to changes in the state of the encoding process or error events. Recording itself starts with the \l {QMediaEncoder::record()}{record()} function of mediaEncoder being called, this causes the signal \l -{QMediaEncoder::stateChanged()}{stateChanged()} to be emitted. The +{QMediaEncoder::recorderStateChanged()}{recorderStateChanged()} to be emitted. The recording process can be changed with the \l {QMediaEncoder::record()}{record()}, \l {QMediaEncoder::stop()}{stop()} slots in \l QMediaEncoder. diff --git a/src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp b/src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp index f8861982e..287ec17bc 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp +++ b/src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp @@ -159,12 +159,12 @@ bool QAndroidCaptureSession::setOutputLocation(const QUrl &location) return false; } -QMediaEncoder::State QAndroidCaptureSession::state() const +QMediaEncoder::RecorderState QAndroidCaptureSession::state() const { return m_state; } -void QAndroidCaptureSession::setState(QMediaEncoder::State state) +void QAndroidCaptureSession::setState(QMediaEncoder::RecorderState state) { if (m_state == state) return; diff --git a/src/multimedia/platform/android/mediacapture/qandroidcapturesession_p.h b/src/multimedia/platform/android/mediacapture/qandroidcapturesession_p.h index 772c08738..995e70abf 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcapturesession_p.h +++ b/src/multimedia/platform/android/mediacapture/qandroidcapturesession_p.h @@ -80,8 +80,8 @@ public: QUrl outputLocation() const; bool setOutputLocation(const QUrl &location); - QMediaEncoder::State state() const; - void setState(QMediaEncoder::State state); + QMediaEncoder::RecorderState state() const; + void setState(QMediaEncoder::RecorderState state); QMediaEncoder::Status status() const; @@ -94,7 +94,7 @@ public: void applySettings(); - void stateChanged(QMediaEncoder::State state) { + void stateChanged(QMediaEncoder::RecorderState state) { if (m_mediaEncoder) m_mediaEncoder->stateChanged(state); } @@ -181,7 +181,7 @@ private: QTimer m_notifyTimer; qint64 m_duration; - QMediaEncoder::State m_state; + QMediaEncoder::RecorderState m_state; QMediaEncoder::Status m_status; QUrl m_requestedOutputLocation; QUrl m_usedOutputLocation; diff --git a/src/multimedia/platform/android/mediacapture/qandroidmediaencoder.cpp b/src/multimedia/platform/android/mediacapture/qandroidmediaencoder.cpp index eb620a0d9..175528ed4 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidmediaencoder.cpp +++ b/src/multimedia/platform/android/mediacapture/qandroidmediaencoder.cpp @@ -59,7 +59,7 @@ bool QAndroidMediaEncoder::setOutputLocation(const QUrl &location) return m_session->setOutputLocation(location); } -QMediaEncoder::State QAndroidMediaEncoder::state() const +QMediaEncoder::RecorderState QAndroidMediaEncoder::state() const { return m_session->state(); } @@ -79,7 +79,7 @@ void QAndroidMediaEncoder::applySettings() m_session->applySettings(); } -void QAndroidMediaEncoder::setState(QMediaEncoder::State state) +void QAndroidMediaEncoder::setState(QMediaEncoder::RecorderState state) { m_session->setState(state); } diff --git a/src/multimedia/platform/android/mediacapture/qandroidmediaencoder_p.h b/src/multimedia/platform/android/mediacapture/qandroidmediaencoder_p.h index 35c6c0749..c2a74366e 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidmediaencoder_p.h +++ b/src/multimedia/platform/android/mediacapture/qandroidmediaencoder_p.h @@ -66,7 +66,7 @@ public: QUrl outputLocation() const override; bool setOutputLocation(const QUrl &location) override; - QMediaEncoder::State state() const override; + QMediaEncoder::RecorderState state() const override; QMediaEncoder::Status status() const override; qint64 duration() const override; void applySettings() override; @@ -75,7 +75,7 @@ public: void setCaptureSession(QPlatformMediaCaptureSession *session); - void setState(QMediaEncoder::State state) override; + void setState(QMediaEncoder::RecorderState state) override; private: friend class QAndroidCaptureSession; diff --git a/src/multimedia/platform/darwin/camera/avfmediaencoder.mm b/src/multimedia/platform/darwin/camera/avfmediaencoder.mm index 7d1725913..f1872cb09 100644 --- a/src/multimedia/platform/darwin/camera/avfmediaencoder.mm +++ b/src/multimedia/platform/darwin/camera/avfmediaencoder.mm @@ -122,7 +122,7 @@ bool AVFMediaEncoder::setOutputLocation(const QUrl &location) return location.scheme() == QLatin1String("file") || location.scheme().isEmpty(); } -QMediaEncoder::State AVFMediaEncoder::state() const +QMediaEncoder::RecorderState AVFMediaEncoder::state() const { return m_state; } @@ -437,7 +437,7 @@ void AVFMediaEncoder::setCaptureSession(QPlatformMediaCaptureSession *session) onCameraChanged(); } -void AVFMediaEncoder::setState(QMediaEncoder::State state) +void AVFMediaEncoder::setState(QMediaEncoder::RecorderState state) { if (!m_service || !m_service->session()) { qWarning() << Q_FUNC_INFO << "Encoder is not set to a capture session"; @@ -567,7 +567,7 @@ void AVFMediaEncoder::assetWriterFinished() AVFCameraSession *session = m_service->session(); const QMediaEncoder::Status lastStatus = m_lastStatus; - const QMediaEncoder::State lastState = m_state; + const QMediaEncoder::RecorderState lastState = m_state; unapplySettings(); diff --git a/src/multimedia/platform/darwin/camera/avfmediaencoder_p.h b/src/multimedia/platform/darwin/camera/avfmediaencoder_p.h index 149adafa7..53369cb70 100644 --- a/src/multimedia/platform/darwin/camera/avfmediaencoder_p.h +++ b/src/multimedia/platform/darwin/camera/avfmediaencoder_p.h @@ -80,7 +80,7 @@ public: QUrl outputLocation() const override; bool setOutputLocation(const QUrl &location) override; - QMediaEncoder::State state() const override; + QMediaEncoder::RecorderState state() const override; QMediaEncoder::Status status() const override; qint64 duration() const override; @@ -96,7 +96,7 @@ public: void setCaptureSession(QPlatformMediaCaptureSession *session); public Q_SLOTS: - void setState(QMediaEncoder::State state) override; + void setState(QMediaEncoder::RecorderState state) override; private: @@ -117,7 +117,7 @@ private: QUrl m_outputLocation; AVFStorageLocation m_storageLocation; - QMediaEncoder::State m_state; + QMediaEncoder::RecorderState m_state; QMediaEncoder::Status m_lastStatus; QMediaEncoderSettings m_settings; diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder.cpp index d9aee8fed..41592b1d8 100644 --- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder.cpp +++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder.cpp @@ -93,7 +93,7 @@ void QGstreamerMediaEncoder::updateStatus() { QMediaEncoder::StartingStatus, QMediaEncoder::RecordingStatus, QMediaEncoder::PausedStatus } }; - QMediaEncoder::State sessionState = QMediaEncoder::StoppedState; + QMediaEncoder::RecorderState sessionState = QMediaEncoder::StoppedState; auto gstState = gstEncoder.isNull() ? GST_STATE_NULL : gstEncoder.state(); switch (gstState) { @@ -264,7 +264,7 @@ static GstEncodingContainerProfile *createEncodingProfile(const QMediaEncoderSet return containerProfile; } -void QGstreamerMediaEncoder::setState(QMediaEncoder::State s) +void QGstreamerMediaEncoder::setState(QMediaEncoder::RecorderState s) { if (s == state()) return; diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder_p.h index ae4170c5d..b566566fe 100644 --- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder_p.h +++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder_p.h @@ -90,7 +90,7 @@ public: private: bool processBusMessage(const QGstreamerMessage& message) override; public: - void setState(QMediaEncoder::State state) override; + void setState(QMediaEncoder::RecorderState state) override; void record(); void pause(); void stop(); @@ -98,7 +98,7 @@ public: private: void updateStatus(); - void handleSessionError(QMediaEncoderBase::Error code, const QString &description); + void handleSessionError(QMediaEncoder::Error code, const QString &description); void finalize(); QDir defaultDir() const; QString generateFileName(const QDir &dir, const QString &ext) const; diff --git a/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp index c5df78ece..11c486953 100644 --- a/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp +++ b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp @@ -65,7 +65,7 @@ BbCameraMediaRecorderControl::BbCameraMediaRecorderControl(BbCameraSession *sess : QPlatformMediaEncoder(parent) , m_session(session) { - connect(m_session, SIGNAL(videoStateChanged(QMediaEncoder::State)), this, SIGNAL(stateChanged(QMediaEncoder::State))); + connect(m_session, SIGNAL(videoStateChanged(QMediaEncoder::RecorderState)), this, SIGNAL(stateChanged(QMediaEncoder::RecorderState))); connect(m_session, SIGNAL(videoStatusChanged(QMediaEncoder::Status)), this, SIGNAL(statusChanged(QMediaEncoder::Status))); connect(m_session, SIGNAL(durationChanged(qint64)), this, SIGNAL(durationChanged(qint64))); connect(m_session, SIGNAL(actualLocationChanged(QUrl)), this, SIGNAL(actualLocationChanged(QUrl))); @@ -82,7 +82,7 @@ bool BbCameraMediaRecorderControl::setOutputLocation(const QUrl &location) return m_session->setOutputLocation(location); } -QMediaEncoder::State BbCameraMediaRecorderControl::state() const +QMediaEncoder::RecorderState BbCameraMediaRecorderControl::state() const { return m_session->videoState(); } @@ -128,7 +128,7 @@ void BbCameraMediaRecorderControl::applySettings() m_session->applyVideoSettings(); } -void BbCameraMediaRecorderControl::setState(QMediaEncoder::State state) +void BbCameraMediaRecorderControl::setState(QMediaEncoder::RecorderState state) { m_session->setVideoState(state); } diff --git a/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h index e8d550c81..c485988ca 100644 --- a/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h +++ b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h @@ -64,7 +64,7 @@ public: QUrl outputLocation() const override; bool setOutputLocation(const QUrl &location) override; - QMediaEncoder::State state() const override; + QMediaEncoder::RecorderState state() const override; QMediaEncoder::Status status() const override; qint64 duration() const override; bool isMuted() const override; @@ -72,7 +72,7 @@ public: void applySettings() override; public Q_SLOTS: - void setState(QMediaEncoder::State state) override; + void setState(QMediaEncoder::RecorderState state) override; void setMuted(bool muted) override; void setVolume(qreal volume) override; diff --git a/src/multimedia/platform/qnx/camera/bbcamerasession.cpp b/src/multimedia/platform/qnx/camera/bbcamerasession.cpp index ad6e43a49..5f0e5d843 100644 --- a/src/multimedia/platform/qnx/camera/bbcamerasession.cpp +++ b/src/multimedia/platform/qnx/camera/bbcamerasession.cpp @@ -418,17 +418,17 @@ bool BbCameraSession::setOutputLocation(const QUrl &location) return true; } -QMediaEncoder::State BbCameraSession::videoState() const +QMediaEncoder::RecorderState BbCameraSession::videoState() const { return m_videoState; } -void BbCameraSession::setVideoState(QMediaEncoder::State state) +void BbCameraSession::setVideoState(QMediaEncoder::RecorderState state) { if (m_videoState == state) return; - const QMediaEncoder::State previousState = m_videoState; + const QMediaEncoder::RecorderState previousState = m_videoState; if (previousState == QMediaEncoder::StoppedState) { if (state == QMediaEncoder::RecordingState) { diff --git a/src/multimedia/platform/qnx/camera/bbcamerasession_p.h b/src/multimedia/platform/qnx/camera/bbcamerasession_p.h index 1b5b09c91..67a2f1685 100644 --- a/src/multimedia/platform/qnx/camera/bbcamerasession_p.h +++ b/src/multimedia/platform/qnx/camera/bbcamerasession_p.h @@ -109,8 +109,8 @@ public: // media recorder control QUrl outputLocation() const; bool setOutputLocation(const QUrl &location); - QMediaEncoder::State videoState() const; - void setVideoState(QMediaEncoder::State state); + QMediaEncoder::RecorderState videoState() const; + void setVideoState(QMediaEncoder::RecorderState state); QMediaEncoder::Status videoStatus() const; qint64 duration() const; void applyVideoSettings(); @@ -142,7 +142,7 @@ Q_SIGNALS: void imageCaptureError(int id, int error, const QString &errorString); // media recorder control - void videoStateChanged(QMediaEncoder::State state); + void videoStateChanged(QMediaEncoder::RecorderState state); void videoStatusChanged(QMediaEncoder::Status status); void durationChanged(qint64 duration); void actualLocationChanged(const QUrl &location); @@ -192,7 +192,7 @@ private: QImageEncoderSettings m_imageEncoderSettings; QString m_videoOutputLocation; - QMediaEncoder::State m_videoState; + QMediaEncoder::RecorderState m_videoState; QMediaEncoder::Status m_videoStatus; QElapsedTimer m_videoRecordingDuration; diff --git a/src/multimedia/platform/qplatformmediaencoder.cpp b/src/multimedia/platform/qplatformmediaencoder.cpp index 3995ebf7d..cca014c1b 100644 --- a/src/multimedia/platform/qplatformmediaencoder.cpp +++ b/src/multimedia/platform/qplatformmediaencoder.cpp @@ -90,7 +90,7 @@ QPlatformMediaEncoder::QPlatformMediaEncoder(QMediaEncoder *parent) */ /*! - \fn QMediaEncoder::State QPlatformMediaEncoder::state() const + \fn QMediaEncoder::RecorderState QPlatformMediaEncoder::state() const Return the current recording state. */ @@ -108,7 +108,7 @@ QPlatformMediaEncoder::QPlatformMediaEncoder(QMediaEncoder *parent) */ /*! - \fn void QPlatformMediaEncoder::setState(QMediaEncoder::State state) + \fn void QPlatformMediaEncoder::setState(QMediaEncoder::RecorderState state) Set the media recorder \a state. */ @@ -127,16 +127,16 @@ QPlatformMediaEncoder::QPlatformMediaEncoder(QMediaEncoder *parent) */ /*! - \fn void QPlatformMediaEncoder::stateChanged(QMediaEncoder::State state) + \fn void QPlatformMediaEncoder::stateChanged(QMediaEncoder::RecorderState state) Signals that the \a state of a media recorder has changed. */ -void QPlatformMediaEncoder::stateChanged(QMediaEncoder::State state) +void QPlatformMediaEncoder::stateChanged(QMediaEncoder::RecorderState state) { if (m_state == state) return; m_state = state; - emit q->stateChanged(state); + emit q->recorderStateChanged(state); } /*! @@ -183,7 +183,7 @@ void QPlatformMediaEncoder::actualLocationChanged(const QUrl &location) Signals that an \a error has occurred. The \a errorString describes the error. */ -void QPlatformMediaEncoder::error(QMediaEncoderBase::Error error, const QString &errorString) +void QPlatformMediaEncoder::error(QMediaEncoder::Error error, const QString &errorString) { if (error == m_error && errorString == m_errorString) return; diff --git a/src/multimedia/platform/qplatformmediaencoder_p.h b/src/multimedia/platform/qplatformmediaencoder_p.h index b535636bd..8e399dc56 100644 --- a/src/multimedia/platform/qplatformmediaencoder_p.h +++ b/src/multimedia/platform/qplatformmediaencoder_p.h @@ -73,8 +73,8 @@ public: virtual QUrl outputLocation() const = 0; virtual bool setOutputLocation(const QUrl &location) = 0; - virtual QMediaEncoder::State state() const { return m_state; } - virtual void setState(QMediaEncoder::State state) = 0; + virtual QMediaEncoder::RecorderState state() const { return m_state; } + virtual void setState(QMediaEncoder::RecorderState state) = 0; virtual QMediaEncoder::Status status() const { return m_status; } @@ -96,7 +96,7 @@ public: protected: explicit QPlatformMediaEncoder(QMediaEncoder *parent); - void stateChanged(QMediaEncoder::State state); + void stateChanged(QMediaEncoder::RecorderState state); void statusChanged(QMediaEncoder::Status status); void durationChanged(qint64 position); void actualLocationChanged(const QUrl &location); @@ -108,7 +108,7 @@ private: QMediaEncoder::Error m_error = QMediaEncoder::NoError; QString m_errorString; QUrl m_actualLocation; - QMediaEncoder::State m_state = QMediaEncoder::StoppedState; + QMediaEncoder::RecorderState m_state = QMediaEncoder::StoppedState; QMediaEncoder::Status m_status = QMediaEncoder::StoppedStatus; }; diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp b/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp index 56aab5c5e..536ba0176 100644 --- a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp +++ b/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp @@ -67,7 +67,7 @@ bool QWindowsMediaEncoder::setOutputLocation(const QUrl &location) return location.scheme() == QLatin1String("file") || location.scheme().isEmpty(); } -QMediaEncoder::State QWindowsMediaEncoder::state() const +QMediaEncoder::RecorderState QWindowsMediaEncoder::state() const { return m_state; } @@ -95,7 +95,7 @@ void QWindowsMediaEncoder::applySettings() m_mediaDeviceSession->setVideoSettings(m_settings); } -void QWindowsMediaEncoder::setState(QMediaEncoder::State state) +void QWindowsMediaEncoder::setState(QMediaEncoder::RecorderState state) { if (!m_captureService || !m_mediaDeviceSession) { qWarning() << Q_FUNC_INFO << "Encoder is not set to a capture session"; diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder_p.h b/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder_p.h index 98dac8ae6..e70e74ef2 100644 --- a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder_p.h +++ b/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder_p.h @@ -72,7 +72,7 @@ public: QUrl outputLocation() const override; bool setOutputLocation(const QUrl &location) override; - QMediaEncoder::State state() const override; + QMediaEncoder::RecorderState state() const override; QMediaEncoder::Status status() const override; qint64 duration() const override; void applySettings() override; @@ -82,7 +82,7 @@ public: void setCaptureSession(QPlatformMediaCaptureSession *session); public Q_SLOTS: - void setState(QMediaEncoder::State state) override; + void setState(QMediaEncoder::RecorderState state) override; private Q_SLOTS: void onCameraChanged(); @@ -95,7 +95,7 @@ private: QWindowsMediaCaptureService *m_captureService = nullptr; QWindowsMediaDeviceSession *m_mediaDeviceSession = nullptr; QUrl m_outputLocation; - QMediaEncoder::State m_state = QMediaEncoder::StoppedState; + QMediaEncoder::RecorderState m_state = QMediaEncoder::StoppedState; QMediaEncoder::Status m_lastStatus = QMediaEncoder::StoppedStatus; QMediaEncoderSettings m_settings; QWindowsStorageLocation m_storageLocation; diff --git a/src/multimedia/recording/qmediaencoder.cpp b/src/multimedia/recording/qmediaencoder.cpp index 1fcbec29f..545005cb1 100644 --- a/src/multimedia/recording/qmediaencoder.cpp +++ b/src/multimedia/recording/qmediaencoder.cpp @@ -92,7 +92,7 @@ void QMediaEncoderPrivate::_q_applySettings() */ QMediaEncoder::QMediaEncoder(QObject *parent) - : QMediaEncoderBase(parent), + : QObject(parent), d_ptr(new QMediaEncoderPrivate) { Q_D(QMediaEncoder); @@ -195,12 +195,12 @@ QUrl QMediaEncoder::actualLocation() const /*! Returns the current media encoder state. - \sa QMediaEncoder::State + \sa QMediaEncoder::RecorderState */ -QMediaEncoder::State QMediaEncoder::state() const +QMediaEncoder::RecorderState QMediaEncoder::recorderState() const { - return d_func()->control ? QMediaEncoder::State(d_func()->control->state()) : StoppedState; + return d_func()->control ? QMediaEncoder::RecorderState(d_func()->control->state()) : StoppedState; } /*! @@ -209,7 +209,7 @@ QMediaEncoder::State QMediaEncoder::state() const \sa QMediaEncoder::Status */ -QMediaEncoderBase::Status QMediaEncoder::status() const +QMediaEncoder::Status QMediaEncoder::status() const { Q_D(const QMediaEncoder); return d->control ? d->control->status() : UnavailableStatus; @@ -221,7 +221,7 @@ QMediaEncoderBase::Status QMediaEncoder::status() const \sa errorString() */ -QMediaEncoderBase::Error QMediaEncoder::error() const +QMediaEncoder::Error QMediaEncoder::error() const { Q_D(const QMediaEncoder); @@ -339,7 +339,7 @@ void QMediaEncoder::stop() } /*! - \enum QMediaEncoderBase::State + \enum QMediaEncoder::RecorderState \value StoppedState The recorder is not active. If this is the state after recording then the actual created recording has @@ -351,7 +351,7 @@ void QMediaEncoder::stop() */ /*! - \enum QMediaEncoderBase::Status + \enum QMediaEncoder::Status \value UnavailableStatus The recorder is not available or not supported by connected media object. @@ -372,7 +372,7 @@ void QMediaEncoder::stop() */ /*! - \enum QMediaEncoderBase::Error + \enum QMediaEncoder::Error \value NoError No Errors. \value ResourceError Device is not ready or not available. @@ -381,7 +381,7 @@ void QMediaEncoder::stop() */ /*! - \property QMediaEncoder::state + \property QMediaEncoder::RecorderState \brief The current state of the media recorder. The state property represents the user request and is changed synchronously @@ -398,7 +398,7 @@ void QMediaEncoder::stop() */ /*! - \fn QMediaEncoder::stateChanged(State state) + \fn QMediaEncoder::recorderStateChanged(State state) Signals that a media recorder's \a state has changed. */ diff --git a/src/multimedia/recording/qmediaencoder.h b/src/multimedia/recording/qmediaencoder.h index 0c0e41ed2..fdc48d839 100644 --- a/src/multimedia/recording/qmediaencoder.h +++ b/src/multimedia/recording/qmediaencoder.h @@ -55,25 +55,31 @@ class QSize; class QAudioFormat; class QCamera; class QCameraDevice; -class QMediaEncoderService; -class QAudioEncoderSettings; -class QVideoEncoderSettings; class QAudioDevice; class QMediaCaptureSession; -class Q_MULTIMEDIA_EXPORT QMediaEncoderBase : public QObject +class QMediaEncoderPrivate; +class Q_MULTIMEDIA_EXPORT QMediaEncoder : public QObject { Q_OBJECT + Q_PROPERTY(QMediaEncoder::RecorderState recorderState READ recorderState NOTIFY recorderStateChanged) + Q_PROPERTY(QMediaEncoder::Status status READ status NOTIFY statusChanged) + Q_PROPERTY(qint64 duration READ duration NOTIFY durationChanged) + Q_PROPERTY(QUrl outputLocation READ outputLocation WRITE setOutputLocation) + Q_PROPERTY(QUrl actualLocation READ actualLocation NOTIFY actualLocationChanged) + Q_PROPERTY(QMediaMetaData metaData READ metaData WRITE setMetaData NOTIFY metaDataChanged) + Q_PROPERTY(QMediaEncoder::Error error READ error NOTIFY errorChanged) + Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged) + Q_PROPERTY(QMediaEncoderSettings encoderSettings READ encoderSettings WRITE setEncoderSettings NOTIFY encoderSettingsChanged) public: - QMediaEncoderBase(QObject *parent) : QObject(parent) {} - enum State + enum RecorderState { StoppedState, RecordingState, PausedState }; - Q_ENUM(State) + Q_ENUM(RecorderState) enum Status { UnavailableStatus, @@ -93,23 +99,7 @@ public: OutOfSpaceError }; Q_ENUM(Error) -}; -class QMediaEncoderPrivate; -class Q_MULTIMEDIA_EXPORT QMediaEncoder : public QMediaEncoderBase -{ - Q_OBJECT - Q_PROPERTY(QMediaEncoderBase::State state READ state NOTIFY stateChanged) - Q_PROPERTY(QMediaEncoderBase::Status status READ status NOTIFY statusChanged) - Q_PROPERTY(qint64 duration READ duration NOTIFY durationChanged) - Q_PROPERTY(QUrl outputLocation READ outputLocation WRITE setOutputLocation) - Q_PROPERTY(QUrl actualLocation READ actualLocation NOTIFY actualLocationChanged) - Q_PROPERTY(QMediaMetaData metaData READ metaData WRITE setMetaData NOTIFY metaDataChanged) - Q_PROPERTY(QMediaEncoderBase::Error error READ error NOTIFY errorChanged) - Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged) - Q_PROPERTY(QMediaEncoderSettings encoderSettings READ encoderSettings WRITE setEncoderSettings NOTIFY encoderSettingsChanged) - -public: QMediaEncoder(QObject *parent = nullptr); ~QMediaEncoder(); @@ -120,10 +110,10 @@ public: QUrl actualLocation() const; - QMediaEncoderBase::State state() const; - QMediaEncoderBase::Status status() const; + RecorderState recorderState() const; + Status status() const; - QMediaEncoderBase::Error error() const; + Error error() const; QString errorString() const; qint64 duration() const; @@ -143,13 +133,13 @@ public Q_SLOTS: void stop(); Q_SIGNALS: - void stateChanged(QMediaEncoder::State state); - void statusChanged(QMediaEncoder::Status status); + void recorderStateChanged(RecorderState state); + void statusChanged(Status status); void durationChanged(qint64 duration); void actualLocationChanged(const QUrl &location); void encoderSettingsChanged(); - void errorOccurred(QMediaEncoder::Error error, const QString &errorString); + void errorOccurred(Error error, const QString &errorString); void errorChanged(); void metaDataChanged(); @@ -165,8 +155,8 @@ private: QT_END_NAMESPACE -Q_MEDIA_ENUM_DEBUG(QMediaEncoderBase, State) -Q_MEDIA_ENUM_DEBUG(QMediaEncoderBase, Status) -Q_MEDIA_ENUM_DEBUG(QMediaEncoderBase, Error) +Q_MEDIA_ENUM_DEBUG(QMediaEncoder, RecorderState) +Q_MEDIA_ENUM_DEBUG(QMediaEncoder, Status) +Q_MEDIA_ENUM_DEBUG(QMediaEncoder, Error) #endif // QMEDIAENCODER_H |