diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:35:23 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:40:58 +0200 |
| commit | 9c2341678ef4984bf92b3878295250faf980b066 (patch) | |
| tree | 2fb4805e05e16b9924e80c9947e6bad723b28c4b /audio/softsynth/opl | |
| parent | 8172d679df5148a4a32f46074b20cb6caf91844f (diff) | |
| parent | a5f4ff36ffc386d48f2da49387a9655ce9295a4d (diff) | |
| download | scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.gz scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.bz2 scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.zip | |
Merge branch 'master'
Diffstat (limited to 'audio/softsynth/opl')
| -rw-r--r-- | audio/softsynth/opl/dbopl.cpp | 4 | ||||
| -rw-r--r-- | audio/softsynth/opl/dbopl.h | 4 | ||||
| -rw-r--r-- | audio/softsynth/opl/dosbox.h | 4 | ||||
| -rw-r--r-- | audio/softsynth/opl/mame.h | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/audio/softsynth/opl/dbopl.cpp b/audio/softsynth/opl/dbopl.cpp index 02c2317b25..43eb40e7ba 100644 --- a/audio/softsynth/opl/dbopl.cpp +++ b/audio/softsynth/opl/dbopl.cpp @@ -1131,14 +1131,14 @@ void Chip::WriteBD( Bit8u val ) { #define REGOP( _FUNC_ ) \ index = ( ( reg >> 3) & 0x20 ) | ( reg & 0x1f ); \ if ( OpOffsetTable[ index ] ) { \ - Operator* regOp = (Operator*)( ((char *)this ) + OpOffsetTable[ index ] ); \ + Operator* regOp = (Operator *)( ((char *)this ) + OpOffsetTable[ index ] ); \ regOp->_FUNC_( this, val ); \ } #define REGCHAN( _FUNC_ ) \ index = ( ( reg >> 4) & 0x10 ) | ( reg & 0xf ); \ if ( ChanOffsetTable[ index ] ) { \ - Channel* regChan = (Channel*)( ((char *)this ) + ChanOffsetTable[ index ] ); \ + Channel* regChan = (Channel *)( ((char *)this ) + ChanOffsetTable[ index ] ); \ regChan->_FUNC_( this, val ); \ } 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" |