summaryrefslogtreecommitdiffstats
path: root/src/multimedia/doc/src
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2014-06-04 11:08:13 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-06-05 09:48:33 +0200
commitcb6b4e2079d561bdb4e4e7d661c74c2f6ad15040 (patch)
tree76b932f09e39dc4f85c85baa26227e59cf911bb1 /src/multimedia/doc/src
parentb9b06defc76ae8c3bc6073cb81b4e31b94917a97 (diff)
Doc: Remove comment about preliminary API for Qt 5.0
Task-number: QTBUG-39195 Change-Id: I193321a29d06760e4ad5aa2eaca99d98b2e1f65a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/multimedia/doc/src')
-rw-r--r--src/multimedia/doc/src/audiooverview.qdoc10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/multimedia/doc/src/audiooverview.qdoc b/src/multimedia/doc/src/audiooverview.qdoc
index 54735da6c..32556543b 100644
--- a/src/multimedia/doc/src/audiooverview.qdoc
+++ b/src/multimedia/doc/src/audiooverview.qdoc
@@ -116,18 +116,14 @@ code but more buffering, which may affect latency.
\section2 Decoding Compressed Audio to Memory
In some cases you may want to decode a compressed audio file and do further
-processing yourself (like mix multiple samples, or some custom digital signal
-processing algorithms). Qt Multimedia 5.0 offers a preliminary API for this
-case - the \l QAudioDecoder class. QAudioDecoder supports decoding local files
-or from a QIODevice instances.
+processing yourself (for example, mixing multiple samples or using custom
+digital signal processing algorithms). QAudioDecoder supports decoding local
+files or data streams from QIODevice instances.
Here's an example of decoding a local file:
\snippet multimedia-snippets/audio.cpp Local audio decoding
-Note: This API is preliminary at this time - the API may change or be
-removed before the final 5.0 release.
-
\section1 Examples
There are both C++ and QML examples available.