diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d656af..c1802f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,6 +127,6 @@ if (WIN32) else() target_include_directories(metabolus PRIVATE ${RTAUDIO_INCLUDE_DIRS} ${RTMIDI_INCLUDE_DIRS}) - target_link_libraries(metabolus PRIVATE Qt6::Widgets ${RTAUDIO_LIBRARIES} ${RTMIDI_LIBARARIES}) + target_link_libraries(metabolus PRIVATE Qt6::Widgets ${RTAUDIO_LIBRARIES} ${RTMIDI_LIBRARIES}) target_compile_options(metabolus PRIVATE ${RTAUDIO_CFLAGS_OTHER}) endif() diff --git a/src/MidiController.cpp b/src/MidiController.cpp index 982ab70..bd5fdcb 100644 --- a/src/MidiController.cpp +++ b/src/MidiController.cpp @@ -5,10 +5,11 @@ MidiController::MidiController(NoteQueue& queue) : noteQueue_(queue) { try { midiIn_ = std::make_unique(); - midiIn_->ignoreTypes(false, false, false); + midiIn_->ignoreTypes(false, true, false); } catch (RtMidiError& e) { std::cerr << "RtMidi init failed: " << e.getMessage() << std::endl; } + } MidiController::~MidiController() { @@ -72,7 +73,4 @@ void MidiController::handleMessage(const std::vector& msg) { 0.0f }); } - - // to have a peak :) - std::cout << msg[0] << std::endl; } \ No newline at end of file diff --git a/src/ParameterStore.h b/src/ParameterStore.h index 30c1d40..3923b81 100644 --- a/src/ParameterStore.h +++ b/src/ParameterStore.h @@ -75,12 +75,12 @@ constexpr std::array(ParamId::Count)> PARAM_DE { 0.05f, 0.0f, 2.0f}, // FilterCutoffEnvA { 0.05f, 0.0f, 2.0f}, // FilterCutoffEnvD { 2.0f, 0.0f, 1.0f}, // FilterCutoffEnvS - { 0.05f, 0.0f, 2.0f}, // FilterCutoffEnvR + { 0.08f, 0.0f, 2.0f}, // FilterCutoffEnvR { 1.414f, 0.0f, 8.0f}, // FilterResonanceDepth { 0.05f, 0.0f, 2.0f}, // FilterResonanceEnvA { 0.05f, 0.0f, 2.0f}, // FilterResonanceEnvD { 0.5f, 0.0f, 1.0f}, // FilterResonanceEnvS - { 0.05f, 0.0f, 2.0f}, // FilterResonanceEnvR + { 0.10f, 0.0f, 2.0f}, // FilterResonanceEnvR }}; constexpr size_t PARAM_COUNT = static_cast(ParamId::Count); diff --git a/src/synth/AudioEngine.h b/src/synth/AudioEngine.h index 82ae17e..a51f21b 100644 --- a/src/synth/AudioEngine.h +++ b/src/synth/AudioEngine.h @@ -41,7 +41,7 @@ private: RtAudio audio_; // audio device // TODO: id like a yml config file or something for these uint32_t sampleRate_ = 44100; - uint32_t bufferFrames_ = 256; // time per buffer = BF/SR (256/44100 = 5.8ms) + uint32_t bufferFrames_ = 128; // time per buffer = BF/SR (256/44100 = 5.8ms) uint32_t channels_ = 2; // stereo }; diff --git a/src/ui/MainWindow.cpp b/src/ui/MainWindow.cpp index b1db327..185d7c4 100644 --- a/src/ui/MainWindow.cpp +++ b/src/ui/MainWindow.cpp @@ -51,6 +51,8 @@ MainWindow::MainWindow(QWidget *parent) : // synth business audio_->start(); + // midi + midi_.openPort(1); // TODO: error check } MainWindow::~MainWindow() {