aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNebuleon Fumika2013-01-12 20:37:04 -0500
committerNebuleon Fumika2013-01-12 20:37:04 -0500
commitca7e790374612fc7a65e331048b47272d5e25c74 (patch)
treedbeb0e7fbce01e195187883edf6c278e537d7652
parent99b19abca3f0fb298df09e28b6517a9657caf32a (diff)
downloadsnesemu-ca7e790374612fc7a65e331048b47272d5e25c74.tar.gz
snesemu-ca7e790374612fc7a65e331048b47272d5e25c74.tar.bz2
snesemu-ca7e790374612fc7a65e331048b47272d5e25c74.zip
soundux.cpp: Inline MixStereo (into S9xMixSamples).
-rw-r--r--source/soundux.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/source/soundux.cpp b/source/soundux.cpp
index 8c7841b..acddd0a 100644
--- a/source/soundux.cpp
+++ b/source/soundux.cpp
@@ -891,7 +891,7 @@ void DecodeBlock (Channel *ch)
}
-void MixStereo (int sample_count)
+static inline void MixStereo (int sample_count)
{
static int wave[SOUND_BUFFER_SIZE];
@@ -1152,7 +1152,6 @@ void MixStereo (int sample_count)
// Snes9x 1.53's SPC_DSP.cpp, by blargg
int feedback = (noise_gen << 13) ^ (noise_gen << 14);
noise_gen = (feedback & 0x4000) ^ (noise_gen >> 1);
- VL = 0;
ch->sample = (noise_gen << 17) >> 17;
ch->interpolate = 0;
}
@@ -1197,7 +1196,7 @@ END_OF_FUNCTION(MixStereo);
#endif
#ifndef FOREVER_STEREO
-void MixMono (int sample_count)
+static inline void MixMono (int sample_count)
{
static int wave[SOUND_BUFFER_SIZE];