[Scummvm-cvs-logs] SF.net SVN: scummvm:[55850] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed Feb 9 02:09:04 CET 2011
Revision: 55850
http://scummvm.svn.sourceforge.net/scummvm/?rev=55850&view=rev
Author: fingolfin
Date: 2011-02-09 01:09:01 +0000 (Wed, 09 Feb 2011)
Log Message:
-----------
AUDIO: Rename sound/ dir to audio/
Modified Paths:
--------------
scummvm/trunk/Makefile.common
scummvm/trunk/audio/audiostream.cpp
scummvm/trunk/audio/audiostream.h
scummvm/trunk/audio/decoders/adpcm.cpp
scummvm/trunk/audio/decoders/aiff.cpp
scummvm/trunk/audio/decoders/flac.cpp
scummvm/trunk/audio/decoders/iff_sound.cpp
scummvm/trunk/audio/decoders/mac_snd.cpp
scummvm/trunk/audio/decoders/mp3.cpp
scummvm/trunk/audio/decoders/raw.cpp
scummvm/trunk/audio/decoders/vag.cpp
scummvm/trunk/audio/decoders/voc.cpp
scummvm/trunk/audio/decoders/vorbis.cpp
scummvm/trunk/audio/decoders/wave.cpp
scummvm/trunk/audio/fmopl.cpp
scummvm/trunk/audio/mididrv.cpp
scummvm/trunk/audio/midiparser.cpp
scummvm/trunk/audio/midiparser_smf.cpp
scummvm/trunk/audio/midiparser_xmidi.cpp
scummvm/trunk/audio/mixer.cpp
scummvm/trunk/audio/mixer.h
scummvm/trunk/audio/mixer_intern.h
scummvm/trunk/audio/mods/infogrames.cpp
scummvm/trunk/audio/mods/infogrames.h
scummvm/trunk/audio/mods/maxtrax.cpp
scummvm/trunk/audio/mods/maxtrax.h
scummvm/trunk/audio/mods/module.cpp
scummvm/trunk/audio/mods/paula.cpp
scummvm/trunk/audio/mods/paula.h
scummvm/trunk/audio/mods/protracker.cpp
scummvm/trunk/audio/mods/rjp1.cpp
scummvm/trunk/audio/mods/soundfx.cpp
scummvm/trunk/audio/mods/tfmx.cpp
scummvm/trunk/audio/mods/tfmx.h
scummvm/trunk/audio/module.mk
scummvm/trunk/audio/mpu401.cpp
scummvm/trunk/audio/mpu401.h
scummvm/trunk/audio/musicplugin.cpp
scummvm/trunk/audio/musicplugin.h
scummvm/trunk/audio/null.cpp
scummvm/trunk/audio/null.h
scummvm/trunk/audio/rate.cpp
scummvm/trunk/audio/rate_arm.cpp
scummvm/trunk/audio/softsynth/adlib.cpp
scummvm/trunk/audio/softsynth/appleiigs.cpp
scummvm/trunk/audio/softsynth/cms.cpp
scummvm/trunk/audio/softsynth/emumidi.h
scummvm/trunk/audio/softsynth/fluidsynth.cpp
scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_audio.cpp
scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_audio.h
scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_euphony.cpp
scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_euphony.h
scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp
scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_pc98_driver.h
scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h
scummvm/trunk/audio/softsynth/mt32/freeverb.cpp
scummvm/trunk/audio/softsynth/mt32/module.mk
scummvm/trunk/audio/softsynth/mt32.cpp
scummvm/trunk/audio/softsynth/opl/dosbox.h
scummvm/trunk/audio/softsynth/opl/mame.h
scummvm/trunk/audio/softsynth/pcspk.cpp
scummvm/trunk/audio/softsynth/pcspk.h
scummvm/trunk/audio/softsynth/sid.cpp
scummvm/trunk/audio/softsynth/ym2612.cpp
scummvm/trunk/audio/softsynth/ym2612.h
scummvm/trunk/audio/timestamp.cpp
scummvm/trunk/backends/audiocd/default/default-audiocd.cpp
scummvm/trunk/backends/audiocd/default/default-audiocd.h
scummvm/trunk/backends/midi/alsa.cpp
scummvm/trunk/backends/midi/camd.cpp
scummvm/trunk/backends/midi/coreaudio.cpp
scummvm/trunk/backends/midi/coremidi.cpp
scummvm/trunk/backends/midi/dmedia.cpp
scummvm/trunk/backends/midi/seq.cpp
scummvm/trunk/backends/midi/stmidi.cpp
scummvm/trunk/backends/midi/timidity.cpp
scummvm/trunk/backends/midi/windows.cpp
scummvm/trunk/backends/mixer/sdl/sdl-mixer.h
scummvm/trunk/backends/platform/android/android.cpp
scummvm/trunk/backends/platform/dc/audio.cpp
scummvm/trunk/backends/platform/dc/dc.h
scummvm/trunk/backends/platform/dc/dcmain.cpp
scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h
scummvm/trunk/backends/platform/gph/gph-main.cpp
scummvm/trunk/backends/platform/iphone/osys_main.cpp
scummvm/trunk/backends/platform/iphone/osys_main.h
scummvm/trunk/backends/platform/n64/osys_n64.h
scummvm/trunk/backends/platform/null/null.cpp
scummvm/trunk/backends/platform/openpandora/op-main.cpp
scummvm/trunk/backends/platform/ps2/systemps2.cpp
scummvm/trunk/backends/platform/psp/mp3.cpp
scummvm/trunk/backends/platform/psp/osys_psp.cpp
scummvm/trunk/backends/platform/psp/osys_psp.h
scummvm/trunk/backends/platform/wii/osystem.h
scummvm/trunk/backends/platform/wince/wince-sdl.cpp
scummvm/trunk/backends/plugins/elf/memory-manager.cpp
scummvm/trunk/base/main.cpp
scummvm/trunk/base/plugins.cpp
scummvm/trunk/engines/agi/agi.cpp
scummvm/trunk/engines/agi/preagi.cpp
scummvm/trunk/engines/agi/preagi.h
scummvm/trunk/engines/agi/sound.h
scummvm/trunk/engines/agi/sound_2gs.h
scummvm/trunk/engines/agi/sound_coco3.h
scummvm/trunk/engines/agi/sound_midi.cpp
scummvm/trunk/engines/agi/sound_midi.h
scummvm/trunk/engines/agi/sound_pcjr.h
scummvm/trunk/engines/agi/sound_sarien.cpp
scummvm/trunk/engines/agi/sound_sarien.h
scummvm/trunk/engines/agos/agos.cpp
scummvm/trunk/engines/agos/animation.cpp
scummvm/trunk/engines/agos/animation.h
scummvm/trunk/engines/agos/midi.h
scummvm/trunk/engines/agos/midiparser_s1d.cpp
scummvm/trunk/engines/agos/res_snd.cpp
scummvm/trunk/engines/agos/sound.cpp
scummvm/trunk/engines/agos/sound.h
scummvm/trunk/engines/cine/sound.cpp
scummvm/trunk/engines/cine/sound.h
scummvm/trunk/engines/cruise/sound.cpp
scummvm/trunk/engines/cruise/sound.h
scummvm/trunk/engines/draci/music.cpp
scummvm/trunk/engines/draci/music.h
scummvm/trunk/engines/draci/sound.cpp
scummvm/trunk/engines/draci/sound.h
scummvm/trunk/engines/drascula/drascula.cpp
scummvm/trunk/engines/drascula/drascula.h
scummvm/trunk/engines/drascula/sound.cpp
scummvm/trunk/engines/engine.cpp
scummvm/trunk/engines/gob/gob.cpp
scummvm/trunk/engines/gob/inter_v2.cpp
scummvm/trunk/engines/gob/sound/adlib.h
scummvm/trunk/engines/gob/sound/bgatmosphere.h
scummvm/trunk/engines/gob/sound/infogrames.h
scummvm/trunk/engines/gob/sound/pcspeaker.h
scummvm/trunk/engines/gob/sound/protracker.cpp
scummvm/trunk/engines/gob/sound/protracker.h
scummvm/trunk/engines/gob/sound/soundblaster.h
scummvm/trunk/engines/gob/sound/sounddesc.cpp
scummvm/trunk/engines/gob/sound/soundmixer.cpp
scummvm/trunk/engines/gob/sound/soundmixer.h
scummvm/trunk/engines/groovie/groovie.cpp
scummvm/trunk/engines/groovie/music.cpp
scummvm/trunk/engines/groovie/music.h
scummvm/trunk/engines/groovie/player.h
scummvm/trunk/engines/groovie/roq.cpp
scummvm/trunk/engines/groovie/vdx.cpp
scummvm/trunk/engines/hugo/sound.cpp
scummvm/trunk/engines/hugo/sound.h
scummvm/trunk/engines/kyra/kyra_v1.cpp
scummvm/trunk/engines/kyra/kyra_v1.h
scummvm/trunk/engines/kyra/lol.cpp
scummvm/trunk/engines/kyra/sound.cpp
scummvm/trunk/engines/kyra/sound.h
scummvm/trunk/engines/kyra/sound_adlib.cpp
scummvm/trunk/engines/kyra/sound_amiga.cpp
scummvm/trunk/engines/kyra/sound_digital.cpp
scummvm/trunk/engines/kyra/sound_intern.h
scummvm/trunk/engines/kyra/sound_lol.cpp
scummvm/trunk/engines/kyra/sound_pcspk.cpp
scummvm/trunk/engines/kyra/sound_towns.cpp
scummvm/trunk/engines/kyra/vqa.cpp
scummvm/trunk/engines/kyra/vqa.h
scummvm/trunk/engines/lastexpress/data/snd.cpp
scummvm/trunk/engines/lastexpress/data/snd.h
scummvm/trunk/engines/lure/lure.h
scummvm/trunk/engines/lure/sound.cpp
scummvm/trunk/engines/lure/sound.h
scummvm/trunk/engines/m4/m4.cpp
scummvm/trunk/engines/m4/m4.h
scummvm/trunk/engines/m4/midi.h
scummvm/trunk/engines/m4/sound.cpp
scummvm/trunk/engines/m4/sound.h
scummvm/trunk/engines/made/made.cpp
scummvm/trunk/engines/made/made.h
scummvm/trunk/engines/made/music.cpp
scummvm/trunk/engines/made/music.h
scummvm/trunk/engines/made/pmvplayer.cpp
scummvm/trunk/engines/made/pmvplayer.h
scummvm/trunk/engines/made/resource.cpp
scummvm/trunk/engines/made/resource.h
scummvm/trunk/engines/made/scriptfuncs.cpp
scummvm/trunk/engines/mohawk/cstime.h
scummvm/trunk/engines/mohawk/livingbooks.h
scummvm/trunk/engines/mohawk/mohawk.cpp
scummvm/trunk/engines/mohawk/sound.cpp
scummvm/trunk/engines/mohawk/sound.h
scummvm/trunk/engines/parallaction/sound.h
scummvm/trunk/engines/parallaction/sound_br.cpp
scummvm/trunk/engines/parallaction/sound_ns.cpp
scummvm/trunk/engines/queen/midiadlib.cpp
scummvm/trunk/engines/queen/music.cpp
scummvm/trunk/engines/queen/music.h
scummvm/trunk/engines/queen/sound.cpp
scummvm/trunk/engines/queen/sound.h
scummvm/trunk/engines/saga/introproc_saga2.cpp
scummvm/trunk/engines/saga/music.cpp
scummvm/trunk/engines/saga/music.h
scummvm/trunk/engines/saga/saga.cpp
scummvm/trunk/engines/saga/saga.h
scummvm/trunk/engines/saga/shorten.cpp
scummvm/trunk/engines/saga/shorten.h
scummvm/trunk/engines/saga/sndres.cpp
scummvm/trunk/engines/saga/sound.cpp
scummvm/trunk/engines/saga/sound.h
scummvm/trunk/engines/sci/engine/ksound.cpp
scummvm/trunk/engines/sci/sound/audio.cpp
scummvm/trunk/engines/sci/sound/audio.h
scummvm/trunk/engines/sci/sound/drivers/adlib.cpp
scummvm/trunk/engines/sci/sound/drivers/amigamac.cpp
scummvm/trunk/engines/sci/sound/drivers/cms.cpp
scummvm/trunk/engines/sci/sound/drivers/midi.cpp
scummvm/trunk/engines/sci/sound/drivers/mididriver.h
scummvm/trunk/engines/sci/sound/drivers/pcjr.cpp
scummvm/trunk/engines/sci/sound/midiparser_sci.h
scummvm/trunk/engines/sci/sound/music.cpp
scummvm/trunk/engines/sci/sound/music.h
scummvm/trunk/engines/sci/sound/soundcmd.h
scummvm/trunk/engines/sci/video/robot_decoder.cpp
scummvm/trunk/engines/sci/video/robot_decoder.h
scummvm/trunk/engines/scumm/dialogs.cpp
scummvm/trunk/engines/scumm/he/animation_he.cpp
scummvm/trunk/engines/scumm/he/animation_he.h
scummvm/trunk/engines/scumm/he/cup_player_he.cpp
scummvm/trunk/engines/scumm/he/resource_he.cpp
scummvm/trunk/engines/scumm/he/sound_he.cpp
scummvm/trunk/engines/scumm/imuse/imuse_internal.h
scummvm/trunk/engines/scumm/imuse/imuse_player.cpp
scummvm/trunk/engines/scumm/imuse/instrument.cpp
scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp
scummvm/trunk/engines/scumm/imuse_digi/dimuse.h
scummvm/trunk/engines/scumm/imuse_digi/dimuse_script.cpp
scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.h
scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp
scummvm/trunk/engines/scumm/midiparser_ro.cpp
scummvm/trunk/engines/scumm/player_mod.cpp
scummvm/trunk/engines/scumm/player_mod.h
scummvm/trunk/engines/scumm/player_nes.cpp
scummvm/trunk/engines/scumm/player_nes.h
scummvm/trunk/engines/scumm/player_pce.h
scummvm/trunk/engines/scumm/player_sid.cpp
scummvm/trunk/engines/scumm/player_sid.h
scummvm/trunk/engines/scumm/player_towns.h
scummvm/trunk/engines/scumm/player_v2base.h
scummvm/trunk/engines/scumm/player_v2cms.cpp
scummvm/trunk/engines/scumm/player_v4a.h
scummvm/trunk/engines/scumm/saveload.cpp
scummvm/trunk/engines/scumm/script_v8.cpp
scummvm/trunk/engines/scumm/scumm.cpp
scummvm/trunk/engines/scumm/scumm.h
scummvm/trunk/engines/scumm/smush/smush_mixer.cpp
scummvm/trunk/engines/scumm/smush/smush_player.cpp
scummvm/trunk/engines/scumm/sound.cpp
scummvm/trunk/engines/scumm/sound.h
scummvm/trunk/engines/sky/intro.cpp
scummvm/trunk/engines/sky/intro.h
scummvm/trunk/engines/sky/music/adlibchannel.h
scummvm/trunk/engines/sky/music/adlibmusic.cpp
scummvm/trunk/engines/sky/music/adlibmusic.h
scummvm/trunk/engines/sky/music/gmchannel.cpp
scummvm/trunk/engines/sky/music/gmmusic.cpp
scummvm/trunk/engines/sky/music/mt32music.cpp
scummvm/trunk/engines/sky/sky.cpp
scummvm/trunk/engines/sky/sound.cpp
scummvm/trunk/engines/sky/sound.h
scummvm/trunk/engines/sword1/animation.cpp
scummvm/trunk/engines/sword1/animation.h
scummvm/trunk/engines/sword1/logic.h
scummvm/trunk/engines/sword1/music.cpp
scummvm/trunk/engines/sword1/music.h
scummvm/trunk/engines/sword1/sound.cpp
scummvm/trunk/engines/sword1/sound.h
scummvm/trunk/engines/sword2/animation.h
scummvm/trunk/engines/sword2/music.cpp
scummvm/trunk/engines/sword2/sound.cpp
scummvm/trunk/engines/sword2/sound.h
scummvm/trunk/engines/sword25/fmv/theora_decoder.cpp
scummvm/trunk/engines/sword25/fmv/theora_decoder.h
scummvm/trunk/engines/sword25/sfx/soundengine.cpp
scummvm/trunk/engines/sword25/sfx/soundengine.h
scummvm/trunk/engines/teenagent/music.h
scummvm/trunk/engines/teenagent/teenagent.cpp
scummvm/trunk/engines/teenagent/teenagent.h
scummvm/trunk/engines/testbed/midi.cpp
scummvm/trunk/engines/testbed/midi.h
scummvm/trunk/engines/testbed/sound.cpp
scummvm/trunk/engines/testbed/sound.h
scummvm/trunk/engines/tinsel/bmv.cpp
scummvm/trunk/engines/tinsel/bmv.h
scummvm/trunk/engines/tinsel/config.cpp
scummvm/trunk/engines/tinsel/music.cpp
scummvm/trunk/engines/tinsel/music.h
scummvm/trunk/engines/tinsel/sound.cpp
scummvm/trunk/engines/tinsel/sound.h
scummvm/trunk/engines/tinsel/tinsel.h
scummvm/trunk/engines/toon/audio.h
scummvm/trunk/engines/touche/midi.cpp
scummvm/trunk/engines/touche/midi.h
scummvm/trunk/engines/touche/resource.cpp
scummvm/trunk/engines/touche/touche.cpp
scummvm/trunk/engines/touche/touche.h
scummvm/trunk/engines/tucker/resource.cpp
scummvm/trunk/engines/tucker/sequences.cpp
scummvm/trunk/engines/tucker/tucker.h
scummvm/trunk/gui/launcher.cpp
scummvm/trunk/gui/options.cpp
scummvm/trunk/gui/options.h
scummvm/trunk/po/POTFILES
scummvm/trunk/po/ca_ES.po
scummvm/trunk/po/cs_CZ.po
scummvm/trunk/po/da_DA.po
scummvm/trunk/po/de_DE.po
scummvm/trunk/po/es_ES.po
scummvm/trunk/po/fr_FR.po
scummvm/trunk/po/hu_HU.po
scummvm/trunk/po/it_IT.po
scummvm/trunk/po/nb_NO.po
scummvm/trunk/po/nn_NO.po
scummvm/trunk/po/pl_PL.po
scummvm/trunk/po/pt_BR.po
scummvm/trunk/po/ru_RU.po
scummvm/trunk/po/scummvm.pot
scummvm/trunk/po/uk_UA.po
scummvm/trunk/test/audio/audiostream.h
scummvm/trunk/test/audio/helper.h
scummvm/trunk/test/audio/raw.h
scummvm/trunk/test/audio/timestamp.h
scummvm/trunk/test/module.mk
scummvm/trunk/video/avi_decoder.cpp
scummvm/trunk/video/avi_decoder.h
scummvm/trunk/video/codecs/qdm2.cpp
scummvm/trunk/video/coktel_decoder.cpp
scummvm/trunk/video/coktel_decoder.h
scummvm/trunk/video/qt_decoder.cpp
scummvm/trunk/video/qt_decoder.h
scummvm/trunk/video/smk_decoder.cpp
scummvm/trunk/video/smk_decoder.h
scummvm/trunk/video/video_decoder.h
Added Paths:
-----------
scummvm/trunk/audio/
scummvm/trunk/test/audio/
Removed Paths:
-------------
scummvm/trunk/sound/
scummvm/trunk/test/sound/
Modified: scummvm/trunk/Makefile.common
===================================================================
--- scummvm/trunk/Makefile.common 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/Makefile.common 2011-02-09 01:09:01 UTC (rev 55850)
@@ -27,12 +27,12 @@
engines \
video \
graphics \
- sound \
+ audio \
common \
po
ifdef USE_MT32EMU
-MODULES += sound/softsynth/mt32
+MODULES += audio/softsynth/mt32
endif
######################################################################
Modified: scummvm/trunk/audio/audiostream.cpp
===================================================================
--- scummvm/trunk/sound/audiostream.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/audiostream.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -29,12 +29,12 @@
#include "common/queue.h"
#include "common/util.h"
-#include "sound/audiostream.h"
-#include "sound/decoders/flac.h"
-#include "sound/mixer.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/vorbis.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/flac.h"
+#include "audio/mixer.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/vorbis.h"
namespace Audio {
Modified: scummvm/trunk/audio/audiostream.h
===================================================================
--- scummvm/trunk/sound/audiostream.h 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/audiostream.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -30,7 +30,7 @@
#include "common/scummsys.h"
#include "common/types.h"
-#include "sound/timestamp.h"
+#include "audio/timestamp.h"
namespace Audio {
Modified: scummvm/trunk/audio/decoders/adpcm.cpp
===================================================================
--- scummvm/trunk/sound/decoders/adpcm.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/decoders/adpcm.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -25,8 +25,8 @@
#include "common/endian.h"
-#include "sound/decoders/adpcm.h"
-#include "sound/audiostream.h"
+#include "audio/decoders/adpcm.h"
+#include "audio/audiostream.h"
namespace Audio {
Modified: scummvm/trunk/audio/decoders/aiff.cpp
===================================================================
--- scummvm/trunk/sound/decoders/aiff.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/decoders/aiff.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -35,10 +35,10 @@
#include "common/util.h"
#include "common/stream.h"
-#include "sound/decoders/aiff.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/decoders/aiff.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
namespace Audio {
Modified: scummvm/trunk/audio/decoders/flac.cpp
===================================================================
--- scummvm/trunk/sound/decoders/flac.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/decoders/flac.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,7 +26,7 @@
// Disable symbol overrides for FILE as that is used in FLAC headers
#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
-#include "sound/decoders/flac.h"
+#include "audio/decoders/flac.h"
#ifdef USE_FLAC
@@ -34,7 +34,7 @@
#include "common/stream.h"
#include "common/util.h"
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
#define FLAC__NO_DLL // that MS-magic gave me headaches - just link the library you like
#include <FLAC/export.h>
Modified: scummvm/trunk/audio/decoders/iff_sound.cpp
===================================================================
--- scummvm/trunk/sound/decoders/iff_sound.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/decoders/iff_sound.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -23,10 +23,10 @@
*
*/
-#include "sound/decoders/iff_sound.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/decoders/iff_sound.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
#include "common/iff_container.h"
#include "common/func.h"
Modified: scummvm/trunk/audio/decoders/mac_snd.cpp
===================================================================
--- scummvm/trunk/sound/decoders/mac_snd.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/decoders/mac_snd.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -33,9 +33,9 @@
#include "common/util.h"
#include "common/stream.h"
-#include "sound/decoders/mac_snd.h"
-#include "sound/audiostream.h"
-#include "sound/decoders/raw.h"
+#include "audio/decoders/mac_snd.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/raw.h"
namespace Audio {
Modified: scummvm/trunk/audio/decoders/mp3.cpp
===================================================================
--- scummvm/trunk/sound/decoders/mp3.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/decoders/mp3.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -23,7 +23,7 @@
*
*/
-#include "sound/decoders/mp3.h"
+#include "audio/decoders/mp3.h"
#ifdef USE_MAD
@@ -31,7 +31,7 @@
#include "common/stream.h"
#include "common/util.h"
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
#include <mad.h>
Modified: scummvm/trunk/audio/decoders/raw.cpp
===================================================================
--- scummvm/trunk/sound/decoders/raw.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/decoders/raw.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,9 +26,9 @@
#include "common/endian.h"
#include "common/memstream.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
namespace Audio {
Modified: scummvm/trunk/audio/decoders/vag.cpp
===================================================================
--- scummvm/trunk/sound/decoders/vag.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/decoders/vag.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -23,8 +23,8 @@
*
*/
-#include "sound/decoders/vag.h"
-#include "sound/audiostream.h"
+#include "audio/decoders/vag.h"
+#include "audio/audiostream.h"
#include "common/stream.h"
namespace Audio {
Modified: scummvm/trunk/audio/decoders/voc.cpp
===================================================================
--- scummvm/trunk/sound/decoders/voc.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/decoders/voc.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -28,10 +28,10 @@
#include "common/util.h"
#include "common/stream.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/voc.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/voc.h"
namespace Audio {
Modified: scummvm/trunk/audio/decoders/vorbis.cpp
===================================================================
--- scummvm/trunk/sound/decoders/vorbis.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/decoders/vorbis.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -28,7 +28,7 @@
#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
#define FORBIDDEN_SYMBOL_EXCEPTION_fseek
-#include "sound/decoders/vorbis.h"
+#include "audio/decoders/vorbis.h"
#ifdef USE_VORBIS
@@ -36,7 +36,7 @@
#include "common/stream.h"
#include "common/util.h"
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
#ifdef USE_TREMOR
#if defined(__GP32__) // custom libtremor locations
Modified: scummvm/trunk/audio/decoders/wave.cpp
===================================================================
--- scummvm/trunk/sound/decoders/wave.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/decoders/wave.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -27,11 +27,11 @@
#include "common/util.h"
#include "common/stream.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/wave.h"
-#include "sound/decoders/adpcm.h"
-#include "sound/decoders/raw.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/wave.h"
+#include "audio/decoders/adpcm.h"
+#include "audio/decoders/raw.h"
namespace Audio {
Modified: scummvm/trunk/audio/fmopl.cpp
===================================================================
--- scummvm/trunk/sound/fmopl.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/fmopl.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -22,10 +22,10 @@
* $Id$
*/
-#include "sound/fmopl.h"
+#include "audio/fmopl.h"
-#include "sound/softsynth/opl/dosbox.h"
-#include "sound/softsynth/opl/mame.h"
+#include "audio/softsynth/opl/dosbox.h"
+#include "audio/softsynth/opl/mame.h"
#include "common/config-manager.h"
#include "common/translation.h"
Modified: scummvm/trunk/audio/mididrv.cpp
===================================================================
--- scummvm/trunk/sound/mididrv.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/mididrv.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -28,8 +28,8 @@
#include "common/str.h"
#include "common/system.h"
#include "common/util.h"
-#include "sound/mididrv.h"
-#include "sound/musicplugin.h"
+#include "audio/mididrv.h"
+#include "audio/musicplugin.h"
#include "common/translation.h"
const byte MidiDriver::_mt32ToGm[128] = {
Modified: scummvm/trunk/audio/midiparser.cpp
===================================================================
--- scummvm/trunk/sound/midiparser.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/midiparser.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -23,8 +23,8 @@
*
*/
-#include "sound/midiparser.h"
-#include "sound/mididrv.h"
+#include "audio/midiparser.h"
+#include "audio/mididrv.h"
#include "common/util.h"
//////////////////////////////////////////////////
Modified: scummvm/trunk/audio/midiparser_smf.cpp
===================================================================
--- scummvm/trunk/sound/midiparser_smf.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/midiparser_smf.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -23,8 +23,8 @@
*
*/
-#include "sound/midiparser.h"
-#include "sound/mididrv.h"
+#include "audio/midiparser.h"
+#include "audio/mididrv.h"
#include "common/util.h"
/**
Modified: scummvm/trunk/audio/midiparser_xmidi.cpp
===================================================================
--- scummvm/trunk/sound/midiparser_xmidi.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/midiparser_xmidi.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -23,8 +23,8 @@
*
*/
-#include "sound/midiparser.h"
-#include "sound/mididrv.h"
+#include "audio/midiparser.h"
+#include "audio/mididrv.h"
#include "common/util.h"
/**
Modified: scummvm/trunk/audio/mixer.cpp
===================================================================
--- scummvm/trunk/sound/mixer.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/mixer.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,10 +26,10 @@
#include "common/util.h"
#include "common/system.h"
-#include "sound/mixer_intern.h"
-#include "sound/rate.h"
-#include "sound/audiostream.h"
-#include "sound/timestamp.h"
+#include "audio/mixer_intern.h"
+#include "audio/rate.h"
+#include "audio/audiostream.h"
+#include "audio/timestamp.h"
namespace Audio {
Modified: scummvm/trunk/audio/mixer.h
===================================================================
--- scummvm/trunk/sound/mixer.h 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/mixer.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -30,7 +30,7 @@
#include "common/mutex.h"
#include "common/noncopyable.h"
-#include "sound/timestamp.h"
+#include "audio/timestamp.h"
class OSystem;
Modified: scummvm/trunk/audio/mixer_intern.h
===================================================================
--- scummvm/trunk/sound/mixer_intern.h 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/mixer_intern.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -28,7 +28,7 @@
#include "common/scummsys.h"
#include "common/mutex.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
namespace Audio {
Modified: scummvm/trunk/audio/mods/infogrames.cpp
===================================================================
--- scummvm/trunk/sound/mods/infogrames.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/mods/infogrames.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -23,7 +23,7 @@
*
*/
-#include "sound/mods/infogrames.h"
+#include "audio/mods/infogrames.h"
#include "common/endian.h"
#include "common/file.h"
#include "common/memstream.h"
Modified: scummvm/trunk/audio/mods/infogrames.h
===================================================================
--- scummvm/trunk/sound/mods/infogrames.h 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/mods/infogrames.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -32,7 +32,7 @@
#ifndef SOUND_MODS_INFOGRAMES_H
#define SOUND_MODS_INFOGRAMES_H
-#include "sound/mods/paula.h"
+#include "audio/mods/paula.h"
#include "common/stream.h"
namespace Audio {
Modified: scummvm/trunk/audio/mods/maxtrax.cpp
===================================================================
--- scummvm/trunk/sound/mods/maxtrax.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/mods/maxtrax.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -29,7 +29,7 @@
#include "common/util.h"
#include "common/debug.h"
-#include "sound/mods/maxtrax.h"
+#include "audio/mods/maxtrax.h"
// test for engines using this class.
#if defined(SOUND_MODS_MAXTRAX_H)
Modified: scummvm/trunk/audio/mods/maxtrax.h
===================================================================
--- scummvm/trunk/sound/mods/maxtrax.h 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/mods/maxtrax.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -33,7 +33,7 @@
// #define MAXTRAX_HAS_MODULATION
// #define MAXTRAX_HAS_MICROTONAL
-#include "sound/mods/paula.h"
+#include "audio/mods/paula.h"
namespace Audio {
Modified: scummvm/trunk/audio/mods/module.cpp
===================================================================
--- scummvm/trunk/sound/mods/module.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/mods/module.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -23,7 +23,7 @@
*
*/
-#include "sound/mods/module.h"
+#include "audio/mods/module.h"
#include "common/util.h"
#include "common/endian.h"
Modified: scummvm/trunk/audio/mods/paula.cpp
===================================================================
--- scummvm/trunk/sound/mods/paula.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/mods/paula.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -23,8 +23,8 @@
*
*/
-#include "sound/mods/paula.h"
-#include "sound/null.h"
+#include "audio/mods/paula.h"
+#include "audio/null.h"
namespace Audio {
Modified: scummvm/trunk/audio/mods/paula.h
===================================================================
--- scummvm/trunk/sound/mods/paula.h 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/mods/paula.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,7 +26,7 @@
#ifndef SOUND_MODS_PAULA_H
#define SOUND_MODS_PAULA_H
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
#include "common/frac.h"
#include "common/mutex.h"
Modified: scummvm/trunk/audio/mods/protracker.cpp
===================================================================
--- scummvm/trunk/sound/mods/protracker.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/mods/protracker.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -23,11 +23,11 @@
*
*/
-#include "sound/mods/protracker.h"
-#include "sound/mods/paula.h"
-#include "sound/mods/module.h"
+#include "audio/mods/protracker.h"
+#include "audio/mods/paula.h"
+#include "audio/mods/module.h"
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
namespace Modules {
Modified: scummvm/trunk/audio/mods/rjp1.cpp
===================================================================
--- scummvm/trunk/sound/mods/rjp1.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/mods/rjp1.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,9 +26,9 @@
#include "common/debug.h"
#include "common/endian.h"
-#include "sound/mods/paula.h"
-#include "sound/mods/rjp1.h"
-#include "sound/audiostream.h"
+#include "audio/mods/paula.h"
+#include "audio/mods/rjp1.h"
+#include "audio/audiostream.h"
namespace Audio {
Modified: scummvm/trunk/audio/mods/soundfx.cpp
===================================================================
--- scummvm/trunk/sound/mods/soundfx.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/mods/soundfx.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -25,9 +25,9 @@
#include "common/endian.h"
-#include "sound/mods/paula.h"
-#include "sound/mods/soundfx.h"
-#include "sound/audiostream.h"
+#include "audio/mods/paula.h"
+#include "audio/mods/soundfx.h"
+#include "audio/audiostream.h"
namespace Audio {
Modified: scummvm/trunk/audio/mods/tfmx.cpp
===================================================================
--- scummvm/trunk/sound/mods/tfmx.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/mods/tfmx.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -29,7 +29,7 @@
#include "common/util.h"
#include "common/debug.h"
-#include "sound/mods/tfmx.h"
+#include "audio/mods/tfmx.h"
// test for engines using this class.
#if defined(SOUND_MODS_TFMX_H)
Modified: scummvm/trunk/audio/mods/tfmx.h
===================================================================
--- scummvm/trunk/sound/mods/tfmx.h 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/mods/tfmx.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -30,7 +30,7 @@
#elif !defined(SOUND_MODS_TFMX_H)
#define SOUND_MODS_TFMX_H
-#include "sound/mods/paula.h"
+#include "audio/mods/paula.h"
namespace Audio {
Modified: scummvm/trunk/audio/module.mk
===================================================================
--- scummvm/trunk/sound/module.mk 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/module.mk 2011-02-09 01:09:01 UTC (rev 55850)
@@ -1,4 +1,4 @@
-MODULE := sound
+MODULE := audio
MODULE_OBJS := \
audiostream.o \
Modified: scummvm/trunk/audio/mpu401.cpp
===================================================================
--- scummvm/trunk/sound/mpu401.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/mpu401.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -22,7 +22,7 @@
* $Id$
*/
-#include "sound/mpu401.h"
+#include "audio/mpu401.h"
#include "common/system.h"
#include "common/timer.h"
#include "common/util.h" // for ARRAYSIZE
Modified: scummvm/trunk/audio/mpu401.h
===================================================================
--- scummvm/trunk/sound/mpu401.h 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/mpu401.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,7 +26,7 @@
#ifndef SOUND_MPU401_H
#define SOUND_MPU401_H
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
////////////////////////////////////////
//
Modified: scummvm/trunk/audio/musicplugin.cpp
===================================================================
--- scummvm/trunk/sound/musicplugin.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/musicplugin.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -23,7 +23,7 @@
*
*/
-#include "sound/musicplugin.h"
+#include "audio/musicplugin.h"
#include "common/hash-str.h"
#include "common/translation.h"
Modified: scummvm/trunk/audio/musicplugin.h
===================================================================
--- scummvm/trunk/sound/musicplugin.h 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/musicplugin.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,7 +26,7 @@
#define SOUND_MUSICPLUGIN_H
#include "base/plugins.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
#include "common/list.h"
class MusicPluginObject;
Modified: scummvm/trunk/audio/null.cpp
===================================================================
--- scummvm/trunk/sound/null.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/null.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -22,7 +22,7 @@
* $Id$
*/
-#include "sound/null.h"
+#include "audio/null.h"
Common::Error NullMusicPlugin::createInstance(MidiDriver **mididriver, MidiDriver::DeviceHandle) const {
*mididriver = new MidiDriver_NULL();
Modified: scummvm/trunk/audio/null.h
===================================================================
--- scummvm/trunk/sound/null.h 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/null.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -25,8 +25,8 @@
#ifndef SOUND_NULL_H
#define SOUND_NULL_H
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
#include "common/translation.h"
/* NULL driver */
Modified: scummvm/trunk/audio/rate.cpp
===================================================================
--- scummvm/trunk/sound/rate.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/rate.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -31,9 +31,9 @@
* improvements over the original code were made.
*/
-#include "sound/audiostream.h"
-#include "sound/rate.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/rate.h"
+#include "audio/mixer.h"
#include "common/frac.h"
#include "common/util.h"
Modified: scummvm/trunk/audio/rate_arm.cpp
===================================================================
--- scummvm/trunk/sound/rate_arm.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/rate_arm.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -44,9 +44,9 @@
* other improvments over the original code were made.
*/
-#include "sound/audiostream.h"
-#include "sound/rate.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/rate.h"
+#include "audio/mixer.h"
#include "common/util.h"
//#define DEBUG_RATECONV
Modified: scummvm/trunk/audio/softsynth/adlib.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/adlib.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/adlib.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -22,11 +22,11 @@
* $Id$
*/
-#include "sound/softsynth/emumidi.h"
+#include "audio/softsynth/emumidi.h"
#include "common/debug.h"
#include "common/util.h"
-#include "sound/fmopl.h"
-#include "sound/musicplugin.h"
+#include "audio/fmopl.h"
+#include "audio/musicplugin.h"
#include "common/translation.h"
#ifdef DEBUG_ADLIB
Modified: scummvm/trunk/audio/softsynth/appleiigs.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/appleiigs.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/appleiigs.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -23,7 +23,7 @@
*
*/
-#include "sound/null.h"
+#include "audio/null.h"
// Plugin interface
// (This can only create a null driver since apple II gs support seeems not to be implemented
Modified: scummvm/trunk/audio/softsynth/cms.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/cms.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/cms.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -22,8 +22,8 @@
* $Id$
*/
-#include "sound/softsynth/cms.h"
-#include "sound/null.h"
+#include "audio/softsynth/cms.h"
+#include "audio/null.h"
#include "common/textconsole.h"
#include "common/translation.h"
Modified: scummvm/trunk/audio/softsynth/emumidi.h
===================================================================
--- scummvm/trunk/sound/softsynth/emumidi.h 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/emumidi.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -25,9 +25,9 @@
#ifndef SOUND_SOFTSYNTH_EMUMIDI_H
#define SOUND_SOFTSYNTH_EMUMIDI_H
-#include "sound/audiostream.h"
-#include "sound/mididrv.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mididrv.h"
+#include "audio/mixer.h"
#define FIXP_SHIFT 16
Modified: scummvm/trunk/audio/softsynth/fluidsynth.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/fluidsynth.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/fluidsynth.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -27,9 +27,9 @@
#ifdef USE_FLUIDSYNTH
#include "common/config-manager.h"
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
-#include "sound/softsynth/emumidi.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
+#include "audio/softsynth/emumidi.h"
#include <fluidsynth.h>
Modified: scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_audio.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_audio.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_audio.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -23,7 +23,7 @@
*
*/
-#include "sound/softsynth/fmtowns_pc98/towns_audio.h"
+#include "audio/softsynth/fmtowns_pc98/towns_audio.h"
#include "common/endian.h"
#include "backends/audiocd/audiocd.h"
Modified: scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_audio.h
===================================================================
--- scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_audio.h 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_audio.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,7 +26,7 @@
#ifndef TOWNS_AUDIO_H
#define TOWNS_AUDIO_H
-#include "sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h"
+#include "audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h"
class TownsAudioInterfacePluginDriver {
public:
Modified: scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_euphony.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_euphony.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_euphony.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -23,7 +23,7 @@
*
*/
-#include "sound/softsynth/fmtowns_pc98/towns_euphony.h"
+#include "audio/softsynth/fmtowns_pc98/towns_euphony.h"
#include "common/endian.h"
TownsEuphonyDriver::TownsEuphonyDriver(Audio::Mixer *mixer) : _activeChannels(0), _sustainChannels(0),
Modified: scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_euphony.h
===================================================================
--- scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_euphony.h 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_euphony.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,7 +26,7 @@
#ifndef TOWNS_EUP_H
#define TOWNS_EUP_H
-#include "sound/softsynth/fmtowns_pc98/towns_audio.h"
+#include "audio/softsynth/fmtowns_pc98/towns_audio.h"
class TownsEuphonyDriver : public TownsAudioInterfacePluginDriver {
public:
Modified: scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -23,7 +23,7 @@
*
*/
-#include "sound/softsynth/fmtowns_pc98/towns_pc98_driver.h"
+#include "audio/softsynth/fmtowns_pc98/towns_pc98_driver.h"
#include "common/endian.h"
class TownsPC98_MusicChannel {
Modified: scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_pc98_driver.h
===================================================================
--- scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_pc98_driver.h 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_pc98_driver.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,7 +26,7 @@
#ifndef TOWNS_PC98_AUDIODRIVER_H
#define TOWNS_PC98_AUDIODRIVER_H
-#include "sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h"
+#include "audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h"
class TownsPC98_MusicChannel;
class TownsPC98_MusicChannelSSG;
Modified: scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -23,7 +23,7 @@
*
*/
-#include "sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h"
+#include "audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h"
#include "common/endian.h"
class TownsPC98_FmSynthOperator {
Modified: scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h
===================================================================
--- scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,8 +26,8 @@
#ifndef TOWNS_PC98_FMSYNTH_H
#define TOWNS_PC98_FMSYNTH_H
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
#include "common/list.h"
#ifdef __DS__
Modified: scummvm/trunk/audio/softsynth/mt32/freeverb.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/mt32/freeverb.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/mt32/freeverb.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -29,7 +29,7 @@
// http://www.dreampoint.co.uk
// This code is public domain
-#include "sound/softsynth/mt32/freeverb.h"
+#include "audio/softsynth/mt32/freeverb.h"
comb::comb() {
filterstore = 0;
Modified: scummvm/trunk/audio/softsynth/mt32/module.mk
===================================================================
--- scummvm/trunk/sound/softsynth/mt32/module.mk 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/mt32/module.mk 2011-02-09 01:09:01 UTC (rev 55850)
@@ -1,4 +1,4 @@
-MODULE := sound/softsynth/mt32
+MODULE := audio/softsynth/mt32
MODULE_OBJS := \
mt32_file.o \
Modified: scummvm/trunk/audio/softsynth/mt32.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/mt32.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/mt32.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,11 +26,11 @@
#ifdef USE_MT32EMU
-#include "sound/softsynth/mt32/mt32emu.h"
+#include "audio/softsynth/mt32/mt32emu.h"
-#include "sound/softsynth/emumidi.h"
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
+#include "audio/softsynth/emumidi.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
#include "common/config-manager.h"
#include "common/debug.h"
Modified: scummvm/trunk/audio/softsynth/opl/dosbox.h
===================================================================
--- scummvm/trunk/sound/softsynth/opl/dosbox.h 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/opl/dosbox.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -34,7 +34,7 @@
#ifndef DISABLE_DOSBOX_OPL
-#include "sound/fmopl.h"
+#include "audio/fmopl.h"
namespace OPL {
namespace DOSBox {
Modified: scummvm/trunk/audio/softsynth/opl/mame.h
===================================================================
--- scummvm/trunk/sound/softsynth/opl/mame.h 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/opl/mame.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -33,7 +33,7 @@
#include "common/util.h"
#include "common/random.h"
-#include "sound/fmopl.h"
+#include "audio/fmopl.h"
namespace OPL {
namespace MAME {
Modified: scummvm/trunk/audio/softsynth/pcspk.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/pcspk.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/pcspk.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -23,8 +23,8 @@
*
*/
-#include "sound/softsynth/pcspk.h"
-#include "sound/null.h"
+#include "audio/softsynth/pcspk.h"
+#include "audio/null.h"
namespace Audio {
Modified: scummvm/trunk/audio/softsynth/pcspk.h
===================================================================
--- scummvm/trunk/sound/softsynth/pcspk.h 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/pcspk.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -25,8 +25,8 @@
#ifndef SOUND_SOFTSYNTH_PCSPK_H
#define SOUND_SOFTSYNTH_PCSPK_H
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
#include "common/mutex.h"
namespace Audio {
Modified: scummvm/trunk/audio/softsynth/sid.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/sid.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/sid.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -31,7 +31,7 @@
#ifndef DISABLE_SID
#include "sid.h"
-#include "sound/null.h"
+#include "audio/null.h"
#include <math.h>
namespace Resid {
Modified: scummvm/trunk/audio/softsynth/ym2612.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/ym2612.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/ym2612.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -24,9 +24,9 @@
#include <math.h>
-#include "sound/softsynth/ym2612.h"
+#include "audio/softsynth/ym2612.h"
#include "common/util.h"
-#include "sound/musicplugin.h"
+#include "audio/musicplugin.h"
#include "common/translation.h"
////////////////////////////////////////
Modified: scummvm/trunk/audio/softsynth/ym2612.h
===================================================================
--- scummvm/trunk/sound/softsynth/ym2612.h 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/softsynth/ym2612.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -27,7 +27,7 @@
#include "common/scummsys.h"
-#include "sound/softsynth/emumidi.h"
+#include "audio/softsynth/emumidi.h"
////////////////////////////////////////
//
Modified: scummvm/trunk/audio/timestamp.cpp
===================================================================
--- scummvm/trunk/sound/timestamp.cpp 2011-02-09 00:14:24 UTC (rev 55845)
+++ scummvm/trunk/audio/timestamp.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -23,7 +23,7 @@
*
*/
-#include "sound/timestamp.h"
+#include "audio/timestamp.h"
#include "common/algorithm.h"
namespace Audio {
Modified: scummvm/trunk/backends/audiocd/default/default-audiocd.cpp
===================================================================
--- scummvm/trunk/backends/audiocd/default/default-audiocd.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/audiocd/default/default-audiocd.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -24,7 +24,7 @@
*/
#include "backends/audiocd/default/default-audiocd.h"
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
#include "common/system.h"
DefaultAudioCDManager::DefaultAudioCDManager() {
Modified: scummvm/trunk/backends/audiocd/default/default-audiocd.h
===================================================================
--- scummvm/trunk/backends/audiocd/default/default-audiocd.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/audiocd/default/default-audiocd.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -27,7 +27,7 @@
#define BACKENDS_AUDIOCD_DEFAULT_H
#include "backends/audiocd/audiocd.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
/**
* The default audio cd manager. Implements emulation of audio cd playback.
Modified: scummvm/trunk/backends/midi/alsa.cpp
===================================================================
--- scummvm/trunk/backends/midi/alsa.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/midi/alsa.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -31,8 +31,8 @@
#include "common/config-manager.h"
#include "common/util.h"
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
#include <alsa/asoundlib.h>
Modified: scummvm/trunk/backends/midi/camd.cpp
===================================================================
--- scummvm/trunk/backends/midi/camd.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/midi/camd.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -31,8 +31,8 @@
#include "common/endian.h"
#include "common/util.h"
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
#include <proto/camd.h>
#include <proto/exec.h>
Modified: scummvm/trunk/backends/midi/coreaudio.cpp
===================================================================
--- scummvm/trunk/backends/midi/coreaudio.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/midi/coreaudio.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -42,8 +42,8 @@
#include "common/config-manager.h"
#include "common/util.h"
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
#include <CoreServices/CoreServices.h>
#include <AudioToolbox/AUGraph.h>
Modified: scummvm/trunk/backends/midi/coremidi.cpp
===================================================================
--- scummvm/trunk/backends/midi/coremidi.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/midi/coremidi.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -31,8 +31,8 @@
#include "common/config-manager.h"
#include "common/util.h"
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
#include <CoreMIDI/CoreMIDI.h>
Modified: scummvm/trunk/backends/midi/dmedia.cpp
===================================================================
--- scummvm/trunk/backends/midi/dmedia.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/midi/dmedia.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -37,8 +37,8 @@
#include "common/scummsys.h"
#include "common/util.h"
#include "common/config-manager.h"
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
#include <dmedia/midi.h>
#include <sys/types.h>
Modified: scummvm/trunk/backends/midi/seq.cpp
===================================================================
--- scummvm/trunk/backends/midi/seq.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/midi/seq.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -36,8 +36,8 @@
#if defined(USE_SEQ_MIDI)
#include "common/util.h"
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
#include <fcntl.h>
#include <unistd.h>
Modified: scummvm/trunk/backends/midi/stmidi.cpp
===================================================================
--- scummvm/trunk/backends/midi/stmidi.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/midi/stmidi.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -42,9 +42,9 @@
#if defined __MINT__
#include <osbind.h>
-#include "sound/mpu401.h"
+#include "audio/mpu401.h"
#include "common/util.h"
-#include "sound/musicplugin.h"
+#include "audio/musicplugin.h"
class MidiDriver_STMIDI : public MidiDriver_MPU401 {
public:
Modified: scummvm/trunk/backends/midi/timidity.cpp
===================================================================
--- scummvm/trunk/backends/midi/timidity.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/midi/timidity.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -44,8 +44,8 @@
#include "common/util.h"
#include "common/endian.h"
#include "common/str.h"
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
#include <fcntl.h>
#include <unistd.h>
Modified: scummvm/trunk/backends/midi/windows.cpp
===================================================================
--- scummvm/trunk/backends/midi/windows.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/midi/windows.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -34,8 +34,8 @@
// winnt.h defines ARRAYSIZE, but we want our own one...
#undef ARRAYSIZE
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
#include "common/config-manager.h"
#include "common/translation.h"
Modified: scummvm/trunk/backends/mixer/sdl/sdl-mixer.h
===================================================================
--- scummvm/trunk/backends/mixer/sdl/sdl-mixer.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/mixer/sdl/sdl-mixer.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -27,7 +27,7 @@
#define BACKENDS_MIXER_SDL_H
#include "backends/platform/sdl/sdl-sys.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
/**
* SDL mixer manager. It wraps the actual implementation
Modified: scummvm/trunk/backends/platform/android/android.cpp
===================================================================
--- scummvm/trunk/backends/platform/android/android.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/platform/android/android.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -56,7 +56,7 @@
#include "backends/saves/default/default-saves.h"
#include "backends/timer/default/default-timer.h"
#include "backends/plugins/posix/posix-provider.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
#include "backends/platform/android/asset-archive.h"
Modified: scummvm/trunk/backends/platform/dc/audio.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/audio.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/platform/dc/audio.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -25,7 +25,7 @@
#include <common/scummsys.h>
#include "engines/engine.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
#include "dc.h"
EXTERN_C void *memcpy4s(void *s1, const void *s2, unsigned int n);
Modified: scummvm/trunk/backends/platform/dc/dc.h
===================================================================
--- scummvm/trunk/backends/platform/dc/dc.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/platform/dc/dc.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -30,7 +30,7 @@
#include "backends/timer/default/default-timer.h"
#include "backends/audiocd/default/default-audiocd.h"
#include "backends/fs/fs-factory.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
#define NUM_BUFFERS 4
#define SOUND_BUFFER_SHIFT 3
Modified: scummvm/trunk/backends/platform/dc/dcmain.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/dcmain.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/platform/dc/dcmain.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -34,7 +34,7 @@
#include <common/memstream.h>
#include "backends/plugins/dc/dc-provider.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
Icon icon;
Modified: scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -33,7 +33,7 @@
#include "gbampsave.h"
#include "backends/saves/default/default-saves.h"
#include "backends/timer/default/default-timer.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
#include "graphics/surface.h"
#include "graphics/colormasks.h"
Modified: scummvm/trunk/backends/platform/gph/gph-main.cpp
===================================================================
--- scummvm/trunk/backends/platform/gph/gph-main.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/platform/gph/gph-main.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -43,7 +43,7 @@
#include "backends/saves/default/default-saves.h"
#include "backends/timer/default/default-timer.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
#include <stdio.h>
#include <stdlib.h>
Modified: scummvm/trunk/backends/platform/iphone/osys_main.cpp
===================================================================
--- scummvm/trunk/backends/platform/iphone/osys_main.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/platform/iphone/osys_main.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -41,8 +41,8 @@
#include "backends/saves/default/default-saves.h"
#include "backends/timer/default/default-timer.h"
-#include "sound/mixer.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer.h"
+#include "audio/mixer_intern.h"
#include "osys_main.h"
Modified: scummvm/trunk/backends/platform/iphone/osys_main.h
===================================================================
--- scummvm/trunk/backends/platform/iphone/osys_main.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/platform/iphone/osys_main.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -27,7 +27,7 @@
#include "iphone_common.h"
#include "backends/base-backend.h"
#include "common/events.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
#include "backends/fs/posix/posix-fs-factory.h"
#include "graphics/colormasks.h"
Modified: scummvm/trunk/backends/platform/n64/osys_n64.h
===================================================================
--- scummvm/trunk/backends/platform/n64/osys_n64.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/platform/n64/osys_n64.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -39,7 +39,7 @@
#include "graphics/colormasks.h"
#include "graphics/pixelformat.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
#include <libn64.h>
#include <n64utils.h>
Modified: scummvm/trunk/backends/platform/null/null.cpp
===================================================================
--- scummvm/trunk/backends/platform/null/null.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/platform/null/null.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -29,7 +29,7 @@
#if defined(USE_NULL_DRIVER)
#include "backends/saves/default/default-saves.h"
#include "backends/timer/default/default-timer.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
#include "common/scummsys.h"
/*
Modified: scummvm/trunk/backends/platform/openpandora/op-main.cpp
===================================================================
--- scummvm/trunk/backends/platform/openpandora/op-main.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/platform/openpandora/op-main.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -44,7 +44,7 @@
#include "backends/saves/default/default-saves.h"
#include "backends/timer/default/default-timer.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
#include <stdio.h>
#include <stdlib.h>
Modified: scummvm/trunk/backends/platform/ps2/systemps2.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/systemps2.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/platform/ps2/systemps2.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -57,7 +57,7 @@
#include "graphics/surface.h"
#include "graphics/font.h"
#include "backends/timer/default/default-timer.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
#include "common/events.h"
#include "backends/platform/ps2/ps2debug.h"
#include "backends/fs/ps2/ps2-fs-factory.h"
Modified: scummvm/trunk/backends/platform/psp/mp3.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/mp3.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/platform/psp/mp3.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -30,7 +30,7 @@
#include "common/singleton.h"
#include "common/mutex.h"
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
#include <pspaudiocodec.h>
#include <psputility_modules.h>
Modified: scummvm/trunk/backends/platform/psp/osys_psp.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/platform/psp/osys_psp.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -42,7 +42,7 @@
#include "backends/saves/psp/psp-saves.h"
#include "backends/timer/default/default-timer.h"
#include "graphics/surface.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
//#define __PSP_DEBUG_FUNCS__ /* For debugging function calls */
//#define __PSP_DEBUG_PRINT__ /* For debug printouts */
Modified: scummvm/trunk/backends/platform/psp/osys_psp.h
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/platform/psp/osys_psp.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -29,7 +29,7 @@
#include "common/scummsys.h"
#include "graphics/surface.h"
#include "graphics/colormasks.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
#include "backends/base-backend.h"
#include "backends/fs/psp/psp-fs-factory.h"
Modified: scummvm/trunk/backends/platform/wii/osystem.h
===================================================================
--- scummvm/trunk/backends/platform/wii/osystem.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/platform/wii/osystem.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -37,7 +37,7 @@
#include "backends/timer/default/default-timer.h"
#include "graphics/colormasks.h"
#include "graphics/surface.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
#ifdef __cplusplus
extern "C" {
Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -40,8 +40,8 @@
#include "base/main.h"
#include "base/plugins.h"
-#include "sound/mixer_intern.h"
-#include "sound/fmopl.h"
+#include "audio/mixer_intern.h"
+#include "audio/fmopl.h"
#include "backends/timer/default/default-timer.h"
Modified: scummvm/trunk/backends/plugins/elf/memory-manager.cpp
===================================================================
--- scummvm/trunk/backends/plugins/elf/memory-manager.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/backends/plugins/elf/memory-manager.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -28,7 +28,7 @@
#if defined(DYNAMIC_MODULES) && defined(USE_ELF_LOADER)
#include "backends/plugins/elf/memory-manager.h"
-#include "common/util.h"
+#include "common/util.h"
#include <malloc.h>
DECLARE_SINGLETON(ELFMemoryManager);
Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/base/main.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -54,8 +54,8 @@
#include "gui/message.h"
#include "gui/error.h"
-#include "sound/mididrv.h"
-#include "sound/musicplugin.h" /* for music manager */
+#include "audio/mididrv.h"
+#include "audio/musicplugin.h" /* for music manager */
#include "backends/keymapper/keymapper.h"
Modified: scummvm/trunk/base/plugins.cpp
===================================================================
--- scummvm/trunk/base/plugins.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/base/plugins.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -622,7 +622,7 @@
// Music plugins
-#include "sound/musicplugin.h"
+#include "audio/musicplugin.h"
DECLARE_SINGLETON(MusicManager);
Modified: scummvm/trunk/engines/agi/agi.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/agi/agi.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -40,8 +40,8 @@
#include "graphics/cursorman.h"
-#include "sound/mididrv.h"
-#include "sound/mixer.h"
+#include "audio/mididrv.h"
+#include "audio/mixer.h"
#include "agi/agi.h"
#include "agi/graphics.h"
Modified: scummvm/trunk/engines/agi/preagi.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/agi/preagi.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -27,7 +27,7 @@
#include "common/debug-channels.h"
#include "common/random.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
#include "agi/preagi.h"
#include "agi/graphics.h"
Modified: scummvm/trunk/engines/agi/preagi.h
===================================================================
--- scummvm/trunk/engines/agi/preagi.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/agi/preagi.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -29,7 +29,7 @@
#include "agi/agi.h"
#include "agi/preagi_common.h"
-#include "sound/softsynth/pcspk.h"
+#include "audio/softsynth/pcspk.h"
namespace Agi {
Modified: scummvm/trunk/engines/agi/sound.h
===================================================================
--- scummvm/trunk/engines/agi/sound.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/agi/sound.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,7 +26,7 @@
#ifndef AGI_SOUND_H
#define AGI_SOUND_H
-#include "sound/mixer.h"
+#include "audio/mixer.h"
namespace Agi {
Modified: scummvm/trunk/engines/agi/sound_2gs.h
===================================================================
--- scummvm/trunk/engines/agi/sound_2gs.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/agi/sound_2gs.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -27,7 +27,7 @@
#define AGI_SOUND_2GS_H
#include "common/frac.h"
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
namespace Agi {
Modified: scummvm/trunk/engines/agi/sound_coco3.h
===================================================================
--- scummvm/trunk/engines/agi/sound_coco3.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/agi/sound_coco3.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,7 +26,7 @@
#ifndef AGI_SOUND_COCO3_H
#define AGI_SOUND_COCO3_H
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
namespace Agi {
Modified: scummvm/trunk/engines/agi/sound_midi.cpp
===================================================================
--- scummvm/trunk/engines/agi/sound_midi.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/agi/sound_midi.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -42,9 +42,9 @@
// MIDI and digital music class
-#include "sound/audiostream.h"
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
+#include "audio/audiostream.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
#include "common/config-manager.h"
#include "common/file.h"
#include "common/memstream.h"
Modified: scummvm/trunk/engines/agi/sound_midi.h
===================================================================
--- scummvm/trunk/engines/agi/sound_midi.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/agi/sound_midi.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -28,8 +28,8 @@
#ifndef AGI_SOUND_MIDI_H
#define AGI_SOUND_MIDI_H
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
#include "common/mutex.h"
namespace Agi {
Modified: scummvm/trunk/engines/agi/sound_pcjr.h
===================================================================
--- scummvm/trunk/engines/agi/sound_pcjr.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/agi/sound_pcjr.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,7 +26,7 @@
#ifndef AGI_SOUND_PCJR_H
#define AGI_SOUND_PCJR_H
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
namespace Agi {
Modified: scummvm/trunk/engines/agi/sound_sarien.cpp
===================================================================
--- scummvm/trunk/engines/agi/sound_sarien.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/agi/sound_sarien.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -29,7 +29,7 @@
#include "common/random.h"
#include "common/str-array.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
#include "agi/agi.h"
Modified: scummvm/trunk/engines/agi/sound_sarien.h
===================================================================
--- scummvm/trunk/engines/agi/sound_sarien.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/agi/sound_sarien.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,7 +26,7 @@
#ifndef AGI_SOUND_SARIEN_H
#define AGI_SOUND_SARIEN_H
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
namespace Agi {
Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/agos/agos.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -41,8 +41,8 @@
#include "graphics/surface.h"
-#include "sound/mididrv.h"
-#include "sound/mods/protracker.h"
+#include "audio/mididrv.h"
+#include "audio/mods/protracker.h"
namespace AGOS {
Modified: scummvm/trunk/engines/agos/animation.cpp
===================================================================
--- scummvm/trunk/engines/agos/animation.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/agos/animation.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -39,8 +39,8 @@
#include "agos/intern.h"
#include "agos/agos.h"
-#include "sound/audiostream.h"
-#include "sound/decoders/wave.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/wave.h"
#include "gui/message.h"
Modified: scummvm/trunk/engines/agos/animation.h
===================================================================
--- scummvm/trunk/engines/agos/animation.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/agos/animation.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -30,7 +30,7 @@
#include "video/dxa_decoder.h"
#include "video/smk_decoder.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
namespace AGOS {
Modified: scummvm/trunk/engines/agos/midi.h
===================================================================
--- scummvm/trunk/engines/agos/midi.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/agos/midi.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,8 +26,8 @@
#ifndef AGOS_MIDI_H
#define AGOS_MIDI_H
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
#include "common/mutex.h"
namespace Common {
Modified: scummvm/trunk/engines/agos/midiparser_s1d.cpp
===================================================================
--- scummvm/trunk/engines/agos/midiparser_s1d.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/agos/midiparser_s1d.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,8 +26,8 @@
#include "common/debug.h"
#include "common/util.h"
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
namespace AGOS {
Modified: scummvm/trunk/engines/agos/res_snd.cpp
===================================================================
--- scummvm/trunk/engines/agos/res_snd.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/agos/res_snd.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -33,9 +33,9 @@
#include "backends/audiocd/audiocd.h"
-#include "sound/audiostream.h"
-#include "sound/mididrv.h"
-#include "sound/mods/protracker.h"
+#include "audio/audiostream.h"
+#include "audio/mididrv.h"
+#include "audio/mods/protracker.h"
namespace AGOS {
Modified: scummvm/trunk/engines/agos/sound.cpp
===================================================================
--- scummvm/trunk/engines/agos/sound.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/agos/sound.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -30,14 +30,14 @@
#include "agos/agos.h"
#include "agos/sound.h"
-#include "sound/audiostream.h"
-#include "sound/decoders/flac.h"
-#include "sound/mixer.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/voc.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/wave.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/flac.h"
+#include "audio/mixer.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/voc.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/wave.h"
namespace AGOS {
Modified: scummvm/trunk/engines/agos/sound.h
===================================================================
--- scummvm/trunk/engines/agos/sound.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/agos/sound.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,8 +26,8 @@
#ifndef AGOS_SOUND_H
#define AGOS_SOUND_H
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
#include "agos/intern.h"
#include "common/str.h"
Modified: scummvm/trunk/engines/cine/sound.cpp
===================================================================
--- scummvm/trunk/engines/cine/sound.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/cine/sound.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -30,10 +30,10 @@
#include "cine/cine.h"
#include "cine/sound.h"
-#include "sound/audiostream.h"
-#include "sound/fmopl.h"
-#include "sound/decoders/raw.h"
-#include "sound/mods/soundfx.h"
+#include "audio/audiostream.h"
+#include "audio/fmopl.h"
+#include "audio/decoders/raw.h"
+#include "audio/mods/soundfx.h"
namespace Cine {
Modified: scummvm/trunk/engines/cine/sound.h
===================================================================
--- scummvm/trunk/engines/cine/sound.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/cine/sound.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -27,7 +27,7 @@
#define CINE_SOUND_H_
#include "common/util.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
namespace Audio {
class AudioStream;
Modified: scummvm/trunk/engines/cruise/sound.cpp
===================================================================
--- scummvm/trunk/engines/cruise/sound.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/cruise/sound.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -30,9 +30,9 @@
#include "cruise/sound.h"
#include "cruise/volume.h"
-#include "sound/audiostream.h"
-#include "sound/fmopl.h"
-#include "sound/mods/soundfx.h"
+#include "audio/audiostream.h"
+#include "audio/fmopl.h"
+#include "audio/mods/soundfx.h"
namespace Cruise {
Modified: scummvm/trunk/engines/cruise/sound.h
===================================================================
--- scummvm/trunk/engines/cruise/sound.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/cruise/sound.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,9 +26,9 @@
#ifndef CRUISE_SOUND_H
#define CRUISE_SOUND_H
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
-#include "sound/mixer.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
+#include "audio/mixer.h"
#include "common/config-manager.h"
#include "common/serializer.h"
Modified: scummvm/trunk/engines/draci/music.cpp
===================================================================
--- scummvm/trunk/engines/draci/music.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/draci/music.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -25,9 +25,9 @@
// MIDI and digital music class
-#include "sound/audiostream.h"
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
+#include "audio/audiostream.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
#include "common/config-manager.h"
#include "common/file.h"
Modified: scummvm/trunk/engines/draci/music.h
===================================================================
--- scummvm/trunk/engines/draci/music.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/draci/music.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -28,8 +28,8 @@
#ifndef DRACI_MUSIC_H
#define DRACI_MUSIC_H
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
#include "common/mutex.h"
namespace Draci {
Modified: scummvm/trunk/engines/draci/sound.cpp
===================================================================
--- scummvm/trunk/engines/draci/sound.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/draci/sound.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -36,12 +36,12 @@
#include "draci/draci.h"
#include "draci/game.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/flac.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/flac.h"
namespace Draci {
Modified: scummvm/trunk/engines/draci/sound.h
===================================================================
--- scummvm/trunk/engines/draci/sound.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/draci/sound.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -29,7 +29,7 @@
#include "common/str.h"
#include "common/file.h"
#include "common/list.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
namespace Common {
class Archive;
Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/drascula/drascula.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -37,7 +37,7 @@
#include "engines/util.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
#include "drascula/drascula.h"
#include "drascula/console.h"
Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/drascula/drascula.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -38,7 +38,7 @@
#include "common/system.h"
#include "common/util.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
#include "engines/engine.h"
Modified: scummvm/trunk/engines/drascula/sound.cpp
===================================================================
--- scummvm/trunk/engines/drascula/sound.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/drascula/sound.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -23,10 +23,10 @@
*
*/
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/voc.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/voc.h"
#include "common/config-manager.h"
Modified: scummvm/trunk/engines/engine.cpp
===================================================================
--- scummvm/trunk/engines/engine.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/engine.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -48,7 +48,7 @@
#include "gui/message.h"
#include "gui/gui-manager.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
#include "graphics/cursorman.h"
Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/gob/gob.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -32,7 +32,7 @@
#include "base/plugins.h"
#include "common/config-manager.h"
#include "common/md5.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
#include "gui/gui-manager.h"
#include "gui/dialog.h"
Modified: scummvm/trunk/engines/gob/inter_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v2.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/gob/inter_v2.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -28,8 +28,8 @@
#include "gui/message.h"
-#include "sound/mixer.h"
-#include "sound/mods/infogrames.h"
+#include "audio/mixer.h"
+#include "audio/mods/infogrames.h"
#include "gob/gob.h"
#include "gob/inter.h"
Modified: scummvm/trunk/engines/gob/sound/adlib.h
===================================================================
--- scummvm/trunk/engines/gob/sound/adlib.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/gob/sound/adlib.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -27,9 +27,9 @@
#define GOB_SOUND_ADLIB_H
#include "common/mutex.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/fmopl.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/fmopl.h"
namespace Gob {
Modified: scummvm/trunk/engines/gob/sound/bgatmosphere.h
===================================================================
--- scummvm/trunk/engines/gob/sound/bgatmosphere.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/gob/sound/bgatmosphere.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,7 +26,7 @@
#ifndef GOB_SOUND_BGATMOSPHERE_H
#define GOB_SOUND_BGATMOSPHERE_H
-#include "sound/mixer.h"
+#include "audio/mixer.h"
#include "common/mutex.h"
#include "common/random.h"
Modified: scummvm/trunk/engines/gob/sound/infogrames.h
===================================================================
--- scummvm/trunk/engines/gob/sound/infogrames.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/gob/sound/infogrames.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,8 +26,8 @@
#ifndef GOB_SOUND_INFOGRAMES_H
#define GOB_SOUND_INFOGRAMES_H
-#include "sound/mixer.h"
-#include "sound/mods/infogrames.h"
+#include "audio/mixer.h"
+#include "audio/mods/infogrames.h"
namespace Gob {
Modified: scummvm/trunk/engines/gob/sound/pcspeaker.h
===================================================================
--- scummvm/trunk/engines/gob/sound/pcspeaker.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/gob/sound/pcspeaker.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,8 +26,8 @@
#ifndef GOB_SOUND_PCSPEAKER_H
#define GOB_SOUND_PCSPEAKER_H
-#include "sound/mixer.h"
-#include "sound/softsynth/pcspk.h"
+#include "audio/mixer.h"
+#include "audio/softsynth/pcspk.h"
namespace Gob {
Modified: scummvm/trunk/engines/gob/sound/protracker.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/protracker.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/gob/sound/protracker.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -25,7 +25,7 @@
#include "common/file.h"
-#include "sound/mods/protracker.h"
+#include "audio/mods/protracker.h"
#include "gob/sound/protracker.h"
Modified: scummvm/trunk/engines/gob/sound/protracker.h
===================================================================
--- scummvm/trunk/engines/gob/sound/protracker.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/gob/sound/protracker.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,8 +26,8 @@
#ifndef GOB_SOUND_PROTRACKER_H
#define GOB_SOUND_PROTRACKER_H
-#include "sound/mixer.h"
-#include "sound/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/audiostream.h"
namespace Gob {
Modified: scummvm/trunk/engines/gob/sound/soundblaster.h
===================================================================
--- scummvm/trunk/engines/gob/sound/soundblaster.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/gob/sound/soundblaster.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -27,7 +27,7 @@
#define GOB_SOUND_SOUNDBLASTER_H
#include "common/mutex.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
#include "gob/sound/soundmixer.h"
Modified: scummvm/trunk/engines/gob/sound/sounddesc.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/sounddesc.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/gob/sound/sounddesc.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -25,9 +25,9 @@
#include "common/util.h"
#include "common/memstream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/wave.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/wave.h"
#include "gob/sound/sounddesc.h"
#include "gob/resources.h"
Modified: scummvm/trunk/engines/gob/sound/soundmixer.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/soundmixer.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/gob/sound/soundmixer.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,7 +26,7 @@
#include "gob/sound/soundmixer.h"
#include "gob/sound/sounddesc.h"
-#include "sound/decoders/raw.h"
+#include "audio/decoders/raw.h"
namespace Gob {
Modified: scummvm/trunk/engines/gob/sound/soundmixer.h
===================================================================
--- scummvm/trunk/engines/gob/sound/soundmixer.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/gob/sound/soundmixer.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -28,8 +28,8 @@
#include "common/mutex.h"
#include "common/frac.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
namespace Gob {
Modified: scummvm/trunk/engines/groovie/groovie.cpp
===================================================================
--- scummvm/trunk/engines/groovie/groovie.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/groovie/groovie.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -40,7 +40,7 @@
#include "backends/audiocd/audiocd.h"
#include "engines/util.h"
#include "graphics/fontman.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
namespace Groovie {
Modified: scummvm/trunk/engines/groovie/music.cpp
===================================================================
--- scummvm/trunk/engines/groovie/music.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/groovie/music.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -31,7 +31,7 @@
#include "common/config-manager.h"
#include "common/macresman.h"
#include "common/memstream.h"
-#include "sound/midiparser.h"
+#include "audio/midiparser.h"
namespace Groovie {
Modified: scummvm/trunk/engines/groovie/music.h
===================================================================
--- scummvm/trunk/engines/groovie/music.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/groovie/music.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -28,7 +28,7 @@
#include "common/array.h"
#include "common/mutex.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
class MidiParser;
Modified: scummvm/trunk/engines/groovie/player.h
===================================================================
--- scummvm/trunk/engines/groovie/player.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/groovie/player.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -27,7 +27,7 @@
#define GROOVIE_PLAYER_H
#include "common/system.h"
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
namespace Groovie {
Modified: scummvm/trunk/engines/groovie/roq.cpp
===================================================================
--- scummvm/trunk/engines/groovie/roq.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/groovie/roq.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -36,8 +36,8 @@
// Required for the YUV to RGB conversion
#include "graphics/conversion.h"
#endif
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
namespace Groovie {
Modified: scummvm/trunk/engines/groovie/vdx.cpp
===================================================================
--- scummvm/trunk/engines/groovie/vdx.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/groovie/vdx.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -29,8 +29,8 @@
#include "groovie/lzss.h"
#include "common/debug-channels.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
#define TILE_SIZE 4 // Size of each tile on the image: only ever seen 4 so far
#define VDX_IDENT 0x9267 // 37479
Modified: scummvm/trunk/engines/hugo/sound.cpp
===================================================================
--- scummvm/trunk/engines/hugo/sound.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/hugo/sound.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -35,8 +35,8 @@
#include "common/system.h"
#include "common/config-manager.h"
-#include "sound/decoders/raw.h"
-#include "sound/audiostream.h"
+#include "audio/decoders/raw.h"
+#include "audio/audiostream.h"
#include "hugo/hugo.h"
#include "hugo/game.h"
Modified: scummvm/trunk/engines/hugo/sound.h
===================================================================
--- scummvm/trunk/engines/hugo/sound.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/hugo/sound.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -33,10 +33,10 @@
#ifndef HUGO_SOUND_H
#define HUGO_SOUND_H
-#include "sound/mixer.h"
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
-#include "sound/softsynth/pcspk.h"
+#include "audio/mixer.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
+#include "audio/softsynth/pcspk.h"
namespace Hugo {
Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -27,8 +27,8 @@
#include "common/debug-channels.h"
#include "common/EventRecorder.h"
-#include "sound/mididrv.h"
-#include "sound/mixer.h"
+#include "audio/mididrv.h"
+#include "audio/mixer.h"
#include "kyra/kyra_v1.h"
#include "kyra/sound_intern.h"
Modified: scummvm/trunk/engines/kyra/kyra_v1.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/kyra/kyra_v1.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -34,7 +34,7 @@
#include "common/hashmap.h"
#include "common/system.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
#include "kyra/script.h"
#include "kyra/item.h"
Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/kyra/lol.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -34,8 +34,8 @@
#include "kyra/util.h"
#include "kyra/debugger.h"
-#include "sound/decoders/voc.h"
-#include "sound/audiostream.h"
+#include "audio/decoders/voc.h"
+#include "audio/audiostream.h"
#include "common/config-manager.h"
#include "common/endian.h"
Modified: scummvm/trunk/engines/kyra/sound.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/kyra/sound.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -30,14 +30,14 @@
#include "kyra/resource.h"
#include "kyra/sound.h"
-#include "sound/mixer.h"
-#include "sound/decoders/voc.h"
-#include "sound/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/voc.h"
+#include "audio/audiostream.h"
-#include "sound/decoders/flac.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/vorbis.h"
+#include "audio/decoders/flac.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/vorbis.h"
namespace Kyra {
Modified: scummvm/trunk/engines/kyra/sound.h
===================================================================
--- scummvm/trunk/engines/kyra/sound.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/kyra/sound.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -31,7 +31,7 @@
#include "common/scummsys.h"
#include "common/str.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
namespace Audio {
class AudioStream;
Modified: scummvm/trunk/engines/kyra/sound_adlib.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_adlib.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/kyra/sound_adlib.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -45,9 +45,9 @@
#include "kyra/resource.h"
#include "kyra/sound_intern.h"
-#include "sound/mixer.h"
-#include "sound/fmopl.h"
-#include "sound/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/fmopl.h"
+#include "audio/audiostream.h"
// Basic AdLib Programming:
// http://www.gamedev.net/reference/articles/article446.asp
Modified: scummvm/trunk/engines/kyra/sound_amiga.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_amiga.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/kyra/sound_amiga.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -28,9 +28,9 @@
#include "kyra/resource.h"
#include "kyra/sound_intern.h"
-#include "sound/mixer.h"
-#include "sound/mods/maxtrax.h"
-#include "sound/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/mods/maxtrax.h"
+#include "audio/audiostream.h"
namespace Kyra {
Modified: scummvm/trunk/engines/kyra/sound_digital.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_digital.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/kyra/sound_digital.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -27,11 +27,11 @@
#include "kyra/resource.h"
#include "kyra/kyra_mr.h"
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/flac.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/flac.h"
namespace Kyra {
Modified: scummvm/trunk/engines/kyra/sound_intern.h
===================================================================
--- scummvm/trunk/engines/kyra/sound_intern.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/kyra/sound_intern.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -31,11 +31,11 @@
#include "common/mutex.h"
-#include "sound/softsynth/fmtowns_pc98/towns_pc98_driver.h"
-#include "sound/softsynth/fmtowns_pc98/towns_euphony.h"
+#include "audio/softsynth/fmtowns_pc98/towns_pc98_driver.h"
+#include "audio/softsynth/fmtowns_pc98/towns_euphony.h"
-#include "sound/softsynth/emumidi.h"
-#include "sound/midiparser.h"
+#include "audio/softsynth/emumidi.h"
+#include "audio/midiparser.h"
namespace Audio {
class PCSpeaker;
Modified: scummvm/trunk/engines/kyra/sound_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_lol.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/kyra/sound_lol.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -29,7 +29,7 @@
#include "kyra/lol.h"
#include "kyra/resource.h"
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
namespace Kyra {
Modified: scummvm/trunk/engines/kyra/sound_pcspk.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_pcspk.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/kyra/sound_pcspk.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -25,8 +25,8 @@
#include "kyra/sound_intern.h"
-#include "sound/mixer.h"
-#include "sound/softsynth/pcspk.h"
+#include "audio/mixer.h"
+#include "audio/softsynth/pcspk.h"
namespace Kyra {
Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -32,8 +32,8 @@
#include "backends/audiocd/audiocd.h"
-#include "sound/audiostream.h"
-#include "sound/decoders/raw.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/raw.h"
#include "common/util.h"
Modified: scummvm/trunk/engines/kyra/vqa.cpp
===================================================================
--- scummvm/trunk/engines/kyra/vqa.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/kyra/vqa.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -35,9 +35,9 @@
#include "kyra/vqa.h"
#include "common/system.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
#include "kyra/sound.h"
#include "kyra/screen.h"
Modified: scummvm/trunk/engines/kyra/vqa.h
===================================================================
--- scummvm/trunk/engines/kyra/vqa.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/kyra/vqa.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -28,7 +28,7 @@
#include "common/scummsys.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
class OSystem;
Modified: scummvm/trunk/engines/lastexpress/data/snd.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/data/snd.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/lastexpress/data/snd.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -30,8 +30,8 @@
#include "lastexpress/debug.h"
-#include "sound/decoders/adpcm.h"
-#include "sound/audiostream.h"
+#include "audio/decoders/adpcm.h"
+#include "audio/audiostream.h"
#include "common/memstream.h"
namespace LastExpress {
Modified: scummvm/trunk/engines/lastexpress/data/snd.h
===================================================================
--- scummvm/trunk/engines/lastexpress/data/snd.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/lastexpress/data/snd.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -39,7 +39,7 @@
byte {x} - IMA ADPCM sample codes
*/
-#include "sound/mixer.h"
+#include "audio/mixer.h"
namespace Audio {
class AudioStream;
Modified: scummvm/trunk/engines/lure/lure.h
===================================================================
--- scummvm/trunk/engines/lure/lure.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/lure/lure.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -28,7 +28,7 @@
#include "engines/engine.h"
#include "common/rect.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
#include "common/file.h"
#include "common/savefile.h"
#include "common/util.h"
Modified: scummvm/trunk/engines/lure/sound.cpp
===================================================================
--- scummvm/trunk/engines/lure/sound.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/lure/sound.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -32,7 +32,7 @@
#include "common/algorithm.h"
#include "common/config-manager.h"
#include "common/endian.h"
-#include "sound/midiparser.h"
+#include "audio/midiparser.h"
DECLARE_SINGLETON(Lure::SoundManager);
Modified: scummvm/trunk/engines/lure/sound.h
===================================================================
--- scummvm/trunk/engines/lure/sound.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/lure/sound.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -32,8 +32,8 @@
#include "common/singleton.h"
#include "common/ptr.h"
-#include "sound/mididrv.h"
-#include "sound/mixer.h"
+#include "audio/mididrv.h"
+#include "audio/mixer.h"
class MidiParser;
Modified: scummvm/trunk/engines/m4/m4.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/m4/m4.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -61,7 +61,7 @@
#include "common/debug-channels.h"
#include "engines/util.h"
#include "graphics/surface.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
namespace M4 {
Modified: scummvm/trunk/engines/m4/m4.h
===================================================================
--- scummvm/trunk/engines/m4/m4.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/m4/m4.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -29,7 +29,7 @@
#include "common/scummsys.h"
#include "common/util.h"
#include "common/random.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
#include "engines/engine.h"
Modified: scummvm/trunk/engines/m4/midi.h
===================================================================
--- scummvm/trunk/engines/m4/midi.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/m4/midi.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -28,8 +28,8 @@
#ifndef M4_MIDI_H
#define M4_MIDI_H
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
#include "common/mutex.h"
namespace M4 {
Modified: scummvm/trunk/engines/m4/sound.cpp
===================================================================
--- scummvm/trunk/engines/m4/sound.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/m4/sound.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -29,9 +29,9 @@
#include "common/stream.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
namespace M4 {
Modified: scummvm/trunk/engines/m4/sound.h
===================================================================
--- scummvm/trunk/engines/m4/sound.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/m4/sound.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -30,10 +30,10 @@
#include "common/file.h"
#include "common/array.h"
-#include "sound/mixer.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/flac.h"
+#include "audio/mixer.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/flac.h"
namespace M4 {
Modified: scummvm/trunk/engines/made/made.cpp
===================================================================
--- scummvm/trunk/engines/made/made.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/made/made.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -40,7 +40,7 @@
#include "base/plugins.h"
#include "base/version.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
#include "made/made.h"
#include "made/database.h"
Modified: scummvm/trunk/engines/made/made.h
===================================================================
--- scummvm/trunk/engines/made/made.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/made/made.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -39,9 +39,9 @@
#include "graphics/surface.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/voc.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/voc.h"
#include "engines/engine.h"
Modified: scummvm/trunk/engines/made/music.cpp
===================================================================
--- scummvm/trunk/engines/made/music.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/made/music.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -27,9 +27,9 @@
// MIDI and digital music class
-#include "sound/audiostream.h"
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
+#include "audio/audiostream.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
#include "common/config-manager.h"
#include "common/file.h"
Modified: scummvm/trunk/engines/made/music.h
===================================================================
--- scummvm/trunk/engines/made/music.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/made/music.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -28,8 +28,8 @@
#ifndef MADE_MUSIC_H
#define MADE_MUSIC_H
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
#include "common/mutex.h"
#include "made/resource.h"
Modified: scummvm/trunk/engines/made/pmvplayer.cpp
===================================================================
--- scummvm/trunk/engines/made/pmvplayer.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/made/pmvplayer.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -26,7 +26,7 @@
#include "made/pmvplayer.h"
#include "made/screen.h"
-#include "sound/decoders/raw.h"
+#include "audio/decoders/raw.h"
namespace Made {
Modified: scummvm/trunk/engines/made/pmvplayer.h
===================================================================
--- scummvm/trunk/engines/made/pmvplayer.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/made/pmvplayer.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -31,8 +31,8 @@
#include "common/file.h"
#include "common/endian.h"
#include "graphics/surface.h"
-#include "sound/mixer.h"
-#include "sound/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/audiostream.h"
#include "made/graphics.h"
#include "made/sound.h"
Modified: scummvm/trunk/engines/made/resource.cpp
===================================================================
--- scummvm/trunk/engines/made/resource.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/made/resource.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -25,8 +25,8 @@
#include "common/endian.h"
#include "common/memstream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
#include "made/resource.h"
#include "made/graphics.h"
Modified: scummvm/trunk/engines/made/resource.h
===================================================================
--- scummvm/trunk/engines/made/resource.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/made/resource.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -31,7 +31,7 @@
#include "common/stream.h"
#include "common/hashmap.h"
#include "graphics/surface.h"
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
#include "made/sound.h"
Modified: scummvm/trunk/engines/made/scriptfuncs.cpp
===================================================================
--- scummvm/trunk/engines/made/scriptfuncs.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/made/scriptfuncs.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -29,7 +29,7 @@
#include "backends/audiocd/audiocd.h"
#include "graphics/cursorman.h"
-#include "sound/softsynth/pcspk.h"
+#include "audio/softsynth/pcspk.h"
#include "made/made.h"
#include "made/resource.h"
Modified: scummvm/trunk/engines/mohawk/cstime.h
===================================================================
--- scummvm/trunk/engines/mohawk/cstime.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/mohawk/cstime.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -33,7 +33,7 @@
#include "common/random.h"
#include "common/list.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
namespace Mohawk {
Modified: scummvm/trunk/engines/mohawk/livingbooks.h
===================================================================
--- scummvm/trunk/engines/mohawk/livingbooks.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/mohawk/livingbooks.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -36,7 +36,7 @@
#include "common/queue.h"
#include "common/random.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
#include "livingbooks_code.h"
Modified: scummvm/trunk/engines/mohawk/mohawk.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/mohawk.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/mohawk/mohawk.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -38,7 +38,7 @@
#include "mohawk/sound.h"
#include "mohawk/video.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
namespace Mohawk {
Modified: scummvm/trunk/engines/mohawk/sound.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/sound.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/mohawk/sound.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -27,11 +27,11 @@
#include "common/util.h"
-#include "sound/musicplugin.h"
-#include "sound/audiostream.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/wave.h"
+#include "audio/musicplugin.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/wave.h"
namespace Mohawk {
Modified: scummvm/trunk/engines/mohawk/sound.h
===================================================================
--- scummvm/trunk/engines/mohawk/sound.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/mohawk/sound.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -29,11 +29,11 @@
#include "common/scummsys.h"
#include "common/str.h"
-#include "sound/audiostream.h"
-#include "sound/decoders/adpcm.h"
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/adpcm.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
+#include "audio/mixer.h"
#include "mohawk/mohawk.h"
#include "mohawk/resource.h"
Modified: scummvm/trunk/engines/parallaction/sound.h
===================================================================
--- scummvm/trunk/engines/parallaction/sound.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/parallaction/sound.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -29,10 +29,10 @@
#include "common/util.h"
#include "common/mutex.h"
-#include "sound/audiostream.h"
-#include "sound/decoders/iff_sound.h"
-#include "sound/mixer.h"
-#include "sound/mididrv.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/iff_sound.h"
+#include "audio/mixer.h"
+#include "audio/mididrv.h"
#define PATH_LEN 200
Modified: scummvm/trunk/engines/parallaction/sound_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/sound_br.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/parallaction/sound_br.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -23,15 +23,15 @@
*
*/
-#include "sound/mixer.h"
+#include "audio/mixer.h"
#include "common/stream.h"
#include "common/util.h"
-#include "sound/mixer.h"
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
-#include "sound/mods/protracker.h"
-#include "sound/decoders/raw.h"
+#include "audio/mixer.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
+#include "audio/mods/protracker.h"
+#include "audio/decoders/raw.h"
#include "parallaction/disk.h"
#include "parallaction/parallaction.h"
Modified: scummvm/trunk/engines/parallaction/sound_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/sound_ns.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/parallaction/sound_ns.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -27,10 +27,10 @@
#include "common/stream.h"
-#include "sound/mixer.h"
-#include "sound/midiparser.h"
-#include "sound/mods/protracker.h"
-#include "sound/decoders/raw.h"
+#include "audio/mixer.h"
+#include "audio/midiparser.h"
+#include "audio/mods/protracker.h"
+#include "audio/decoders/raw.h"
#include "parallaction/sound.h"
#include "parallaction/parallaction.h"
Modified: scummvm/trunk/engines/queen/midiadlib.cpp
===================================================================
--- scummvm/trunk/engines/queen/midiadlib.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/queen/midiadlib.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -25,8 +25,8 @@
#include "common/endian.h"
-#include "sound/fmopl.h"
-#include "sound/softsynth/emumidi.h"
+#include "audio/fmopl.h"
+#include "audio/softsynth/emumidi.h"
namespace Queen {
Modified: scummvm/trunk/engines/queen/music.cpp
===================================================================
--- scummvm/trunk/engines/queen/music.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/queen/music.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -32,7 +32,7 @@
#include "queen/resource.h"
#include "queen/sound.h"
-#include "sound/midiparser.h"
+#include "audio/midiparser.h"
namespace Queen {
Modified: scummvm/trunk/engines/queen/music.h
===================================================================
--- scummvm/trunk/engines/queen/music.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/queen/music.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -29,7 +29,7 @@
#include "common/util.h"
#include "common/mutex.h"
#include "common/random.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
class MidiParser;
Modified: scummvm/trunk/engines/queen/sound.cpp
===================================================================
--- scummvm/trunk/engines/queen/sound.cpp 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/queen/sound.cpp 2011-02-09 01:09:01 UTC (rev 55850)
@@ -35,12 +35,12 @@
#include "queen/queen.h"
#include "queen/resource.h"
-#include "sound/audiostream.h"
-#include "sound/decoders/flac.h"
-#include "sound/mididrv.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/vorbis.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/flac.h"
+#include "audio/mididrv.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/vorbis.h"
#define SB_HEADER_SIZE_V104 110
#define SB_HEADER_SIZE_V110 122
Modified: scummvm/trunk/engines/queen/sound.h
===================================================================
--- scummvm/trunk/engines/queen/sound.h 2011-02-09 00:27:50 UTC (rev 55849)
+++ scummvm/trunk/engines/queen/sound.h 2011-02-09 01:09:01 UTC (rev 55850)
@@ -27,8 +27,8 @@
#define QUEEN_SOUND_H
#include "common/util.h"
-#include "sound/mixer.h"
-#include "sound/mods/rjp1.h"
+#include "audio/mixer.h"
+#include "audio/mods/rjp1.h"
#include "queen/defs.h"
namespace Common {
Modified: scummvm/trunk/engines/saga/introproc_saga2.cpp
===================================================================
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list