diff -r 41300fa6a67c -r f7bc934e204c src/multimedia/audio/qaudioinput_mac_p.h --- a/src/multimedia/audio/qaudioinput_mac_p.h Tue Feb 02 00:43:10 2010 +0200 +++ b/src/multimedia/audio/qaudioinput_mac_p.h Wed Mar 31 11:06:36 2010 +0300 @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -74,8 +74,9 @@ class QTimer; class QIODevice; +class QAbstractAudioDeviceInfo; -namespace +namespace QtMultimediaInternal { class QAudioInputBuffer; } @@ -97,13 +98,14 @@ UInt64 startTime; QAudio::Error errorCode; QAudio::State stateCode; - QAudioInputBuffer* audioBuffer; + QtMultimediaInternal::QAudioInputBuffer* audioBuffer; QMutex mutex; QWaitCondition threadFinished; QAtomicInt audioThreadState; QTimer* intervalTimer; AudioStreamBasicDescription streamFormat; AudioStreamBasicDescription deviceFormat; + QAbstractAudioDeviceInfo *audioDeviceInfo; QAudioInputPrivate(const QByteArray& device, QAudioFormat const& format); ~QAudioInputPrivate();