diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-10 19:26:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-10 19:26:21 +0200 |
| commit | 08e13bfcdb23eabfbc47bca7499b0b8aadce0ac7 (patch) | |
| tree | 406ffa7e3ae0a346a14175ccccb8ac7e596d8f8f /src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h | |
| parent | fa9fe9ff8c3aba25fbae4f8f32588dd6477d6df8 (diff) | |
| parent | f0e0d5d901d4e28fff9f29caf86ada84906b3db4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/winrt/qwinrtcameracontrol.cpp
Change-Id: I45d3042adf19577a72794610fa1c310cb22e26c4
Diffstat (limited to 'src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h b/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h index 59af1d4bf..c3fe02c44 100644 --- a/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h +++ b/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h @@ -57,7 +57,7 @@ class AVFCameraService; class QString; class QUrl; -class AVFMediaRecorderControlIOS : public QMediaRecorderControl, public AVFMediaAssetWriterDelegate +class AVFMediaRecorderControlIOS : public QMediaRecorderControl { Q_OBJECT public: @@ -82,13 +82,10 @@ public Q_SLOTS: void setMuted(bool muted) Q_DECL_OVERRIDE; void setVolume(qreal volume) Q_DECL_OVERRIDE; - // Writer delegate: private: - void assetWriterStarted() Q_DECL_OVERRIDE; - void assetWriterFailedToStart() Q_DECL_OVERRIDE; - void assetWriterFailedToStop() Q_DECL_OVERRIDE; - void assetWriterFinished() Q_DECL_OVERRIDE; + Q_INVOKABLE void assetWriterStarted(); + Q_INVOKABLE void assetWriterFinished(); private Q_SLOTS: void captureModeChanged(QCamera::CaptureModes); |