--- a/src/multimedia/audio/qaudioinput_mac_p.cpp	Tue Jan 26 12:42:25 2010 +0200
+++ b/src/multimedia/audio/qaudioinput_mac_p.cpp	Tue Feb 02 00:43:10 2010 +0200
@@ -526,7 +526,7 @@
         internalBufferSize = default_buffer_size;
         clockFrequency = AudioGetHostClockFrequency() / 1000;
         errorCode = QAudio::NoError;
-        stateCode = QAudio::StopState;
+        stateCode = QAudio::StoppedState;
 
         intervalTimer = new QTimer(this);
         intervalTimer->setInterval(1000);
@@ -708,7 +708,7 @@
     QIODevice*  op = device;
 
     if (!open()) {
-        stateCode = QAudio::StopState;
+        stateCode = QAudio::StoppedState;
         errorCode = QAudio::OpenError;
         return audioIO;
     }
@@ -736,12 +736,12 @@
 void QAudioInputPrivate::stop()
 {
     QMutexLocker    lock(&mutex);
-    if (stateCode != QAudio::StopState) {
+    if (stateCode != QAudio::StoppedState) {
         audioThreadStop();
         audioBuffer->flush(true);
 
         errorCode = QAudio::NoError;
-        stateCode = QAudio::StopState;
+        stateCode = QAudio::StoppedState;
         QMetaObject::invokeMethod(this, "stateChanged", Qt::QueuedConnection, Q_ARG(QAudio::State, stateCode));
     }
 }
@@ -749,11 +749,11 @@
 void QAudioInputPrivate::reset()
 {
     QMutexLocker    lock(&mutex);
-    if (stateCode != QAudio::StopState) {
+    if (stateCode != QAudio::StoppedState) {
         audioThreadStop();
 
         errorCode = QAudio::NoError;
-        stateCode = QAudio::StopState;
+        stateCode = QAudio::StoppedState;
         QMetaObject::invokeMethod(this, "stateChanged", Qt::QueuedConnection, Q_ARG(QAudio::State, stateCode));
     }
 }
@@ -765,7 +765,7 @@
         audioThreadStop();
 
         errorCode = QAudio::NoError;
-        stateCode = QAudio::SuspendState;
+        stateCode = QAudio::SuspendedState;
         QMetaObject::invokeMethod(this, "stateChanged", Qt::QueuedConnection, Q_ARG(QAudio::State, stateCode));
     }
 }
@@ -773,7 +773,7 @@
 void QAudioInputPrivate::resume()
 {
     QMutexLocker    lock(&mutex);
-    if (stateCode == QAudio::SuspendState) {
+    if (stateCode == QAudio::SuspendedState) {
         audioThreadStart();
 
         errorCode = QAudio::NoError;
@@ -812,14 +812,14 @@
     return intervalTimer->interval();
 }
 
-qint64 QAudioInputPrivate::totalTime() const
+qint64 QAudioInputPrivate::processedUSecs() const
 {
     return totalFrames * 1000000 / audioFormat.frequency();
 }
 
-qint64 QAudioInputPrivate::clock() const
+qint64 QAudioInputPrivate::elapsedUSecs() const
 {
-    if (stateCode == QAudio::StopState)
+    if (stateCode == QAudio::StoppedState)
         return 0;
 
     return (AudioGetCurrentHostTime() - startTime) / (clockFrequency / 1000);
@@ -875,7 +875,7 @@
         audioDeviceStop();
 
         errorCode = QAudio::IOError;
-        stateCode = QAudio::StopState;
+        stateCode = QAudio::StoppedState;
         QMetaObject::invokeMethod(this, "deviceStopped", Qt::QueuedConnection);
     }
 }