Change S9xPlaySample to use pointers

jSTE0 · Jun 6, 2020 · b55f23c · b55f23c
1 parent a96f3f6
commit b55f23c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/apu.cpp b/src/apu.cpp
@@ -441,7 +441,7 @@ void S9xSetAPUDSP(uint8 byte, struct SAPU *apu, struct SIAPU *iapu)
 					// apu->DSP [APU_KON] |= mask;
 					apu->DSP[APU_KOFF] &= ~mask;
 					apu->DSP[APU_ENDX] &= ~mask;
-					S9xPlaySample(c);
+					S9xPlaySample(c, apu);
 				}
 			}
 #ifdef DEBUGGER
@@ -482,7 +482,7 @@ void S9xSetAPUDSP(uint8 byte, struct SAPU *apu, struct SIAPU *iapu)
 						// apu->DSP [APU_KON] |= mask;
 						// apu->DSP [APU_KOFF] &= ~mask;
 						apu->DSP[APU_ENDX] &= ~mask;
-						S9xPlaySample(c);
+						S9xPlaySample(c, apu);
 					} else
 						KeyOn |= mask;
 				}

diff --git a/src/soundux.cpp b/src/soundux.cpp
@@ -1860,19 +1860,19 @@ bool8 S9xSetSoundMode(int channel, int mode)
 
 void S9xSetSoundControl(int sound_switch) { so.sound_switch = sound_switch; }
 
-void S9xPlaySample(int channel)
+void S9xPlaySample(int channel, struct SAPU *apu)
 {
 	Channel *ch = &SoundData.channels[channel];
 
 	ch->state = SOUND_SILENT;
 	ch->mode = MODE_NONE;
 	ch->xenvx = 0;
 
-	S9xFixEnvelope(channel, APU.DSP[APU_GAIN + (channel << 4)], APU.DSP[APU_ADSR1 + (channel << 4)],
-		       APU.DSP[APU_ADSR2 + (channel << 4)]);
+	S9xFixEnvelope(channel, apu->DSP[APU_GAIN + (channel << 4)], apu->DSP[APU_ADSR1 + (channel << 4)],
+		       apu->DSP[APU_ADSR2 + (channel << 4)]);
 
-	ch->sample_number = APU.DSP[APU_SRCN + channel * 0x10];
-	if (APU.DSP[APU_NON] & (1 << channel))
+	ch->sample_number = apu->DSP[APU_SRCN + channel * 0x10];
+	if (apu->DSP[APU_NON] & (1 << channel))
 		ch->type = SOUND_NOISE;
 	else
 		ch->type = SOUND_SAMPLE;
@@ -1943,6 +1943,6 @@ void S9xPlaySample(int channel)
 		break;
 	}
 
-	S9xFixEnvelope(channel, APU.DSP[APU_GAIN + (channel << 4)], APU.DSP[APU_ADSR1 + (channel << 4)],
-		       APU.DSP[APU_ADSR2 + (channel << 4)]);
+	S9xFixEnvelope(channel, apu->DSP[APU_GAIN + (channel << 4)], apu->DSP[APU_ADSR1 + (channel << 4)],
+		       apu->DSP[APU_ADSR2 + (channel << 4)]);
 }
diff --git a/src/soundux.h b/src/soundux.h
@@ -327,7 +327,7 @@ void S9xResetSound(bool8 full);
 void S9xSetPlaybackRate(uint32 playback_rate);
 bool8 S9xSetSoundMode(int channel, int mode);
 void S9xSetSoundControl(int sound_switch);
-void S9xPlaySample(int channel);
+void S9xPlaySample(int channel, struct SAPU *);
 
 void S9xFixEnvelope(int channel, uint8 gain, uint8 adsr1, uint8 adsr2);
 bool8 S9xOpenSoundDevice(int mode, bool8 stereo, int buffer_size);