aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2004-10-30 21:52:57 +0000
committerMax Horn2004-10-30 21:52:57 +0000
commit5f4575ccd09790ed7bd9d59403b7cf2c866567a4 (patch)
treefaf7c0eb47757e1a464cf6c5c493d1a7a2ace661
parent40d9601b615993763252abeea13621a0a629bd88 (diff)
downloadscummvm-rg350-5f4575ccd09790ed7bd9d59403b7cf2c866567a4.tar.gz
scummvm-rg350-5f4575ccd09790ed7bd9d59403b7cf2c866567a4.tar.bz2
scummvm-rg350-5f4575ccd09790ed7bd9d59403b7cf2c866567a4.zip
Doxygen fixes
svn-id: r15699
-rw-r--r--kyra/codecs.cpp7
-rw-r--r--kyra/codecs.h6
-rw-r--r--sound/mixer.h4
3 files changed, 9 insertions, 8 deletions
diff --git a/kyra/codecs.cpp b/kyra/codecs.cpp
index 210da4f570..a223f8310b 100644
--- a/kyra/codecs.cpp
+++ b/kyra/codecs.cpp
@@ -33,12 +33,13 @@
* Modified for ScummVM by Johannes Schickel
****************************************************************************/
+namespace Kyra {
+
/** decompress format 80 compressed data.
- * @param compressed data.
- * @param pointer to output uncompressed data.
+ * @param image_in compressed data.
+ * @param image_out pointer to output uncompressed data.
* @returns size of uncompressed data.
*/
-namespace Kyra {
int Compression::decode80(const uint8* image_in, uint8* image_out) {
/*
0 copy 0cccpppp p
diff --git a/kyra/codecs.h b/kyra/codecs.h
index 58447d1a10..a7b9f11338 100644
--- a/kyra/codecs.h
+++ b/kyra/codecs.h
@@ -19,9 +19,9 @@
*
*/
-/** Various decompression routines */
-#ifndef __COMPRESSION_H
-#define __COMPRESSION_H
+/* Various decompression routines */
+#ifndef CODECS_H
+#define CODECS_H
// THIS CODE WAS TAKEN FROM FreeKyra Tools Module
diff --git a/sound/mixer.h b/sound/mixer.h
index 523e47fb6f..ae5055616b 100644
--- a/sound/mixer.h
+++ b/sound/mixer.h
@@ -100,8 +100,8 @@ public:
* samples (i.e. len * 4 bytes). The endianness of these samples shall be
* the native endianness.
*
- * @obsolete Instead of this, use the other setupPremix method which
- * takes an AudioStream.
+ * @deprecated Instead of this, use the other setupPremix method which
+ * takes an AudioStream.
*/
void setupPremix(PremixProc *proc, void *param);