diff options
| author | Max Horn | 2003-07-03 22:05:22 +0000 |
|---|---|---|
| committer | Max Horn | 2003-07-03 22:05:22 +0000 |
| commit | c60e1aeb86e61b9f29227b773ef98aeac6381f92 (patch) | |
| tree | cdc516d2b03e3fd796ae74afb4cb8e782ccd34b4 /sound | |
| parent | 30d985afb96c07766fd887fefbf06e892c204637 (diff) | |
| download | scummvm-rg350-c60e1aeb86e61b9f29227b773ef98aeac6381f92.tar.gz scummvm-rg350-c60e1aeb86e61b9f29227b773ef98aeac6381f92.tar.bz2 scummvm-rg350-c60e1aeb86e61b9f29227b773ef98aeac6381f92.zip | |
cleanup for -Wundef
svn-id: r8726
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/fmopl.h | 6 | ||||
| -rw-r--r-- | sound/mixer.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/fmopl.h b/sound/fmopl.h index ac83e6ba58..486ff988d5 100644 --- a/sound/fmopl.h +++ b/sound/fmopl.h @@ -28,9 +28,9 @@ #define HAS_YM3812 1 /* --- select emulation chips --- */ -#define BUILD_YM3812 (HAS_YM3812) -#define BUILD_YM3526 (HAS_YM3526) -#define BUILD_Y8950 (HAS_Y8950) +#define BUILD_YM3812 defined(HAS_YM3812) && HAS_YM3812 +#define BUILD_YM3526 defined(HAS_YM3526) && HAS_YM3526 +#define BUILD_Y8950 defined(HAS_Y8950) && HAS_Y8950 /* select output bits size of output : 8 or 16 */ #define OPL_SAMPLE_BITS 16 diff --git a/sound/mixer.cpp b/sound/mixer.cpp index ff619c8c23..3a34642030 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -253,7 +253,7 @@ int SoundMixer::playVorbis(PlayingSoundHandle *handle, OggVorbis_File *ov_file, void SoundMixer::mix(int16 *buf, uint len) { _syst->lock_mutex(_mutex); - + if (_premixProc && !_paused) { int i; _premixProc(_premixParam, buf, len); |