aboutsummaryrefslogtreecommitdiff
path: root/src/base/QXmppRtpChannel.cpp
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2012-07-21 19:01:25 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2012-07-21 19:01:25 +0200
commite5927fa8199dc4474bf0762aea8fb20376ef7d8b (patch)
tree4b514e45e1cbbabb5a3f6a1d952f817f844b255b /src/base/QXmppRtpChannel.cpp
parent684fee3855387d652e8603872225865d4779d31e (diff)
downloadqxmpp-e5927fa8199dc4474bf0762aea8fb20376ef7d8b.tar.gz
doc fixes
Diffstat (limited to 'src/base/QXmppRtpChannel.cpp')
-rw-r--r--src/base/QXmppRtpChannel.cpp30
1 files changed, 16 insertions, 14 deletions
diff --git a/src/base/QXmppRtpChannel.cpp b/src/base/QXmppRtpChannel.cpp
index 93d38b97..3abbf4ca 100644
--- a/src/base/QXmppRtpChannel.cpp
+++ b/src/base/QXmppRtpChannel.cpp
@@ -167,10 +167,6 @@ void QXmppRtpChannel::setRemotePayloadTypes(const QList<QXmppJinglePayloadType>
payloadTypesChanged();
}
-void QXmppRtpChannel::payloadTypesChanged()
-{
-}
-
enum CodecId {
G711u = 0,
GSM = 3,
@@ -493,6 +489,17 @@ QIODevice::OpenMode QXmppRtpAudioChannel::openMode() const
return QIODevice::openMode();
}
+/// Returns the RTP channel's payload type.
+///
+/// You can use this to determine the QAudioFormat to use with your
+/// QAudioInput/QAudioOutput.
+
+QXmppJinglePayloadType QXmppRtpAudioChannel::payloadType() const
+{
+ return d->payloadType;
+}
+
+/// \cond
qint64 QXmppRtpAudioChannel::readData(char * data, qint64 maxSize)
{
// if we are filling the buffer, return empty samples
@@ -531,16 +538,6 @@ qint64 QXmppRtpAudioChannel::readData(char * data, qint64 maxSize)
return maxSize;
}
-/// Returns the RTP channel's payload type.
-///
-/// You can use this to determine the QAudioFormat to use with your
-/// QAudioInput/QAudioOutput.
-
-QXmppJinglePayloadType QXmppRtpAudioChannel::payloadType() const
-{
- return d->payloadType;
-}
-
void QXmppRtpAudioChannel::payloadTypesChanged()
{
// delete incoming codecs
@@ -578,6 +575,7 @@ void QXmppRtpAudioChannel::payloadTypesChanged()
open(QIODevice::ReadWrite | QIODevice::Unbuffered);
}
+/// \endcond
/// Returns the position in the received audio data.
@@ -632,6 +630,7 @@ void QXmppRtpAudioChannel::stopTone(QXmppRtpAudioChannel::Tone tone)
}
}
+/// \cond
qint64 QXmppRtpAudioChannel::writeData(const char * data, qint64 maxSize)
{
if (!d->outgoingCodec) {
@@ -647,6 +646,7 @@ qint64 QXmppRtpAudioChannel::writeData(const char * data, qint64 maxSize)
return maxSize;
}
+/// \endcond
void QXmppRtpAudioChannel::writeDatagram()
{
@@ -969,6 +969,7 @@ QIODevice::OpenMode QXmppRtpVideoChannel::openMode() const
return mode;
}
+/// \cond
void QXmppRtpVideoChannel::payloadTypesChanged()
{
// refresh decoders
@@ -1019,6 +1020,7 @@ void QXmppRtpVideoChannel::payloadTypesChanged()
}
}
}
+/// \endcond
/// Decodes buffered RTP packets and returns a list of video frames.