slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Media asset writer - use the right macro

Browse Source 
QT_PREPEND_NAMESPACE, not QT_MANGLE_NAMESPACE.

Change-Id: I9eb4130b203a5fb8f9f7964a0a642686814d5990
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
This commit is contained in:
Timur Pocheptsov
2015-06-02 18:12:19 +02:00
committed by Yoann Lopes
parent 7fd0fec5e5
commit 912b8e5647
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/avfoundation/camera/avfmediaassetwriter.h
View File

@@ -70,32 +70,32 @@ QT_END_NAMESPACE
@private @private
AVFCameraService *m_service; AVFCameraService *m_service;
QT_MANGLE_NAMESPACE(AVFScopedPointer)<AVAssetWriterInput> m_cameraWriterInput; QT_PREPEND_NAMESPACE(AVFScopedPointer)<AVAssetWriterInput> m_cameraWriterInput;
QT_MANGLE_NAMESPACE(AVFScopedPointer)<AVCaptureDeviceInput> m_audioInput; QT_PREPEND_NAMESPACE(AVFScopedPointer)<AVCaptureDeviceInput> m_audioInput;
QT_MANGLE_NAMESPACE(AVFScopedPointer)<AVCaptureAudioDataOutput> m_audioOutput; QT_PREPEND_NAMESPACE(AVFScopedPointer)<AVCaptureAudioDataOutput> m_audioOutput;
QT_MANGLE_NAMESPACE(AVFScopedPointer)<AVAssetWriterInput> m_audioWriterInput; QT_PREPEND_NAMESPACE(AVFScopedPointer)<AVAssetWriterInput> m_audioWriterInput;
// High priority serial queue for video output: // High priority serial queue for video output:
QT_MANGLE_NAMESPACE(AVFScopedPointer)<dispatch_queue_t> m_videoQueue; QT_PREPEND_NAMESPACE(AVFScopedPointer)<dispatch_queue_t> m_videoQueue;
// Serial queue for audio output: // Serial queue for audio output:
QT_MANGLE_NAMESPACE(AVFScopedPointer)<dispatch_queue_t> m_audioQueue; QT_PREPEND_NAMESPACE(AVFScopedPointer)<dispatch_queue_t> m_audioQueue;
// Queue to write sample buffers: // Queue to write sample buffers:
__weak dispatch_queue_t m_writerQueue; __weak dispatch_queue_t m_writerQueue;
QT_MANGLE_NAMESPACE(AVFScopedPointer)<AVAssetWriter> m_assetWriter; QT_PREPEND_NAMESPACE(AVFScopedPointer)<AVAssetWriter> m_assetWriter;
// Delegate's queue. // Delegate's queue.
__weak dispatch_queue_t m_delegateQueue; __weak dispatch_queue_t m_delegateQueue;
// TODO: QPointer?? // TODO: QPointer??
QT_PREPEND_NAMESPACE(AVFMediaAssetWriterDelegate) *m_delegate; QT_PREPEND_NAMESPACE(AVFMediaAssetWriterDelegate) *m_delegate;
bool m_setStartTime; bool m_setStartTime;
QT_MANGLE_NAMESPACE(AVFAtomicBool) m_stopped; QT_PREPEND_NAMESPACE(AVFAtomicBool) m_stopped;
bool m_stoppedInternal; bool m_stoppedInternal;
bool m_aborted; bool m_aborted;
QT_MANGLE_NAMESPACE(QMutex) m_writerMutex; QT_PREPEND_NAMESPACE(QMutex) m_writerMutex;
@public @public
QT_MANGLE_NAMESPACE(AVFAtomicInt64) m_durationInMs; QT_PREPEND_NAMESPACE(AVFAtomicInt64) m_durationInMs;
@private @private
CMTime m_startTime; CMTime m_startTime;
CMTime m_lastTimeStamp; CMTime m_lastTimeStamp;