aboutsummaryrefslogtreecommitdiff
path: root/sound/softsynth/sid.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'sound/softsynth/sid.cpp')
-rw-r--r--sound/softsynth/sid.cpp13
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: