o switch to v46

tools/bsnes/dsp/adsp/adsp.cpp

@@ -1,5 +1,7 @@
 #include <../base.hpp>
+
 #define ADSP_CPP
+namespaec SNES {
 
 #include "adsp_tables.cpp"
 
@@ -580,9 +582,13 @@ int32 fir_samplel, fir_sampler;
     msampler  = sclamp<16>(msampler);
   }
 
-  snes.audio.update(msamplel, msampler);
+  audio.sample(msamplel, msampler);
   scheduler.addclocks_dsp(32 * 3 * 8);
+  scheduler.sync_dspsmp();
 }
 
 aDSP::aDSP()  {}
 aDSP::~aDSP() {}
+
+};
+

tools/bsnes/dsp/sdsp/echo.cpp

@@ -106,7 +106,7 @@ void sDSP::echo_27() {
   }
 
   //output sample to DAC
-  snes.audio.update(outl, outr);
+  audio.sample(outl, outr);
 }
 
 void sDSP::echo_28() {

tools/bsnes/dsp/sdsp/sdsp.cpp

@@ -1,21 +1,21 @@
 /*
   S-DSP emulator
-  license: LGPLv2
-
   Note: this is basically a C++ cothreaded implementation of Shay Green's (blargg's) S-DSP emulator.
   The actual algorithms, timing information, tables, variable names, etc were all from him.
 */
 
 #include <../base.hpp>
+
 #define SDSP_CPP
+namespace SNES {
 
 #define REG(n) state.regs[r_##n]
 #define VREG(n) state.regs[v.vidx + v_##n]
 
-#if !defined(USE_STATE_MACHINE)
+#if !defined(DSP_STATE_MACHINE)
   #define phase_start() while(true) {
   #define phase(n)
-  #define tick()          scheduler.addclocks_dsp(3 * 8)
+  #define tick()          scheduler.addclocks_dsp(3 * 8); scheduler.sync_dspsmp()
   #define phase_end()   }
 #else
   #define phase_start() switch(phase_index) {
@@ -324,3 +324,6 @@ sDSP::sDSP() {
 
 sDSP::~sDSP() {
 }
+
+};
+