aboutsummaryrefslogtreecommitdiff
path: root/audio/decoders
diff options
context:
space:
mode:
authorMatthew Hoops2011-05-31 14:16:29 -0400
committerMatthew Hoops2011-05-31 14:16:29 -0400
commitaa49b38c5a8032586cb94fc4ca07149eecabe64a (patch)
treeea5c7617f8c482c8cf4141b728b3ccff5a7f84c7 /audio/decoders
parentd3ea9ab2a9334747eb445c1b45aa30cb17ffdf1b (diff)
parentc86a6c466fabe31fbf36363aa8d0ac8ea6001b9f (diff)
downloadscummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.tar.gz
scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.tar.bz2
scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.zip
Merge remote branch 'upstream/master' into t7g-ios
Conflicts: engines/groovie/script.cpp
Diffstat (limited to 'audio/decoders')
-rw-r--r--audio/decoders/adpcm.cpp3
-rw-r--r--audio/decoders/adpcm.h3
-rw-r--r--audio/decoders/adpcm_intern.h3
-rw-r--r--audio/decoders/aiff.cpp3
-rw-r--r--audio/decoders/aiff.h3
-rw-r--r--audio/decoders/flac.cpp5
-rw-r--r--audio/decoders/flac.h3
-rw-r--r--audio/decoders/iff_sound.cpp3
-rw-r--r--audio/decoders/iff_sound.h3
-rw-r--r--audio/decoders/mac_snd.cpp3
-rw-r--r--audio/decoders/mac_snd.h3
-rw-r--r--audio/decoders/mp3.cpp3
-rw-r--r--audio/decoders/mp3.h3
-rw-r--r--audio/decoders/qdm2.cpp3
-rw-r--r--audio/decoders/qdm2.h3
-rw-r--r--audio/decoders/qdm2data.h3
-rw-r--r--audio/decoders/raw.cpp3
-rw-r--r--audio/decoders/raw.h3
-rw-r--r--audio/decoders/vag.cpp3
-rw-r--r--audio/decoders/vag.h3
-rw-r--r--audio/decoders/voc.cpp3
-rw-r--r--audio/decoders/voc.h3
-rw-r--r--audio/decoders/vorbis.cpp3
-rw-r--r--audio/decoders/vorbis.h4
-rw-r--r--audio/decoders/wave.cpp3
-rw-r--r--audio/decoders/wave.h3
26 files changed, 2 insertions, 79 deletions
diff --git a/audio/decoders/adpcm.cpp b/audio/decoders/adpcm.cpp
index a9284973d5..d28ed222a5 100644
--- a/audio/decoders/adpcm.cpp
+++ b/audio/decoders/adpcm.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
#include "common/stream.h"
diff --git a/audio/decoders/adpcm.h b/audio/decoders/adpcm.h
index 10344101e2..1dd4d510df 100644
--- a/audio/decoders/adpcm.h
+++ b/audio/decoders/adpcm.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
diff --git a/audio/decoders/adpcm_intern.h b/audio/decoders/adpcm_intern.h
index f875bd88c7..c9f894fb84 100644
--- a/audio/decoders/adpcm_intern.h
+++ b/audio/decoders/adpcm_intern.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
diff --git a/audio/decoders/aiff.cpp b/audio/decoders/aiff.cpp
index 957fb13638..f3b0dfb559 100644
--- a/audio/decoders/aiff.cpp
+++ b/audio/decoders/aiff.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/*
diff --git a/audio/decoders/aiff.h b/audio/decoders/aiff.h
index dddbffb520..558a018f57 100644
--- a/audio/decoders/aiff.h
+++ b/audio/decoders/aiff.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
diff --git a/audio/decoders/flac.cpp b/audio/decoders/flac.cpp
index fe15877ac6..d06a7b9c0e 100644
--- a/audio/decoders/flac.cpp
+++ b/audio/decoders/flac.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
// Disable symbol overrides for FILE as that is used in FLAC headers
@@ -306,7 +303,7 @@ int FLACStream::readBuffer(int16 *buffer, const int numSamples) {
const uint numChannels = getChannels();
if (numChannels == 0) {
- warning("FLACStream: Stream not successfully initialised, cant playback");
+ warning("FLACStream: Stream not successfully initialized, cant playback");
return -1; // streaminfo wasnt read!
}
diff --git a/audio/decoders/flac.h b/audio/decoders/flac.h
index 69222f22a1..3182b26425 100644
--- a/audio/decoders/flac.h
+++ b/audio/decoders/flac.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
diff --git a/audio/decoders/iff_sound.cpp b/audio/decoders/iff_sound.cpp
index 8efe017e75..4efdce0338 100644
--- a/audio/decoders/iff_sound.cpp
+++ b/audio/decoders/iff_sound.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
#include "audio/decoders/iff_sound.h"
diff --git a/audio/decoders/iff_sound.h b/audio/decoders/iff_sound.h
index 4d26b32e71..b266e629a1 100644
--- a/audio/decoders/iff_sound.h
+++ b/audio/decoders/iff_sound.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
diff --git a/audio/decoders/mac_snd.cpp b/audio/decoders/mac_snd.cpp
index fc69988860..43253a9ddf 100644
--- a/audio/decoders/mac_snd.cpp
+++ b/audio/decoders/mac_snd.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/*
diff --git a/audio/decoders/mac_snd.h b/audio/decoders/mac_snd.h
index bf6331a265..cbbd82bbe0 100644
--- a/audio/decoders/mac_snd.h
+++ b/audio/decoders/mac_snd.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
diff --git a/audio/decoders/mp3.cpp b/audio/decoders/mp3.cpp
index 91bd49873a..8d7f006ec7 100644
--- a/audio/decoders/mp3.cpp
+++ b/audio/decoders/mp3.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
#include "audio/decoders/mp3.h"
diff --git a/audio/decoders/mp3.h b/audio/decoders/mp3.h
index d3a5b70d45..86ddc599ea 100644
--- a/audio/decoders/mp3.h
+++ b/audio/decoders/mp3.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
diff --git a/audio/decoders/qdm2.cpp b/audio/decoders/qdm2.cpp
index dbce8d2447..a178c363b5 100644
--- a/audio/decoders/qdm2.cpp
+++ b/audio/decoders/qdm2.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
// Based off ffmpeg's QDM2 decoder
diff --git a/audio/decoders/qdm2.h b/audio/decoders/qdm2.h
index 6988623dcb..c0ec647bfd 100644
--- a/audio/decoders/qdm2.h
+++ b/audio/decoders/qdm2.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
// Only compile if Mohawk is enabled or if we're building dynamic modules
diff --git a/audio/decoders/qdm2data.h b/audio/decoders/qdm2data.h
index cfe1a3d10e..d92bc0ff80 100644
--- a/audio/decoders/qdm2data.h
+++ b/audio/decoders/qdm2data.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
#ifndef AUDIO_QDM2DATA_H
diff --git a/audio/decoders/raw.cpp b/audio/decoders/raw.cpp
index cf787f9b12..4789fd0f36 100644
--- a/audio/decoders/raw.cpp
+++ b/audio/decoders/raw.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
#include "common/endian.h"
diff --git a/audio/decoders/raw.h b/audio/decoders/raw.h
index 23ed02182d..5a7897b688 100644
--- a/audio/decoders/raw.h
+++ b/audio/decoders/raw.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
#ifndef SOUND_RAW_H
diff --git a/audio/decoders/vag.cpp b/audio/decoders/vag.cpp
index 2c3a36202a..10ef69708c 100644
--- a/audio/decoders/vag.cpp
+++ b/audio/decoders/vag.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
#include "audio/decoders/vag.h"
diff --git a/audio/decoders/vag.h b/audio/decoders/vag.h
index 4adc1d3dde..b80fbdb98f 100644
--- a/audio/decoders/vag.h
+++ b/audio/decoders/vag.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
diff --git a/audio/decoders/voc.cpp b/audio/decoders/voc.cpp
index 9c2dc4f337..74ea4440a1 100644
--- a/audio/decoders/voc.cpp
+++ b/audio/decoders/voc.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
#include "common/debug.h"
diff --git a/audio/decoders/voc.h b/audio/decoders/voc.h
index 38250dcf7a..8bc6dcf46f 100644
--- a/audio/decoders/voc.h
+++ b/audio/decoders/voc.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
diff --git a/audio/decoders/vorbis.cpp b/audio/decoders/vorbis.cpp
index 63f7ba8207..2724dd1f02 100644
--- a/audio/decoders/vorbis.cpp
+++ b/audio/decoders/vorbis.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
// Disable symbol overrides for FILE and fseek as those are used in the
diff --git a/audio/decoders/vorbis.h b/audio/decoders/vorbis.h
index 51d0b82d5f..e3d989e9b8 100644
--- a/audio/decoders/vorbis.h
+++ b/audio/decoders/vorbis.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
@@ -36,6 +33,7 @@
* - scumm
* - sword1
* - sword2
+ * - sword25
* - touche
* - tucker
*/
diff --git a/audio/decoders/wave.cpp b/audio/decoders/wave.cpp
index a64874887a..3cf4566d0c 100644
--- a/audio/decoders/wave.cpp
+++ b/audio/decoders/wave.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
#include "common/debug.h"
diff --git a/audio/decoders/wave.h b/audio/decoders/wave.h
index 33c3e798a0..6a34bc175a 100644
--- a/audio/decoders/wave.h
+++ b/audio/decoders/wave.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 12:56:29 +0000