diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-11-05 09:34:48 +0100 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-11-05 13:58:57 +0100 |
| commit | f422fbde120f791b29d01cf76079599c68ffa868 (patch) | |
| tree | b6524378b3accab6af149e7197875b30dc2175a7 /src/plugins/avfoundation/camera/avfmediaassetwriter.h | |
| parent | 8b92454d6fffcee7a8cf1fb5e0c92920c77733c8 (diff) | |
AVFMediaAsserWriter: remove deprecated declration
Interface in headers should not contain i-var declarations, these days
it must be in implementation part. Also, replace quite suspicious
'load' with 'loadAquire' to pair 'storeRelease'. Since I have QT_USE_NAMESPACE
in *.mm file, no need in ugly QT_PREPEND_NAMESPACE macro anymore.
Change-Id: Ia19e3c5b68687030c97e8e8e982ae89627e909f9
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Diffstat (limited to 'src/plugins/avfoundation/camera/avfmediaassetwriter.h')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfmediaassetwriter.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/plugins/avfoundation/camera/avfmediaassetwriter.h b/src/plugins/avfoundation/camera/avfmediaassetwriter.h index 9d61d5089..f063dab4b 100644 --- a/src/plugins/avfoundation/camera/avfmediaassetwriter.h +++ b/src/plugins/avfoundation/camera/avfmediaassetwriter.h @@ -43,7 +43,6 @@ #include "avfcamerautility.h" #include <QtCore/qglobal.h> -#include <QtCore/qatomic.h> #include <AVFoundation/AVFoundation.h> @@ -52,17 +51,10 @@ QT_BEGIN_NAMESPACE class AVFMediaRecorderControlIOS; class AVFCameraService; -typedef QAtomicInteger<qint64> AVFAtomicInt64; - QT_END_NAMESPACE @interface QT_MANGLE_NAMESPACE(AVFMediaAssetWriter) : NSObject<AVCaptureVideoDataOutputSampleBufferDelegate, AVCaptureAudioDataOutputSampleBufferDelegate> -{ -@public - QT_PREPEND_NAMESPACE(AVFAtomicInt64) m_durationInMs; -} - - (id)initWithDelegate:(QT_PREPEND_NAMESPACE(AVFMediaRecorderControlIOS) *)delegate; - (bool)setupWithFileURL:(NSURL *)fileURL @@ -76,6 +68,7 @@ QT_END_NAMESPACE - (void)stop; // This to be called from the recorder control's dtor: - (void)abort; +- (qint64)durationInMs; @end |