Reinsert the MonoMixer.{cpp,h} with the cache blocking SAMMONOMIXER.

This code was removed in tag 0.74d because it modify the "note tuning" of the synth. The bad code was related to a value in a buffer16[index] which was return two time, so it impact the "note tuning". Change Machine class function tick : - int tick() + Sint16 tick()
yoyz · Oct 27, 2016 · 75cc6a6 · 75cc6a6
1 parent a480eeb
commit 75cc6a6
Show file tree

Hide file tree

Showing 23 changed files with 82 additions and 25 deletions.
diff --git a/picoloop/Machine.cpp b/picoloop/Machine.cpp
@@ -47,9 +47,10 @@ void Machine::reset()
 }
 
 
-int Machine::tick()
+Sint16 Machine::tick()
 {
   DPRINTF("Machine::tick()");
+  return 0;
 }
 
 

diff --git a/picoloop/Machine.h b/picoloop/Machine.h
@@ -179,7 +179,7 @@ class Machine
 
   virtual void init();
   virtual void reset();
-  virtual int  tick();
+  virtual Sint16 tick();
 
   virtual int  checkI(int what,int val);
   virtual int  checkITwoVal(int what,int val1,int val2);

diff --git a/picoloop/Machine/Cursynth/CursynthMachine.cpp b/picoloop/Machine/Cursynth/CursynthMachine.cpp
@@ -393,7 +393,7 @@ void CursynthMachine::reset()
 }
 
 
-int CursynthMachine::tick()
+Sint16 CursynthMachine::tick()
 {
   float  f_in;
   float  f_out;

diff --git a/picoloop/Machine/Cursynth/CursynthMachine.h b/picoloop/Machine/Cursynth/CursynthMachine.h
@@ -14,7 +14,7 @@ class CursynthMachine : public Machine
 
   void init();
   void reset();
-  int  tick();
+  Sint16 tick();
 
   void setI(int what,int val);
   void setF(int what,float val);

diff --git a/picoloop/Machine/Dbopl/DboplMachine.cpp b/picoloop/Machine/Dbopl/DboplMachine.cpp
@@ -404,7 +404,7 @@ void dboplMachine::setI(int what,int val)
 
 }
 
-int dboplMachine::tick()
+Sint16 dboplMachine::tick()
 {
   Sint16 s_in;
   Sint16 s_out;

diff --git a/picoloop/Machine/Dbopl/DboplMachine.h b/picoloop/Machine/Dbopl/DboplMachine.h
@@ -27,7 +27,7 @@ class dboplMachine : public Machine
 
   void init();
   void reset();
-  int  tick();
+  Sint16  tick();
 
   void setI(int what,int   val);
   void setF(int what,float val);

diff --git a/picoloop/Machine/MDADrum/MDADrumMachine.cpp b/picoloop/Machine/MDADrum/MDADrumMachine.cpp
@@ -2216,7 +2216,7 @@ void MDADrumMachine::setI(int what,int val)
 }
 
 
-int MDADrumMachine::tick()
+Sint16 MDADrumMachine::tick()
 {
   int       i=0;
   Sint16 s_in=0;

diff --git a/picoloop/Machine/MDADrum/MDADrumMachine.h b/picoloop/Machine/MDADrum/MDADrumMachine.h
@@ -29,7 +29,7 @@ class MDADrumMachine : public Machine
 
   void init();
   void reset();
-  int  tick();
+  Sint16  tick();
 
   void setI(int what,int   val);
   void setF(int what,float val);

diff --git a/picoloop/Machine/MidiOutSystem/MidiOutMachine.cpp b/picoloop/Machine/MidiOutSystem/MidiOutMachine.cpp
@@ -309,7 +309,7 @@ void MidiOutMachine::reset()
 }
 
 
-int MidiOutMachine::tick()
+Sint16 MidiOutMachine::tick()
 {
   float  f_in;
   float  f_out;

diff --git a/picoloop/Machine/MidiOutSystem/MidiOutMachine.h b/picoloop/Machine/MidiOutSystem/MidiOutMachine.h
@@ -14,7 +14,7 @@ class MidiOutMachine : public Machine
 
   void init();
   void reset();
-  int  tick();
+  Sint16  tick();
 
   void setI(int what,int val);
   void setF(int what,float val);

diff --git a/picoloop/Machine/Open303/Open303Machine.cpp b/picoloop/Machine/Open303/Open303Machine.cpp
@@ -329,7 +329,7 @@ void Open303Machine::reset()
 }
 
 
-int Open303Machine::tick()
+Sint16 Open303Machine::tick()
 {
   double    f_in;
   Sint16 s_out;

diff --git a/picoloop/Machine/Open303/Open303Machine.h b/picoloop/Machine/Open303/Open303Machine.h
@@ -14,7 +14,7 @@ class Open303Machine : public Machine
 
   void init();
   void reset();
-  int  tick();
+  Sint16  tick();
 
   void setI(int what,int val);
   void setF(int what,float val);

diff --git a/picoloop/Machine/PBSynth/PBSynthMachine.cpp b/picoloop/Machine/PBSynth/PBSynthMachine.cpp
@@ -327,7 +327,7 @@ void PBSynthMachine::setI(int what,int val)
 
 }
 
-int PBSynthMachine::tick()
+Sint16 PBSynthMachine::tick()
 {
   Sint16 s_in;
   Sint32 s_in32;

diff --git a/picoloop/Machine/PBSynth/PBSynthMachine.h b/picoloop/Machine/PBSynth/PBSynthMachine.h
@@ -20,7 +20,7 @@ class PBSynthMachine : public Machine
 
   void init();
   void reset();
-  int  tick();
+  Sint16  tick();
 
   void setI(int what,int   val);
   void setF(int what,float val);

diff --git a/picoloop/Machine/Picodrum/PicodrumMachine.cpp b/picoloop/Machine/Picodrum/PicodrumMachine.cpp
@@ -279,7 +279,7 @@ void PicodrumMachine::reset()
 }
 
 
-int PicodrumMachine::tick()
+Sint16 PicodrumMachine::tick()
 {
   float  f_in;
   float  f_out;

diff --git a/picoloop/Machine/Picodrum/PicodrumMachine.h b/picoloop/Machine/Picodrum/PicodrumMachine.h
@@ -16,7 +16,7 @@ class PicodrumMachine : public Machine
 
   void init();
   void reset();
-  int  tick();
+  Sint16  tick();
 
   void setI(int what,int   val);
   void setF(int what,float val);

diff --git a/picoloop/Machine/Picosynth/PicosynthMachine.cpp b/picoloop/Machine/Picosynth/PicosynthMachine.cpp
@@ -329,7 +329,7 @@ void PicosynthMachine::reset()
 }
 
 
-int PicosynthMachine::tick()
+Sint16 PicosynthMachine::tick()
 {
   float  f_in;
   float  f_out;

diff --git a/picoloop/Machine/Picosynth/PicosynthMachine.h b/picoloop/Machine/Picosynth/PicosynthMachine.h
@@ -17,7 +17,7 @@ class PicosynthMachine : public Machine
 
   void init();
   void reset();
-  int  tick();
+  Sint16  tick();
 
   void setI(int what,int val);
   void setF(int what,float val);

diff --git a/picoloop/Machine/Twytch/TwytchsynthMachine.cpp b/picoloop/Machine/Twytch/TwytchsynthMachine.cpp
@@ -520,7 +520,7 @@ void TwytchsynthMachine::reset()
 }
 
 
-int TwytchsynthMachine::tick()
+Sint16 TwytchsynthMachine::tick()
 {
   float  f_in;
   float  f_out;

diff --git a/picoloop/Machine/Twytch/TwytchsynthMachine.h b/picoloop/Machine/Twytch/TwytchsynthMachine.h
@@ -14,7 +14,7 @@ class TwytchsynthMachine : public Machine
 
   void init();
   void reset();
-  int  tick();
+  Sint16  tick();
 
   void setI(int what,int val);
   void setF(int what,float val);

diff --git a/picoloop/Makefile.PatternPlayer_debian_RtAudio b/picoloop/Makefile.PatternPlayer_debian_RtAudio
@@ -18,7 +18,7 @@ CFLAGS= -c -O3 -D__LINUX__ -DLINUX -I. -LSDL/lib -D__RTAUDIO__ -DLINUX_DESKTOP -
 CFLAGS= -c -O3 -D__LINUX__ -DLINUX -I. -LSDL/lib -D__RTAUDIO__ -DLINUX_DESKTOP -ggdb   -DDUMP_AUDIO=1 -DFIXED
 CFLAGS= -c -std=c++11 -O3 -D__LINUX__ -DLINUX -I. -LSDL/lib -D__RTAUDIO__ -D __RTMIDI__ -DLINUX_DESKTOP -ggdb   -DDUMP_AUDIO=1  -fpermissive
 CFLAGS= -c -std=c++11 -O3 -D__LINUX__ -DLINUX -I. -LSDL/lib -D__RTAUDIO__ -D __RTMIDI__ -DLINUX_DESKTOP -ggdb   -DDUMP_AUDIO=1  -DDEBUGPRINTF -fpermissive
-CFLAGS= -c -std=c++11 -O3 -D__LINUX__ -DLINUX -I. -LSDL/lib -D__RTAUDIO__ -D __RTMIDI__ -DPC_DESKTOP -ggdb                   -DDEBUGPRINTF -DSCREEN_MULT=2 -fpermissive
+CFLAGS= -c -std=c++11 -O3 -D__LINUX__ -DLINUX -I. -LSDL/lib -D__RTAUDIO__ -D __RTMIDI__ -DPC_DESKTOP -ggdb                   -DDEBUGPRINTF -DSCREEN_MULT=2 -DDUMP_AUDIO=1 -fpermissive
 
 LDFLAGS=-lasound -lSDL -lSDL_gfx -lSDL_ttf -lpthread -pg
 LDFLAGS=-lasound -lSDL           -lSDL_ttf -lpthread -pg

diff --git a/picoloop/MonoMixer.cpp b/picoloop/MonoMixer.cpp
@@ -6,12 +6,19 @@ MonoMixer::MonoMixer(): PD(), PS(), OPLM(), PBS(), CS(), O303(), TW(), MD(), MID
 #endif
 
 #if   defined(__FPU__) && !defined(__RTMIDI__)
-MonoMixer::MonoMixer(): PD(), PS(), OPLM(), PBS(), CS(), O303(), TW(),                 FXDelay(), FXDisabled()
+MonoMixer::MonoMixer(): PD(), PS(), OPLM(), PBS(), CS(), O303(), TW(),                   FXDelay(), FXDisabled()
+#endif
+
+#if   !defined(__FPU__) && defined(__RTMIDI__)
+MonoMixer::MonoMixer(): PD(), PS(), OPLM(), PBS(),                           MIDIOUTM(), FXDelay(), FXDisabled()
 #endif
 
 #if  !defined(__FPU__) && !defined(__RTMIDI__)
 MonoMixer::MonoMixer(): PD(), PS(), OPLM(), PBS(),                                     FXDelay(), FXDisabled()
 #endif
+
+#define SAMMONOMIXER 32
+
 {
   DPRINTF("MonoMixer::MonoMixer()");  
   amplitude=127;
@@ -28,6 +35,10 @@ MonoMixer::MonoMixer(): PD(), PS(), OPLM(), PBS(),
 
   fx_depth=125;
   fx_speed=90;
+
+  index=0;
+  buffer16=NULL;
+  buffer32=NULL;
 }
 
 MonoMixer::~MonoMixer()
@@ -38,6 +49,8 @@ MonoMixer::~MonoMixer()
 
 void MonoMixer::init()
 {
+  int i=0;
+
   PS.init();
   PD.init();
   OPLM.init();
@@ -87,6 +100,16 @@ void MonoMixer::init()
   if (machine_type==SYNTH_MIDIOUT)
     M=&MIDIOUTM;
 #endif
+
+  if (buffer16==NULL)
+    buffer16=(Sint16*)malloc(sizeof(Sint16)*SAMMONOMIXER);
+  if (buffer32==NULL)
+    buffer32=(Sint32*)malloc(sizeof(Sint32)*SAMMONOMIXER);
+  for (i=0;i<SAMMONOMIXER;i++)
+    {
+      buffer16[i]=0;
+      buffer32[i]=0;
+    }
 }
 
 
@@ -180,16 +203,45 @@ Sint16 MonoMixer::tick()
   Sint32 res32=0;
   Sint16 tick=0;
   Sint16 res16=0;
+  int    i=0;
   //tick=M->tick();
   //tick=FX.process(M->tick());
   //tick=FXDelay.process(M->tick());
 
-  tick=FX->process(M->tick());
-  res32=tick*amplitude;
+  if (index+1<SAMMONOMIXER)
+    {
+      index++;
+      return buffer16[index];
+    }
+
+  for (i=0;i<SAMMONOMIXER;i++)
+    {
+      buffer32[i]=0;
+      buffer32[i]=M->tick();
+    }
+
+  for (i=0;i<SAMMONOMIXER;i++)
+    buffer32[i]=FX->process(buffer32[i]);
+
+
+  for (i=0;i<SAMMONOMIXER;i++)
+    {
+      buffer32[i]=(buffer32[i]*amplitude) >> 4;
+      if (buffer32[i]>32000) buffer32[i]=32000;
+      if (buffer32[i]<-32000) buffer32[i]=-32000;
+    }
+  for (i=0;i<SAMMONOMIXER;i++)
+    buffer16[i]=(Sint16)buffer32[i];
+
+  index=0;
+  return buffer16[index];
+
+  //tick=FX->process(M->tick());
+  //res32=tick*amplitude;
   //  res32=tick*127;
   //res32=res32/127;
 
-  res32=res32>>4;
+  //res32=res32>>4;
 
   //if (res32>32000)  res32=32000-(res32>>6);
   //if (res32<-32000) res32=-32000+(res32>>6);

diff --git a/picoloop/MonoMixer.h b/picoloop/MonoMixer.h
@@ -64,6 +64,10 @@ class MonoMixer
 
   int                   fx_depth;
   int                   fx_speed;
+
+  int                   index;
+  Sint16                * buffer16;
+  Sint32                * buffer32;
 };