Changeset 846 for trunk/src/multimedia/audio/qaudioinput.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/multimedia/audio/qaudioinput.cpp (modified) (7 diffs)

trunk/src/multimedia/audio/qaudioinput.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -202 +202 @@
 /*!
      Uses the \a device as the QIODevice to transfer data.
-     Passing a QIODevice allows the data to be transfered without any extra code.
+     Passing a QIODevice allows the data to be transfered without any extra code.
      All that is required is to open the QIODevice.
 
@@ -212 +212 @@
      state() is set to QAudio::StoppedState and stateChanged() signal is emitted.
 
-    In either case, the stateChanged() signal may be emitted either synchronously
-    during execution of the start() function or asynchronously after start() has
-    returned to the caller.
-
-     \sa {Symbian Platform Security Requirements}
+     \l{QAudioInput#Symbian Platform Security Requirements}
 
      \sa QIODevice
@@ -238 +234 @@
     state() is set to QAudio::StoppedState and stateChanged() signal is emitted.
 
-    In either case, the stateChanged() signal may be emitted either synchronously
-    during execution of the start() function or asynchronously after start() has
-    returned to the caller.
-
-    \sa {Symbian Platform Security Requirements}
+    \l{QAudioInput#Symbian Platform Security Requirements}
 
     \sa QIODevice
@@ -287 +279 @@
     Sets error() to QAudio::NoError, state() to QAudio::SuspendedState and
     emit stateChanged() signal.
-
-    Note: signal will always be emitted during execution of the resume() function.
 */
 
@@ -311 +301 @@
 
 /*!
-    Sets the audio buffer size to \a value bytes.
+    Sets the audio buffer size to \a value s.
 
     Note: This function can be called anytime before start(), calls to this
@@ -326 +316 @@
 
 /*!
-    Returns the audio buffer size in bytes.
+    Returns the audio buffer size in s.
 
     If called before start(), returns platform default value.