diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/audiocd.cpp | 6 | ||||
-rw-r--r-- | sound/audiostream.cpp | 8 | ||||
-rw-r--r-- | sound/decoders/adpcm.cpp (renamed from sound/adpcm.cpp) | 2 | ||||
-rw-r--r-- | sound/decoders/adpcm.h (renamed from sound/adpcm.h) | 0 | ||||
-rw-r--r-- | sound/decoders/aiff.cpp (renamed from sound/aiff.cpp) | 4 | ||||
-rw-r--r-- | sound/decoders/aiff.h (renamed from sound/aiff.h) | 0 | ||||
-rw-r--r-- | sound/decoders/flac.cpp (renamed from sound/flac.cpp) | 2 | ||||
-rw-r--r-- | sound/decoders/flac.h (renamed from sound/flac.h) | 0 | ||||
-rw-r--r-- | sound/decoders/iff_sound.cpp (renamed from sound/iff_sound.cpp) | 4 | ||||
-rw-r--r-- | sound/decoders/iff_sound.h (renamed from sound/iff_sound.h) | 0 | ||||
-rw-r--r-- | sound/decoders/mp3.cpp (renamed from sound/mp3.cpp) | 2 | ||||
-rw-r--r-- | sound/decoders/mp3.h (renamed from sound/mp3.h) | 0 | ||||
-rw-r--r-- | sound/decoders/raw.cpp (renamed from sound/raw.cpp) | 2 | ||||
-rw-r--r-- | sound/decoders/raw.h (renamed from sound/raw.h) | 0 | ||||
-rw-r--r-- | sound/decoders/shorten.cpp (renamed from sound/shorten.cpp) | 4 | ||||
-rw-r--r-- | sound/decoders/shorten.h (renamed from sound/shorten.h) | 0 | ||||
-rw-r--r-- | sound/decoders/vag.cpp (renamed from sound/vag.cpp) | 2 | ||||
-rw-r--r-- | sound/decoders/vag.h (renamed from sound/vag.h) | 1 | ||||
-rw-r--r-- | sound/decoders/voc.cpp (renamed from sound/voc.cpp) | 4 | ||||
-rw-r--r-- | sound/decoders/voc.h (renamed from sound/voc.h) | 0 | ||||
-rw-r--r-- | sound/decoders/vorbis.cpp (renamed from sound/vorbis.cpp) | 2 | ||||
-rw-r--r-- | sound/decoders/vorbis.h (renamed from sound/vorbis.h) | 0 | ||||
-rw-r--r-- | sound/decoders/wave.cpp (renamed from sound/wave.cpp) | 6 | ||||
-rw-r--r-- | sound/decoders/wave.h (renamed from sound/wave.h) | 0 | ||||
-rw-r--r-- | sound/module.mk | 24 |
25 files changed, 37 insertions, 36 deletions
diff --git a/sound/audiocd.cpp b/sound/audiocd.cpp index 836f92b33d..bd2d4d46f0 100644 --- a/sound/audiocd.cpp +++ b/sound/audiocd.cpp @@ -25,9 +25,9 @@ #include "sound/audiocd.h" #include "sound/audiostream.h" -#include "sound/mp3.h" -#include "sound/vorbis.h" -#include "sound/flac.h" +#include "sound/decoders/mp3.h" +#include "sound/decoders/vorbis.h" +#include "sound/decoders/flac.h" #include "engines/engine.h" #include "common/util.h" #include "common/system.h" diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp index 20f4d4d14e..e781149a55 100644 --- a/sound/audiostream.cpp +++ b/sound/audiostream.cpp @@ -30,11 +30,11 @@ #include "common/util.h" #include "sound/audiostream.h" -#include "sound/flac.h" +#include "sound/decoders/flac.h" #include "sound/mixer.h" -#include "sound/mp3.h" -#include "sound/raw.h" -#include "sound/vorbis.h" +#include "sound/decoders/mp3.h" +#include "sound/decoders/raw.h" +#include "sound/decoders/vorbis.h" namespace Audio { diff --git a/sound/adpcm.cpp b/sound/decoders/adpcm.cpp index ef8bb50c98..898780350b 100644 --- a/sound/adpcm.cpp +++ b/sound/decoders/adpcm.cpp @@ -25,7 +25,7 @@ #include "common/endian.h" -#include "sound/adpcm.h" +#include "sound/decoders/adpcm.h" #include "sound/audiostream.h" diff --git a/sound/adpcm.h b/sound/decoders/adpcm.h index 46ccb582c3..46ccb582c3 100644 --- a/sound/adpcm.h +++ b/sound/decoders/adpcm.h diff --git a/sound/aiff.cpp b/sound/decoders/aiff.cpp index 6f0e943ac3..e474e999d0 100644 --- a/sound/aiff.cpp +++ b/sound/decoders/aiff.cpp @@ -35,10 +35,10 @@ #include "common/util.h" #include "common/stream.h" -#include "sound/aiff.h" +#include "sound/decoders/aiff.h" #include "sound/audiostream.h" #include "sound/mixer.h" -#include "sound/raw.h" +#include "sound/decoders/raw.h" namespace Audio { diff --git a/sound/aiff.h b/sound/decoders/aiff.h index e8a3b6f0b0..e8a3b6f0b0 100644 --- a/sound/aiff.h +++ b/sound/decoders/aiff.h diff --git a/sound/flac.cpp b/sound/decoders/flac.cpp index eb195e0c7b..29302827da 100644 --- a/sound/flac.cpp +++ b/sound/decoders/flac.cpp @@ -23,7 +23,7 @@ * */ -#include "sound/flac.h" +#include "sound/decoders/flac.h" #ifdef USE_FLAC diff --git a/sound/flac.h b/sound/decoders/flac.h index e35b608253..e35b608253 100644 --- a/sound/flac.h +++ b/sound/decoders/flac.h diff --git a/sound/iff_sound.cpp b/sound/decoders/iff_sound.cpp index 9a254cd593..f394b55ef0 100644 --- a/sound/iff_sound.cpp +++ b/sound/decoders/iff_sound.cpp @@ -23,10 +23,10 @@ * */ -#include "sound/iff_sound.h" +#include "sound/decoders/iff_sound.h" #include "sound/audiostream.h" #include "sound/mixer.h" -#include "sound/raw.h" +#include "sound/decoders/raw.h" #include "common/iff_container.h" #include "common/func.h" diff --git a/sound/iff_sound.h b/sound/decoders/iff_sound.h index 4e53059380..4e53059380 100644 --- a/sound/iff_sound.h +++ b/sound/decoders/iff_sound.h diff --git a/sound/mp3.cpp b/sound/decoders/mp3.cpp index 26f0e6d320..378f77dac0 100644 --- a/sound/mp3.cpp +++ b/sound/decoders/mp3.cpp @@ -23,7 +23,7 @@ * */ -#include "sound/mp3.h" +#include "sound/decoders/mp3.h" #ifdef USE_MAD diff --git a/sound/mp3.h b/sound/decoders/mp3.h index 3175df5e92..3175df5e92 100644 --- a/sound/mp3.h +++ b/sound/decoders/mp3.h diff --git a/sound/raw.cpp b/sound/decoders/raw.cpp index 46346f1577..6747111a1a 100644 --- a/sound/raw.cpp +++ b/sound/decoders/raw.cpp @@ -28,7 +28,7 @@ #include "sound/audiostream.h" #include "sound/mixer.h" -#include "sound/raw.h" +#include "sound/decoders/raw.h" namespace Audio { diff --git a/sound/raw.h b/sound/decoders/raw.h index 16ab4ec350..16ab4ec350 100644 --- a/sound/raw.h +++ b/sound/decoders/raw.h diff --git a/sound/shorten.cpp b/sound/decoders/shorten.cpp index c3893ebc0a..fc97f71b56 100644 --- a/sound/shorten.cpp +++ b/sound/decoders/shorten.cpp @@ -23,7 +23,7 @@ * */ -#include "sound/shorten.h" +#include "sound/decoders/shorten.h" #ifdef SOUND_SHORTEN_H @@ -38,7 +38,7 @@ #include "sound/audiostream.h" #include "sound/mixer.h" -#include "sound/raw.h" +#include "sound/decoders/raw.h" namespace Audio { diff --git a/sound/shorten.h b/sound/decoders/shorten.h index bc9f229687..bc9f229687 100644 --- a/sound/shorten.h +++ b/sound/decoders/shorten.h diff --git a/sound/vag.cpp b/sound/decoders/vag.cpp index c4ff55efa2..f2c9281d80 100644 --- a/sound/vag.cpp +++ b/sound/decoders/vag.cpp @@ -23,7 +23,7 @@ * */ -#include "sound/vag.h" +#include "sound/decoders/vag.h" namespace Audio { diff --git a/sound/vag.h b/sound/decoders/vag.h index bd3b174729..d659a7db4e 100644 --- a/sound/vag.h +++ b/sound/decoders/vag.h @@ -28,6 +28,7 @@ * Sound decoder used in engines: * - sword1 (PSX port of the game) * - sword2 (PSX port of the game) + * - tinsel (PSX port of the game) */ #ifndef SOUND_VAG_H diff --git a/sound/voc.cpp b/sound/decoders/voc.cpp index 295498230a..65dd1a3998 100644 --- a/sound/voc.cpp +++ b/sound/decoders/voc.cpp @@ -30,8 +30,8 @@ #include "sound/audiostream.h" #include "sound/mixer.h" -#include "sound/raw.h" -#include "sound/voc.h" +#include "sound/decoders/raw.h" +#include "sound/decoders/voc.h" namespace Audio { diff --git a/sound/voc.h b/sound/decoders/voc.h index 191f42db02..191f42db02 100644 --- a/sound/voc.h +++ b/sound/decoders/voc.h diff --git a/sound/vorbis.cpp b/sound/decoders/vorbis.cpp index 4ce2f2c3f7..46a94a6214 100644 --- a/sound/vorbis.cpp +++ b/sound/decoders/vorbis.cpp @@ -23,7 +23,7 @@ * */ -#include "sound/vorbis.h" +#include "sound/decoders/vorbis.h" #ifdef USE_VORBIS diff --git a/sound/vorbis.h b/sound/decoders/vorbis.h index dd0a89bfdd..dd0a89bfdd 100644 --- a/sound/vorbis.h +++ b/sound/decoders/vorbis.h diff --git a/sound/wave.cpp b/sound/decoders/wave.cpp index 45974cf69c..c0865ad30f 100644 --- a/sound/wave.cpp +++ b/sound/decoders/wave.cpp @@ -29,9 +29,9 @@ #include "sound/audiostream.h" #include "sound/mixer.h" -#include "sound/wave.h" -#include "sound/adpcm.h" -#include "sound/raw.h" +#include "sound/decoders/wave.h" +#include "sound/decoders/adpcm.h" +#include "sound/decoders/raw.h" namespace Audio { diff --git a/sound/wave.h b/sound/decoders/wave.h index f0e3bb249b..f0e3bb249b 100644 --- a/sound/wave.h +++ b/sound/decoders/wave.h diff --git a/sound/module.mk b/sound/module.mk index e21f242974..1506d46c80 100644 --- a/sound/module.mk +++ b/sound/module.mk @@ -1,29 +1,29 @@ MODULE := sound MODULE_OBJS := \ - adpcm.o \ - aiff.o \ audiocd.o \ audiostream.o \ - iff_sound.o \ - flac.o \ fmopl.o \ mididrv.o \ - midiparser.o \ midiparser_smf.o \ midiparser_xmidi.o \ + midiparser.o \ mixer.o \ - mp3.o \ mpu401.o \ musicplugin.o \ null.o \ - raw.o \ - shorten.o \ timestamp.o \ - vag.o \ - voc.o \ - vorbis.o \ - wave.o \ + decoders/adpcm.o \ + decoders/aiff.o \ + decoders/flac.o \ + decoders/iff_sound.o \ + decoders/mp3.o \ + decoders/raw.o \ + decoders/shorten.o \ + decoders/vag.o \ + decoders/voc.o \ + decoders/vorbis.o \ + decoders/wave.o \ mods/infogrames.o \ mods/maxtrax.o \ mods/module.o \ |