From 39846310d79e75faf55482a239ec5ca8eaf34c2b Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 3 Aug 2010 00:02:46 +0000
Subject: SOUND: Constify waveform table; slightly simplify code

svn-id: r51671
---
 sound/softsynth/sid.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'sound/softsynth/sid.cpp')

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:
-- 
cgit v1.2.3