diff --git a/src/instr_bd2.hh b/src/instr_bd2.hh index a556f48..d7b4305 100644 --- a/src/instr_bd2.hh +++ b/src/instr_bd2.hh @@ -2,8 +2,6 @@ #define HECK_OSP_INSTR_BD2_HH #include "instr_interface.hh" -#include "daisy_seed.h" -#include "daisysp.h" namespace Heck { namespace Instrument { diff --git a/src/instr_fm.hh b/src/instr_fm.hh index 7252543..cc9d740 100644 --- a/src/instr_fm.hh +++ b/src/instr_fm.hh @@ -2,8 +2,6 @@ #define HECK_OSP_INSTR_FM_HH #include "instr_interface.hh" -#include "daisy_seed.h" -#include "daisysp.h" namespace Heck { namespace Instrument { diff --git a/src/instr_grainlet.hh b/src/instr_grainlet.hh index 6a8245d..bee0503 100644 --- a/src/instr_grainlet.hh +++ b/src/instr_grainlet.hh @@ -2,8 +2,6 @@ #define HECK_OSP_INSTR_GRAINLET_HH #include "instr_interface.hh" -#include "daisy_seed.h" -#include "daisysp.h" namespace Heck { namespace Instrument { diff --git a/src/instr_hihat.hh b/src/instr_hihat.hh index 4a6f870..21dcbd8 100644 --- a/src/instr_hihat.hh +++ b/src/instr_hihat.hh @@ -2,8 +2,6 @@ #define HECK_OSP_INSTR_HIHAT_HH #include "instr_interface.hh" -#include "daisy_seed.h" -#include "daisysp.h" namespace Heck { namespace Instrument { diff --git a/src/instr_kick.hh b/src/instr_kick.hh index 5967df8..365e6c9 100644 --- a/src/instr_kick.hh +++ b/src/instr_kick.hh @@ -2,8 +2,6 @@ #define HECK_OSP_INSTR_KICK_HH #include "instr_interface.hh" -#include "daisy_seed.h" -#include "daisysp.h" namespace Heck { namespace Instrument { diff --git a/src/instr_noise.hh b/src/instr_noise.hh index e705791..bfbcb5a 100644 --- a/src/instr_noise.hh +++ b/src/instr_noise.hh @@ -2,8 +2,6 @@ #define HECK_OSP_INSTR_NOISE_HH #include "instr_interface.hh" -#include "daisy_seed.h" -#include "daisysp.h" namespace Heck { namespace Instrument { diff --git a/src/instr_zosc.hh b/src/instr_zosc.hh index 3082916..1c930bc 100644 --- a/src/instr_zosc.hh +++ b/src/instr_zosc.hh @@ -2,8 +2,6 @@ #define HECK_OSP_INSTR_ZOSC_HH #include "instr_interface.hh" -#include "daisy_seed.h" -#include "daisysp.h" namespace Heck { namespace Instrument { diff --git a/src/main_osp.cc b/src/main_osp.cc index 18fceb3..1818e4e 100644 --- a/src/main_osp.cc +++ b/src/main_osp.cc @@ -45,7 +45,7 @@ namespace Heck { ld::AudioHandle::InterleavingOutputBuffer out, size_t size); - void midi_realtime_handler(ld::MidiEvent& msg); + void midi_realtime_handler(const ld::MidiEvent& msg); void init_tracks() @@ -142,7 +142,7 @@ namespace Heck { ld::ControlChangeEvent cc = msg.AsControlChange(); if (State::clear_mode) { ld::ControlChangeEvent cc = msg.AsControlChange(); - hw.PrintLine("Clear: ch: %i, cc: %i",cc.channel,cc.control_number); + hw.PrintLine("Clear: ch: %i, cc: %i", cc.channel, cc.control_number); sequencer.clear_track_cc(cc.channel, cc.control_number); } else { sequencer.midi_in(msg); diff --git a/src/main_osp.hh b/src/main_osp.hh index 02d5485..5069d9f 100644 --- a/src/main_osp.hh +++ b/src/main_osp.hh @@ -15,7 +15,7 @@ namespace Heck { constexpr int PIN_BUTTON_CLEAR = 27; } - constexpr bool CPU_BOOST480MHZ = true; + constexpr bool CPU_BOOST480MHZ = false; constexpr int AUDIO_BUFFERSIZE = 4; constexpr Samplerate AUDIO_SAMPLERATE = Samplerate::SAI_48KHZ; constexpr int TRACK_COUNT = 4; diff --git a/src/track.hh b/src/track.hh index 8c56177..caa45a2 100644 --- a/src/track.hh +++ b/src/track.hh @@ -65,8 +65,9 @@ namespace Heck { void filter(float val) { - float ladder_freq = 80 + (val * 9000); - ladder_.SetFreq(val * ladder_freq); + val *= val; + float ladder_freq = 80. + (val * 30000.); + ladder_.SetFreq(ladder_freq); } void drive(float amt)