rename 'mode1' to 'algo'

src/instr_bd2.cc

@@ -44,12 +44,12 @@ namespace Heck {
             }
         }
 
-        void BD2::switch_mode1(unsigned int pos)
+        void BD2::switch_algo(unsigned int pos)
         {
             mode1 = pos;
         }
 
-        void BD2::switch_mode2(unsigned int pos)
+        void BD2::switch_mode(unsigned int pos)
         {
             mode2 = pos;
         }

src/instr_bd2.hh

@@ -12,8 +12,8 @@ namespace Heck {
             void init();
             void trigger() override;
             void ctl(unsigned int ctl_nr, float val) override;
-            void switch_mode1(unsigned int pos) override;
+            void switch_algo(unsigned int pos) override;
-            void switch_mode2(unsigned int pos) override;
+            void switch_mode(unsigned int pos) override;
             float nextsample() override;
 
         private:

src/instr_fm.cc

@@ -41,8 +41,8 @@ namespace Heck {
             }
         }
 
-        void FM::switch_mode1(unsigned int pos) {}
+        void FM::switch_algo(unsigned int pos) {}
-        void FM::switch_mode2(unsigned int pos) {}
+        void FM::switch_mode(unsigned int pos) {}
 
         float FM::nextsample()
         {

src/instr_fm.hh

@@ -12,8 +12,8 @@ namespace Heck {
             void init();
             void trigger() override;
             void ctl(unsigned int ctl_nr, float val) override;
-            void switch_mode1(unsigned int pos) override;
+            void switch_algo(unsigned int pos) override;
-            void switch_mode2(unsigned int pos) override;
+            void switch_mode(unsigned int pos) override;
             float nextsample() override;
 
         private:

src/instr_grainlet.cc

@@ -37,12 +37,12 @@ namespace Heck {
             }
         }
 
-        void Grainlet::switch_mode1(unsigned int pos)
+        void Grainlet::switch_algo(unsigned int pos)
         {
             mode1 = pos;
         }
 
-        void Grainlet::switch_mode2(unsigned int pos)
+        void Grainlet::switch_mode(unsigned int pos)
         {
             mode2 = pos;
         }

src/instr_grainlet.hh

@@ -12,8 +12,8 @@ namespace Heck {
             void init();
             void trigger() override;
             void ctl(unsigned int ctl_nr, float val) override;
-            void switch_mode1(unsigned int pos) override;
+            void switch_algo(unsigned int pos) override;
-            void switch_mode2(unsigned int pos) override;
+            void switch_mode(unsigned int pos) override;
             float nextsample() override;
         private:
             dsp::GrainletOscillator grainlet{};

src/instr_hihat.cc

@@ -39,12 +39,12 @@ namespace Heck {
             }
         }
 
-        void HiHat::switch_mode1(unsigned int pos)
+        void HiHat::switch_algo(unsigned int pos)
         {
             mode1 = pos;
         }
 
-        void HiHat::switch_mode2(unsigned int pos)
+        void HiHat::switch_mode(unsigned int pos)
         {
             mode2 = pos;
         }

src/instr_hihat.hh

@@ -12,8 +12,8 @@ namespace Heck {
             void init();
             void trigger() override;
             void ctl(unsigned int ctl_nr, float val) override;
-            void switch_mode1(unsigned int pos) override;
+            void switch_algo(unsigned int pos) override;
-            void switch_mode2(unsigned int pos) override;
+            void switch_mode(unsigned int pos) override;
             float nextsample() override;
 
         private:

src/instr_interface.hh

@@ -14,8 +14,8 @@ namespace Heck {
             virtual void ctl(unsigned int ctl_nr, float val) = 0;
 
             // pos must be either 0,1,2
-            virtual void switch_mode1(unsigned int pos) = 0;
+            virtual void switch_algo(unsigned int pos) = 0;
-            virtual void switch_mode2(unsigned int pos) = 0;
+            virtual void switch_mode(unsigned int pos) = 0;
             virtual float nextsample() = 0;
         private:
         };

src/instr_kick.cc

@@ -55,12 +55,12 @@ namespace Heck {
                 } break;
             }
         }
-        void Kick::switch_mode1(unsigned int pos)
+        void Kick::switch_algo(unsigned int pos)
         {
             mode1 = pos;
         }
 
-        void Kick::switch_mode2(unsigned int pos)
+        void Kick::switch_mode(unsigned int pos)
         {
             mode2 = pos;
         }

src/instr_kick.hh

@@ -12,8 +12,8 @@ namespace Heck {
             void init();
             void trigger() override;
             void ctl(unsigned int ctl_nr, float val) override;
-            void switch_mode1(unsigned int pos) override;
+            void switch_algo(unsigned int pos) override;
-            void switch_mode2(unsigned int pos) override;
+            void switch_mode(unsigned int pos) override;
             float nextsample() override;
         private:
             dsp::Oscillator osc;

src/instr_noise.cc

@@ -25,8 +25,8 @@ namespace Heck {
         }
 
         void Noise::ctl(unsigned int ctl_nr, float val) {}
-        void Noise::switch_mode1(unsigned int pos) {}
+        void Noise::switch_algo(unsigned int pos) {}
-        void Noise::switch_mode2(unsigned int pos) {}
+        void Noise::switch_mode(unsigned int pos) {}
 
         float Noise::nextsample()
         {

src/instr_noise.hh

@@ -13,8 +13,8 @@ namespace Heck {
 
             void trigger() override;
             void ctl(unsigned int ctl_nr, float val) override;
-            void switch_mode1(unsigned int pos) override;
+            void switch_algo(unsigned int pos) override;
-            void switch_mode2(unsigned int pos) override;
+            void switch_mode(unsigned int pos) override;
 
             float nextsample() override;
         private:

src/instr_zosc.cc

@@ -38,14 +38,14 @@ namespace Heck {
             }
         }
 
-        void ZOsc::switch_mode1(unsigned int pos)
+        void ZOsc::switch_algo(unsigned int pos)
         {
             mode1 = pos;
             zosc.SetMode(((float)pos) / 3.);
             seed.PrintLine("");
         }
 
-        void ZOsc::switch_mode2(unsigned int pos)
+        void ZOsc::switch_mode(unsigned int pos)
         {
             mode2 = pos;
             seed.PrintLine("ZOSC MODE2: %i", mode2);

src/instr_zosc.hh

@@ -12,8 +12,8 @@ namespace Heck {
             void init();
             void trigger() override;
             void ctl(unsigned int ctl_nr, float val) override;
-            void switch_mode1(unsigned int pos) override;
+            void switch_algo(unsigned int pos) override;
-            void switch_mode2(unsigned int pos) override;
+            void switch_mode(unsigned int pos) override;
             float nextsample() override;
 
         private:

src/main_osp.cc

@@ -196,11 +196,11 @@ namespace Heck {
                             tracks[cc.channel].volume(val_normalized);
                             break;
                             // Switches
-                        case Constants::MIDI_Mapping::TRACK_MODE1:
+                        case Constants::MIDI_Mapping::TRACK_ALGO:
-                            tracks[cc.channel].instrument->switch_mode1(int(val_normalized * 2.));
+                            tracks[cc.channel].instrument->switch_algo(int(val_normalized * 2.));
                             break;
-                        case Constants::MIDI_Mapping::TRACK_MODE2:
+                        case Constants::MIDI_Mapping::TRACK_MODE:
-                            tracks[cc.channel].instrument->switch_mode2(int(val_normalized * 2.));
+                            tracks[cc.channel].instrument->switch_mode(int(val_normalized * 2.));
                             break;
                         case Constants::MIDI_Mapping::TRACK_FILTERMODE:
                             tracks[cc.channel].filtermode(val_normalized);

src/main_osp.hh

@@ -26,13 +26,13 @@ namespace Heck {
             constexpr int TRACK_FILTER = 74;
             constexpr int TRACK_DRIVE = 75;
             constexpr int TRACK_VOLUME = 76;
-            constexpr int TRACK_MODE1 = 78;
+            constexpr int TRACK_ALGO = 78;
-            constexpr int TRACK_MODE2 = 79;
+            constexpr int TRACK_MODE = 79;
             constexpr int TRACK_FILTERMODE = 80;
         } // namespace MIDI_Mapping
 
         namespace Developer {
-            constexpr bool LOG_BLOCKS_BOOT = false;
+            constexpr bool LOG_BLOCKS_BOOT = true;
             constexpr bool LOG_MIDI_REALTIME = false;
             constexpr bool LOG_MIDI_NOTESANDCC = false;
             constexpr bool LOG_CLOCK_BAR = false;