summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2009-05-26 07:48:09 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2009-05-26 07:48:09 (GMT)
commit02b49e3bf1556c76cd59d205529f04a390cfa433 (patch)
tree613514f3dc2a70d0bd3922f152ef9f4eab05a30b /doc
parentbaec0ecd314c6e9563bd56cf19571ca71d7d11cd (diff)
downloadQt-02b49e3bf1556c76cd59d205529f04a390cfa433.zip
Qt-02b49e3bf1556c76cd59d205529f04a390cfa433.tar.gz
Qt-02b49e3bf1556c76cd59d205529f04a390cfa433.tar.bz2
Fix doc warnings for Phonon
Diffstat (limited to 'doc')
-rw-r--r--doc/src/phonon-api.qdoc32
1 files changed, 30 insertions, 2 deletions
diff --git a/doc/src/phonon-api.qdoc b/doc/src/phonon-api.qdoc
index dd37fe2..5deb64e 100644
--- a/doc/src/phonon-api.qdoc
+++ b/doc/src/phonon-api.qdoc
@@ -1032,6 +1032,7 @@
\value Stream The MediaSource object describes a data stream.
This is the type used for \l{QIODevice}s. Note
that a stream opened with a QUrl, will still be of the Url type.
+ \value Empty The media source doesn't have a source.
\sa MediaSource::type()
*/
@@ -2026,6 +2027,15 @@
*/
/*!
+ \fn void Phonon::MediaObject::clear()
+
+ Stops and removes all playing and enqueued media sources.
+
+ \sa setCurrentSource()
+*/
+
+
+/*!
\fn void Phonon::MediaObject::stateChanged(Phonon::State newstate, Phonon::State oldstate)
This signal is emitted when the state of the MediaObject has changed.
@@ -3027,6 +3037,12 @@
*/
/*!
+ \typedef Phonon::AudioOutputInterface
+ \inmodule Phonon
+ \internal
+*/
+
+/*!
\class Phonon::AudioOutputInterface40
\inmodule Phonon
\since 4.4
@@ -3251,7 +3267,19 @@
/*!
\fn bool Phonon::Path::operator!=(const Path &p) const;
- Returns true if this Path is not equal to \a p; otherwise returns false;
+ Returns true if this Path is not equal to \a p; otherwise returns false.
+*/
+
+/*!
+ \fn MediaNode *Phonon::Path::source() const;
+
+ Returns the source MediaNode used by the path.
+*/
+
+/*!
+ \fn MediaNode *Phonon::Path::sink() const;
+
+ Returns the sink MediaNode used by the path.
*/
/*!
@@ -4878,7 +4906,7 @@
*/
/*!
- \typedef typedef void (*CleanUpFunction)()
+ \typedef Phonon::CleanUpFunction
\inmodule Phonon
\internal
*/