diff options
| author | Max Horn | 2010-08-03 00:02:46 +0000 |
|---|---|---|
| committer | Max Horn | 2010-08-03 00:02:46 +0000 |
| commit | 39846310d79e75faf55482a239ec5ca8eaf34c2b (patch) | |
| tree | 3a43b6e5d656669613a89d6d77a59e6a1bf24b81 /sound/softsynth/sid.cpp | |
| parent | a76f5449bc741d35a76ed9173350b3c18dbb87bd (diff) | |
| download | scummvm-rg350-39846310d79e75faf55482a239ec5ca8eaf34c2b.tar.gz scummvm-rg350-39846310d79e75faf55482a239ec5ca8eaf34c2b.tar.bz2 scummvm-rg350-39846310d79e75faf55482a239ec5ca8eaf34c2b.zip | |
SOUND: Constify waveform table; slightly simplify code
svn-id: r51671
Diffstat (limited to 'sound/softsynth/sid.cpp')
| -rw-r--r-- | sound/softsynth/sid.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sound/softsynth/sid.cpp b/sound/softsynth/sid.cpp index d600ac28f5..e925f4a447 100644 --- a/sound/softsynth/sid.cpp +++ b/sound/softsynth/sid.cpp @@ -46,11 +46,6 @@ const int SID::FIXP_MASK = 0xffff; WaveformGenerator::WaveformGenerator() { sync_source = this; - wave__ST = wave6581__ST; - wave_P_T = wave6581_P_T; - wave_PS_ = wave6581_PS_; - wave_PST = wave6581_PST; - reset(); } @@ -226,19 +221,19 @@ RESID_INLINE reg12 WaveformGenerator::outputN___() { // Combined waveforms: RESID_INLINE reg12 WaveformGenerator::output__ST() { - return wave__ST[output__S_()] << 4; + return wave6581__ST[output__S_()] << 4; } RESID_INLINE reg12 WaveformGenerator::output_P_T() { - return (wave_P_T[output___T() >> 1] << 4) & output_P__(); + return (wave6581_P_T[output___T() >> 1] << 4) & output_P__(); } RESID_INLINE reg12 WaveformGenerator::output_PS_() { - return (wave_PS_[output__S_()] << 4) & output_P__(); + return (wave6581_PS_[output__S_()] << 4) & output_P__(); } RESID_INLINE reg12 WaveformGenerator::output_PST() { - return (wave_PST[output__S_()] << 4) & output_P__(); + return (wave6581_PST[output__S_()] << 4) & output_P__(); } // Combined waveforms including noise: |