From 3ddb6c0c903f478b91a8965d3433a9f79ce16ba7 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Fri, 28 Oct 2011 12:27:50 +0200 Subject: AUDIO: Adapt include guard names to the "new" directory name. --- audio/audiostream.h | 4 ++-- audio/decoders/aac.h | 6 +++--- audio/decoders/adpcm.h | 4 ++-- audio/decoders/adpcm_intern.h | 4 ++-- audio/decoders/aiff.h | 4 ++-- audio/decoders/flac.h | 6 +++--- audio/decoders/iff_sound.h | 4 ++-- audio/decoders/mac_snd.h | 4 ++-- audio/decoders/mp3.h | 6 +++--- audio/decoders/raw.h | 4 ++-- audio/decoders/voc.h | 4 ++-- audio/decoders/vorbis.h | 6 +++--- audio/decoders/wave.h | 4 ++-- audio/fmopl.h | 4 ++-- audio/mididrv.h | 4 ++-- audio/midiparser.h | 4 ++-- audio/midiplayer.h | 4 ++-- audio/mixer.h | 4 ++-- audio/mixer_intern.h | 4 ++-- audio/mods/infogrames.h | 4 ++-- audio/mods/maxtrax.h | 6 +++--- audio/mods/module.h | 4 ++-- audio/mods/paula.h | 4 ++-- audio/mods/protracker.h | 4 ++-- audio/mods/rjp1.h | 4 ++-- audio/mods/soundfx.h | 4 ++-- audio/mods/tfmx.h | 2 +- audio/mpu401.h | 4 ++-- audio/musicplugin.h | 4 ++-- audio/null.h | 4 ++-- audio/rate.h | 4 ++-- audio/softsynth/cms.h | 4 ++-- audio/softsynth/emumidi.h | 4 ++-- audio/softsynth/opl/dbopl.h | 4 ++-- audio/softsynth/opl/dosbox.h | 4 ++-- audio/softsynth/opl/mame.h | 4 ++-- audio/softsynth/pcspk.h | 6 +++--- audio/timestamp.h | 4 ++-- 38 files changed, 81 insertions(+), 81 deletions(-) (limited to 'audio') diff --git a/audio/audiostream.h b/audio/audiostream.h index 9c28e4d67f..801f13d9d9 100644 --- a/audio/audiostream.h +++ b/audio/audiostream.h @@ -20,8 +20,8 @@ * */ -#ifndef SOUND_AUDIOSTREAM_H -#define SOUND_AUDIOSTREAM_H +#ifndef AUDIO_AUDIOSTREAM_H +#define AUDIO_AUDIOSTREAM_H #include "common/ptr.h" #include "common/scummsys.h" diff --git a/audio/decoders/aac.h b/audio/decoders/aac.h index 68e322c844..9ad78b28a4 100644 --- a/audio/decoders/aac.h +++ b/audio/decoders/aac.h @@ -26,8 +26,8 @@ * - groovie */ -#ifndef SOUND_AAC_H -#define SOUND_AAC_H +#ifndef AUDIO_AAC_H +#define AUDIO_AAC_H #include "common/scummsys.h" #include "common/types.h" @@ -59,4 +59,4 @@ Codec *makeAACDecoder( } // End of namespace Audio #endif // #ifdef USE_FAAD -#endif // #ifndef SOUND_AAC_H +#endif // #ifndef AUDIO_AAC_H diff --git a/audio/decoders/adpcm.h b/audio/decoders/adpcm.h index 1dd4d510df..ac8d529917 100644 --- a/audio/decoders/adpcm.h +++ b/audio/decoders/adpcm.h @@ -31,8 +31,8 @@ * - tinsel */ -#ifndef SOUND_ADPCM_H -#define SOUND_ADPCM_H +#ifndef AUDIO_ADPCM_H +#define AUDIO_ADPCM_H #include "common/scummsys.h" #include "common/types.h" diff --git a/audio/decoders/adpcm_intern.h b/audio/decoders/adpcm_intern.h index 38514d7fca..f7162f5f2a 100644 --- a/audio/decoders/adpcm_intern.h +++ b/audio/decoders/adpcm_intern.h @@ -28,8 +28,8 @@ * ADPCM decoder implementations. */ -#ifndef SOUND_ADPCM_INTERN_H -#define SOUND_ADPCM_INTERN_H +#ifndef AUDIO_ADPCM_INTERN_H +#define AUDIO_ADPCM_INTERN_H #include "audio/audiostream.h" #include "common/endian.h" diff --git a/audio/decoders/aiff.h b/audio/decoders/aiff.h index 558a018f57..59664bb85a 100644 --- a/audio/decoders/aiff.h +++ b/audio/decoders/aiff.h @@ -28,8 +28,8 @@ * - sword1 */ -#ifndef SOUND_AIFF_H -#define SOUND_AIFF_H +#ifndef AUDIO_AIFF_H +#define AUDIO_AIFF_H #include "common/scummsys.h" #include "common/types.h" diff --git a/audio/decoders/flac.h b/audio/decoders/flac.h index 3182b26425..a90675cc20 100644 --- a/audio/decoders/flac.h +++ b/audio/decoders/flac.h @@ -37,8 +37,8 @@ * - tucker */ -#ifndef SOUND_FLAC_H -#define SOUND_FLAC_H +#ifndef AUDIO_FLAC_H +#define AUDIO_FLAC_H #include "common/scummsys.h" #include "common/types.h" @@ -68,4 +68,4 @@ SeekableAudioStream *makeFLACStream( } // End of namespace Audio #endif // #ifdef USE_FLAC -#endif // #ifndef SOUND_FLAC_H +#endif // #ifndef AUDIO_FLAC_H diff --git a/audio/decoders/iff_sound.h b/audio/decoders/iff_sound.h index b266e629a1..28b2c67227 100644 --- a/audio/decoders/iff_sound.h +++ b/audio/decoders/iff_sound.h @@ -26,8 +26,8 @@ * - parallaction */ -#ifndef SOUND_IFF_H -#define SOUND_IFF_H +#ifndef AUDIO_IFF_H +#define AUDIO_IFF_H namespace Common { class ReadStream; diff --git a/audio/decoders/mac_snd.h b/audio/decoders/mac_snd.h index cbbd82bbe0..7e960058ae 100644 --- a/audio/decoders/mac_snd.h +++ b/audio/decoders/mac_snd.h @@ -26,8 +26,8 @@ * - sci */ -#ifndef SOUND_MAC_SND_H -#define SOUND_MAC_SND_H +#ifndef AUDIO_MAC_SND_H +#define AUDIO_MAC_SND_H #include "common/scummsys.h" #include "common/types.h" diff --git a/audio/decoders/mp3.h b/audio/decoders/mp3.h index 86ddc599ea..cb0cc8375d 100644 --- a/audio/decoders/mp3.h +++ b/audio/decoders/mp3.h @@ -38,8 +38,8 @@ * - tucker */ -#ifndef SOUND_MP3_H -#define SOUND_MP3_H +#ifndef AUDIO_MP3_H +#define AUDIO_MP3_H #include "common/scummsys.h" #include "common/types.h" @@ -69,4 +69,4 @@ SeekableAudioStream *makeMP3Stream( } // End of namespace Audio #endif // #ifdef USE_MAD -#endif // #ifndef SOUND_MP3_H +#endif // #ifndef AUDIO_MP3_H diff --git a/audio/decoders/raw.h b/audio/decoders/raw.h index 5a7897b688..5cbf2c9b79 100644 --- a/audio/decoders/raw.h +++ b/audio/decoders/raw.h @@ -20,8 +20,8 @@ * */ -#ifndef SOUND_RAW_H -#define SOUND_RAW_H +#ifndef AUDIO_RAW_H +#define AUDIO_RAW_H #include "common/scummsys.h" #include "common/types.h" diff --git a/audio/decoders/voc.h b/audio/decoders/voc.h index a920eac933..7d96d261b5 100644 --- a/audio/decoders/voc.h +++ b/audio/decoders/voc.h @@ -30,8 +30,8 @@ * - touche */ -#ifndef SOUND_VOC_H -#define SOUND_VOC_H +#ifndef AUDIO_VOC_H +#define AUDIO_VOC_H #include "common/scummsys.h" #include "common/types.h" diff --git a/audio/decoders/vorbis.h b/audio/decoders/vorbis.h index e3d989e9b8..9e7600af56 100644 --- a/audio/decoders/vorbis.h +++ b/audio/decoders/vorbis.h @@ -38,8 +38,8 @@ * - tucker */ -#ifndef SOUND_VORBIS_H -#define SOUND_VORBIS_H +#ifndef AUDIO_VORBIS_H +#define AUDIO_VORBIS_H #include "common/scummsys.h" #include "common/types.h" @@ -69,4 +69,4 @@ SeekableAudioStream *makeVorbisStream( } // End of namespace Audio #endif // #ifdef USE_VORBIS -#endif // #ifndef SOUND_VORBIS_H +#endif // #ifndef AUDIO_VORBIS_H diff --git a/audio/decoders/wave.h b/audio/decoders/wave.h index 6a34bc175a..c8ac7fe318 100644 --- a/audio/decoders/wave.h +++ b/audio/decoders/wave.h @@ -34,8 +34,8 @@ * - tucker */ -#ifndef SOUND_WAVE_H -#define SOUND_WAVE_H +#ifndef AUDIO_WAVE_H +#define AUDIO_WAVE_H #include "common/scummsys.h" #include "common/types.h" diff --git a/audio/fmopl.h b/audio/fmopl.h index f62587f557..323cc3d028 100644 --- a/audio/fmopl.h +++ b/audio/fmopl.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef SOUND_FMOPL_H -#define SOUND_FMOPL_H +#ifndef AUDIO_FMOPL_H +#define AUDIO_FMOPL_H #include "common/scummsys.h" diff --git a/audio/mididrv.h b/audio/mididrv.h index cdf2943f2a..fb3e29bd60 100644 --- a/audio/mididrv.h +++ b/audio/mididrv.h @@ -20,8 +20,8 @@ * */ -#ifndef SOUND_MIDIDRV_H -#define SOUND_MIDIDRV_H +#ifndef AUDIO_MIDIDRV_H +#define AUDIO_MIDIDRV_H #include "common/scummsys.h" #include "common/str.h" diff --git a/audio/midiparser.h b/audio/midiparser.h index 9dff4b54ba..c935969e72 100644 --- a/audio/midiparser.h +++ b/audio/midiparser.h @@ -22,8 +22,8 @@ /// \brief Declarations related to the MidiParser class -#ifndef SOUND_MIDIPARSER_H -#define SOUND_MIDIPARSER_H +#ifndef AUDIO_MIDIPARSER_H +#define AUDIO_MIDIPARSER_H #include "common/scummsys.h" #include "common/endian.h" diff --git a/audio/midiplayer.h b/audio/midiplayer.h index e1da0bfb79..e58c78cafd 100644 --- a/audio/midiplayer.h +++ b/audio/midiplayer.h @@ -20,8 +20,8 @@ * */ -#ifndef SOUND_MIDIPLAYER_H -#define SOUND_MIDIPLAYER_H +#ifndef AUDIO_MIDIPLAYER_H +#define AUDIO_MIDIPLAYER_H #include "common/scummsys.h" #include "common/mutex.h" diff --git a/audio/mixer.h b/audio/mixer.h index de709e13fe..e38e052bef 100644 --- a/audio/mixer.h +++ b/audio/mixer.h @@ -20,8 +20,8 @@ * */ -#ifndef SOUND_MIXER_H -#define SOUND_MIXER_H +#ifndef AUDIO_MIXER_H +#define AUDIO_MIXER_H #include "common/types.h" #include "common/noncopyable.h" diff --git a/audio/mixer_intern.h b/audio/mixer_intern.h index dc361ce560..c6dfa55ada 100644 --- a/audio/mixer_intern.h +++ b/audio/mixer_intern.h @@ -20,8 +20,8 @@ * */ -#ifndef SOUND_MIXER_INTERN_H -#define SOUND_MIXER_INTERN_H +#ifndef AUDIO_MIXER_INTERN_H +#define AUDIO_MIXER_INTERN_H #include "common/scummsys.h" #include "common/mutex.h" diff --git a/audio/mods/infogrames.h b/audio/mods/infogrames.h index 307a26d4e1..8b246eebe7 100644 --- a/audio/mods/infogrames.h +++ b/audio/mods/infogrames.h @@ -26,8 +26,8 @@ * - gob */ -#ifndef SOUND_MODS_INFOGRAMES_H -#define SOUND_MODS_INFOGRAMES_H +#ifndef AUDIO_MODS_INFOGRAMES_H +#define AUDIO_MODS_INFOGRAMES_H #include "audio/mods/paula.h" diff --git a/audio/mods/maxtrax.h b/audio/mods/maxtrax.h index bef6669d2a..c61f4e1b50 100644 --- a/audio/mods/maxtrax.h +++ b/audio/mods/maxtrax.h @@ -24,8 +24,8 @@ #if !defined(ENABLE_KYRA) // normal Header Guard -#elif !defined SOUND_MODS_MAXTRAX_H -#define SOUND_MODS_MAXTRAX_H +#elif !defined AUDIO_MODS_MAXTRAX_H +#define AUDIO_MODS_MAXTRAX_H // #define MAXTRAX_HAS_MODULATION // #define MAXTRAX_HAS_MICROTONAL @@ -219,4 +219,4 @@ private: }; } // End of namespace Audio -#endif // !defined SOUND_MODS_MAXTRAX_H +#endif // !defined AUDIO_MODS_MAXTRAX_H diff --git a/audio/mods/module.h b/audio/mods/module.h index a57a89225e..eb7cbf260e 100644 --- a/audio/mods/module.h +++ b/audio/mods/module.h @@ -20,8 +20,8 @@ * */ -#ifndef SOUND_MODS_MODULE_H -#define SOUND_MODS_MODULE_H +#ifndef AUDIO_MODS_MODULE_H +#define AUDIO_MODS_MODULE_H #include "common/scummsys.h" diff --git a/audio/mods/paula.h b/audio/mods/paula.h index cd797f51cb..5d11cc7bb6 100644 --- a/audio/mods/paula.h +++ b/audio/mods/paula.h @@ -20,8 +20,8 @@ * */ -#ifndef SOUND_MODS_PAULA_H -#define SOUND_MODS_PAULA_H +#ifndef AUDIO_MODS_PAULA_H +#define AUDIO_MODS_PAULA_H #include "audio/audiostream.h" #include "common/frac.h" diff --git a/audio/mods/protracker.h b/audio/mods/protracker.h index 15f708d801..d52322f07e 100644 --- a/audio/mods/protracker.h +++ b/audio/mods/protracker.h @@ -27,8 +27,8 @@ * - parallaction */ -#ifndef SOUND_MODS_PROTRACKER_H -#define SOUND_MODS_PROTRACKER_H +#ifndef AUDIO_MODS_PROTRACKER_H +#define AUDIO_MODS_PROTRACKER_H namespace Common { class SeekableReadStream; diff --git a/audio/mods/rjp1.h b/audio/mods/rjp1.h index 232b1926e9..e7e54dafb3 100644 --- a/audio/mods/rjp1.h +++ b/audio/mods/rjp1.h @@ -26,8 +26,8 @@ * - queen */ -#ifndef SOUND_MODS_RJP1_H -#define SOUND_MODS_RJP1_H +#ifndef AUDIO_MODS_RJP1_H +#define AUDIO_MODS_RJP1_H namespace Common { class SeekableReadStream; diff --git a/audio/mods/soundfx.h b/audio/mods/soundfx.h index 48ccff2da6..d517c6c78f 100644 --- a/audio/mods/soundfx.h +++ b/audio/mods/soundfx.h @@ -26,8 +26,8 @@ * - cine */ -#ifndef SOUND_MODS_SOUNDFX_H -#define SOUND_MODS_SOUNDFX_H +#ifndef AUDIO_MODS_SOUNDFX_H +#define AUDIO_MODS_SOUNDFX_H namespace Common { class SeekableReadStream; diff --git a/audio/mods/tfmx.h b/audio/mods/tfmx.h index 2b07e2e660..26099f969d 100644 --- a/audio/mods/tfmx.h +++ b/audio/mods/tfmx.h @@ -25,7 +25,7 @@ // normal Header Guard #elif !defined(SOUND_MODS_TFMX_H) -#define SOUND_MODS_TFMX_H +#define AUDIO_MODS_TFMX_H #include "audio/mods/paula.h" diff --git a/audio/mpu401.h b/audio/mpu401.h index 15728a6d97..d4580b6e79 100644 --- a/audio/mpu401.h +++ b/audio/mpu401.h @@ -20,8 +20,8 @@ * */ -#ifndef SOUND_MPU401_H -#define SOUND_MPU401_H +#ifndef AUDIO_MPU401_H +#define AUDIO_MPU401_H #include "audio/mididrv.h" diff --git a/audio/musicplugin.h b/audio/musicplugin.h index 307293a7c9..2a0f2f0a99 100644 --- a/audio/musicplugin.h +++ b/audio/musicplugin.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef SOUND_MUSICPLUGIN_H -#define SOUND_MUSICPLUGIN_H +#ifndef AUDIO_MUSICPLUGIN_H +#define AUDIO_MUSICPLUGIN_H #include "base/plugins.h" #include "audio/mididrv.h" diff --git a/audio/null.h b/audio/null.h index 97c7c8cc93..90897be6af 100644 --- a/audio/null.h +++ b/audio/null.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef SOUND_NULL_H -#define SOUND_NULL_H +#ifndef AUDIO_NULL_H +#define AUDIO_NULL_H #include "audio/musicplugin.h" #include "audio/mpu401.h" diff --git a/audio/rate.h b/audio/rate.h index 72bcbf48c5..9813b75b08 100644 --- a/audio/rate.h +++ b/audio/rate.h @@ -20,8 +20,8 @@ * */ -#ifndef SOUND_RATE_H -#define SOUND_RATE_H +#ifndef AUDIO_RATE_H +#define AUDIO_RATE_H #include "common/scummsys.h" diff --git a/audio/softsynth/cms.h b/audio/softsynth/cms.h index 48064746a8..0aad856a9d 100644 --- a/audio/softsynth/cms.h +++ b/audio/softsynth/cms.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef SOUND_SOFTSYNTH_CMS_H -#define SOUND_SOFTSYNTH_CMS_H +#ifndef AUDIO_SOFTSYNTH_CMS_H +#define AUDIO_SOFTSYNTH_CMS_H #include "common/scummsys.h" diff --git a/audio/softsynth/emumidi.h b/audio/softsynth/emumidi.h index f72dad7eaf..3e9d669933 100644 --- a/audio/softsynth/emumidi.h +++ b/audio/softsynth/emumidi.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef SOUND_SOFTSYNTH_EMUMIDI_H -#define SOUND_SOFTSYNTH_EMUMIDI_H +#ifndef AUDIO_SOFTSYNTH_EMUMIDI_H +#define AUDIO_SOFTSYNTH_EMUMIDI_H #include "audio/audiostream.h" #include "audio/mididrv.h" diff --git a/audio/softsynth/opl/dbopl.h b/audio/softsynth/opl/dbopl.h index 3dbd98986d..99234ebf88 100644 --- a/audio/softsynth/opl/dbopl.h +++ b/audio/softsynth/opl/dbopl.h @@ -18,8 +18,8 @@ // Last synch with DOSBox SVN trunk r3752 -#ifndef SOUND_SOFTSYNTH_OPL_DBOPL_H -#define SOUND_SOFTSYNTH_OPL_DBOPL_H +#ifndef AUDIO_SOFTSYNTH_OPL_DBOPL_H +#define AUDIO_SOFTSYNTH_OPL_DBOPL_H #include "common/scummsys.h" diff --git a/audio/softsynth/opl/dosbox.h b/audio/softsynth/opl/dosbox.h index cdf86df114..3adfe98852 100644 --- a/audio/softsynth/opl/dosbox.h +++ b/audio/softsynth/opl/dosbox.h @@ -26,8 +26,8 @@ * http://www.dosbox.com */ -#ifndef SOUND_SOFTSYNTH_OPL_DOSBOX_H -#define SOUND_SOFTSYNTH_OPL_DOSBOX_H +#ifndef AUDIO_SOFTSYNTH_OPL_DOSBOX_H +#define AUDIO_SOFTSYNTH_OPL_DOSBOX_H #ifndef DISABLE_DOSBOX_OPL diff --git a/audio/softsynth/opl/mame.h b/audio/softsynth/opl/mame.h index 803ca897e7..3714fa4e0a 100644 --- a/audio/softsynth/opl/mame.h +++ b/audio/softsynth/opl/mame.h @@ -23,8 +23,8 @@ */ -#ifndef SOUND_SOFTSYNTH_OPL_MAME_H -#define SOUND_SOFTSYNTH_OPL_MAME_H +#ifndef AUDIO_SOFTSYNTH_OPL_MAME_H +#define AUDIO_SOFTSYNTH_OPL_MAME_H #include "common/scummsys.h" #include "common/random.h" diff --git a/audio/softsynth/pcspk.h b/audio/softsynth/pcspk.h index 3641400b1f..f27eb94904 100644 --- a/audio/softsynth/pcspk.h +++ b/audio/softsynth/pcspk.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef SOUND_SOFTSYNTH_PCSPK_H -#define SOUND_SOFTSYNTH_PCSPK_H +#ifndef AUDIO_SOFTSYNTH_PCSPK_H +#define AUDIO_SOFTSYNTH_PCSPK_H #include "audio/audiostream.h" #include "common/mutex.h" @@ -81,4 +81,4 @@ protected: } // End of namespace Audio -#endif // SOUND_SOFTSYNTH_PCSPEAKER_H +#endif // AUDIO_SOFTSYNTH_PCSPEAKER_H diff --git a/audio/timestamp.h b/audio/timestamp.h index ef095a2106..1683b554cb 100644 --- a/audio/timestamp.h +++ b/audio/timestamp.h @@ -20,8 +20,8 @@ * */ -#ifndef SOUND_TIMESTAMP_H -#define SOUND_TIMESTAMP_H +#ifndef AUDIO_TIMESTAMP_H +#define AUDIO_TIMESTAMP_H #include "common/scummsys.h" -- cgit v1.2.3