Merge branch 'main' into add-component-test-coverage-v2

Arbaaz123676 · web-flow · commit 49e2e6266f2a · 2026-06-03T12:19:41.000+05:30
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.16)
 project(Amplitron VERSION 1.0.0 LANGUAGES CXX C)
 include(GNUInstallDirs)
 
+enable_testing()
+
 set(AMPLITRON_VERSION "0.0.0" CACHE STRING "Application version (set by CI)")
 
 set(CMAKE_CXX_STANDARD 17)
@@ -27,7 +29,7 @@ if(EMSCRIPTEN)
 elseif(MSVC)
     add_compile_options(/W4 /fp:fast)
     if(CMAKE_BUILD_TYPE STREQUAL "Release")
-        add_compile_options(/O2 /arch:AVX)
+        add_compile_options("$<$<CONFIG:Release>:/O2>")
     endif()
 else()
     add_compile_options(-Wall -Wextra -ffast-math)
@@ -49,6 +51,10 @@ endif()
 # Single-header C++17 JSON library used for preset serialization /
 # deserialization.  We disable nlohmann's own tests and install rules so
 # they don't pollute the Amplitron build.
+
+# Suppress cmake_minimum_required deprecation warnings from fetched deps
+set(CMAKE_WARN_DEPRECATED OFF CACHE BOOL "" FORCE)
+
 find_package(nlohmann_json QUIET)
 if(NOT nlohmann_json_FOUND)
     include(FetchContent)
@@ -64,6 +70,19 @@ if(NOT nlohmann_json_FOUND)
 endif()
 # ---------------------------------------------------------------------------
 
+find_package(GTest QUIET)
+if(NOT TARGET GTest::gtest AND NOT EMSCRIPTEN AND NOT ANDROID AND NOT IOS)
+    include(FetchContent)
+    FetchContent_Declare(
+        googletest
+        GIT_REPOSITORY https://github.com/google/googletest.git
+        GIT_TAG        release-1.12.1
+        GIT_SHALLOW    TRUE
+    )
+    set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+    FetchContent_MakeAvailable(googletest)
+endif()
+
 file(MAKE_DIRECTORY "${CMAKE_SOURCE_DIR}/external")
 if(NOT EXISTS "${CMAKE_SOURCE_DIR}/external/nanosvg.h" OR
    NOT EXISTS "${CMAKE_SOURCE_DIR}/external/nanosvgrast.h" OR
@@ -81,6 +100,29 @@ endif()
 if(NOT EMSCRIPTEN AND NOT ANDROID AND NOT IOS)
 
 # PortAudio
+find_package(portaudio CONFIG QUIET)
+if(TARGET portaudio)
+    set(PORTAUDIO_FOUND TRUE)
+    set(PORTAUDIO_LIBRARIES portaudio)
+else()
+    find_package(PkgConfig QUIET)
+    if(PkgConfig_FOUND)
+        pkg_check_modules(PORTAUDIO portaudio-2.0)
+    endif()
+    if(NOT PORTAUDIO_FOUND)
+        find_path(PORTAUDIO_INCLUDE_DIRS portaudio.h
+            PATHS /usr/include /usr/local/include /opt/homebrew/include
+                  "C:/Program Files/portaudio/include"
+                  "${CMAKE_SOURCE_DIR}/external/portaudio/include")
+        find_library(PORTAUDIO_LIBRARIES NAMES portaudio portaudio_x64
+            PATHS /usr/lib /usr/local/lib /opt/homebrew/lib
+                  "C:/Program Files/portaudio/lib"
+                  "${CMAKE_SOURCE_DIR}/external/portaudio/lib")
+    endif()
+    if(PORTAUDIO_LIBRARY_DIRS)
+        link_directories(${PORTAUDIO_LIBRARY_DIRS})
+    endif()
+endif() 
 find_package(PkgConfig QUIET)
 if(PkgConfig_FOUND)
     pkg_check_modules(PORTAUDIO portaudio-2.0)
@@ -123,7 +165,7 @@ if(PkgConfig_FOUND)
     pkg_check_modules(SDL2 sdl2)
 endif()
 if(NOT SDL2_FOUND)
-    find_package(SDL2 QUIET)
+    find_package(SDL2 CONFIG QUIET)
     if(SDL2_FOUND)
         set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIRS})
         set(SDL2_LIBRARIES SDL2::SDL2 SDL2::SDL2main)
@@ -152,7 +194,7 @@ if(NOT RTMIDI_LIBRARIES)
         pkg_check_modules(RTMIDI rtmidi)
     endif()
     if(NOT RTMIDI_FOUND)
-        find_path(RTMIDI_INCLUDE_DIRS rtmidi/RtMidi.h
+        find_path(RTMIDI_INCLUDE_DIRS NAMES RtMidi.h rtmidi/RtMidi.h
             PATHS /usr/include /usr/local/include /opt/homebrew/include
                   "C:/Program Files/rtmidi/include"
                   "${CMAKE_SOURCE_DIR}/external/rtmidi")
@@ -680,6 +722,7 @@ else() # NOT EMSCRIPTEN, ANDROID, or IOS
         tests/unit/test_effects_modulation.cpp
         tests/unit/test_effects_spatial.cpp
         tests/unit/test_effects_pitch.cpp
+        tests/unit/test_pitch_shifter.cpp
         tests/unit/test_effects_utility.cpp
         tests/unit/test_looper.cpp
         tests/unit/test_theme.cpp
diff --git a/src/audio/effects/distortion.cpp b/src/audio/effects/distortion.cpp
@@ -45,7 +45,7 @@ void Distortion::process(float* buffer, int num_samples) {
         float x_hard = hard_clip(x, 1.0f);
 
         // Blend: more drive → more hard clipping
-        float hard_amount = (drive - 1.0f) / 19.0f; // 0 at drive=1, 1 at drive=20
+        float hard_amount = (drive - params_[0].min_val) / (params_[0].max_val - params_[0].min_val);
         x = x_soft * (1.0f - hard_amount) + x_hard * hard_amount;
 
         // Tone filter (one-pole LP)
diff --git a/src/audio/effects/pitch_shifter.cpp b/src/audio/effects/pitch_shifter.cpp
@@ -20,6 +20,15 @@ static float wrap_phase(float phase, int buf_size) {
     return phase;
 }
 
+void PitchShifter::build_hann_lut() {
+
+    for (size_t i = 0; i < hann_lut_.size(); ++i) {
+        // Calculates the Hann window curve once and stores it.
+        // Assumes TWO_PI is already defined
+        hann_lut_[i] = 0.5f * (1.0f - std::cos(TWO_PI * static_cast<float>(i) / 8192.0f));
+    }
+}
+
 PitchShifter::PitchShifter() {
     params_ = {
         {"Shift", 0.0f, -12.0f, 12.0f, 0.0f, "st",
@@ -29,6 +38,10 @@ PitchShifter::PitchShifter() {
         {"Mix",   0.0f,   0.0f,  1.0f, 0.0f, "",
          "Dry/wet blend. 0 = fully dry, 1 = fully pitch-shifted."},
     };
+
+    // --- CALL OPTIMIZATION ---
+    build_hann_lut();
+
     set_sample_rate(DEFAULT_SAMPLE_RATE);
 }
 
@@ -52,30 +65,37 @@ float PitchShifter::read_linear(float phase) const {
 void PitchShifter::process(float* buffer, int num_samples) {
     if (!enabled_) return;
 
-    const float alpha = 1.0f - std::exp(-1.0f / (sample_rate_ * 0.010f));
+    if (mix_smooth_ < 0.001f && params_[P_MIX].value < 0.001f) {
+        // We process in-place, so the input buffer is already the output buffer. 
+        // Exit immediately
+        return; 
+    }
+    
+    // Smooth parameters
+    // Hoisting: Calculate smoothing and std::pow ONCE per block, not per sample
+    const float block_alpha = 1.0f - std::exp(-static_cast<float>(num_samples) / (sample_rate_ * 0.010f));
+    shift_smooth_ += block_alpha * (params_[P_SHIFT].value - shift_smooth_);
+    fine_smooth_  += block_alpha * (params_[P_FINE].value  - fine_smooth_);
+    mix_smooth_   += block_alpha * (params_[P_MIX].value   - mix_smooth_);
 
-    for (int i = 0; i < num_samples; ++i) {
-        const float dry = buffer[i];
+    // Total shift in semitones (coarse + fine)
+    float total_semitones = shift_smooth_ + fine_smooth_ / 100.0f;
 
-        // Write input into circular grain buffer
-        grain_buf_[write_pos_] = dry;
+    // Pitch ratio: 2^(semitones/12)
+    float ratio = std::pow(2.0f, total_semitones / 12.0f);
 
-        // Smooth parameters
-        shift_smooth_ += alpha * (params_[P_SHIFT].value - shift_smooth_);
-        fine_smooth_  += alpha * (params_[P_FINE].value  - fine_smooth_);
-        mix_smooth_   += alpha * (params_[P_MIX].value   - mix_smooth_);
+    // Read pointer increment: how much faster/slower we read vs write
+    // ratio > 1 means pitch up -> read faster -> increment > 1
+    // We want the *offset* from write to change, so increment = 1 - ratio
+    // gives us the drift rate of the read pointer relative to write.
+    float drift = 1.0f - ratio;
 
-        // Total shift in semitones (coarse + fine)
-        float total_semitones = shift_smooth_ + fine_smooth_ / 100.0f;
 
-        // Pitch ratio: 2^(semitones/12)
-        float ratio = std::pow(2.0f, total_semitones / 12.0f);
+    for (int i = 0; i < num_samples; ++i) {
+        const float dry = buffer[i];
 
-        // Read pointer increment: how much faster/slower we read vs write
-        // ratio > 1 means pitch up -> read faster -> increment > 1
-        // We want the *offset* from write to change, so increment = 1 - ratio
-        // gives us the drift rate of the read pointer relative to write.
-        float drift = 1.0f - ratio;
+        // Write input into circular grain buffer
+        grain_buf_[write_pos_] = dry;
 
         // Advance read phases (they drift relative to write position)
         read_phase_a_ += drift;
@@ -99,8 +119,11 @@ void PitchShifter::process(float* buffer, int num_samples) {
         // Use read_phase_a_ as the crossfade driver: as it sweeps 0..buf_size_,
         // we fade A in for the first half and B in for the second half.
         float fade_pos = read_phase_a_ / static_cast<float>(buf_size_);
+
+        // LUT optimization: Fast array lookup with bitwise AND (& 8191)
+        int lut_idx = static_cast<int>(fade_pos * 8192.0f) & 8191;
         // Hann window for smooth crossfade
-        float gain_a = 0.5f * (1.0f - std::cos(TWO_PI * fade_pos));
+        float gain_a = hann_lut_[lut_idx];
         float gain_b = 1.0f - gain_a;
 
         float wet = tap_a * gain_a + tap_b * gain_b;
diff --git a/src/audio/effects/pitch_shifter.h b/src/audio/effects/pitch_shifter.h
@@ -7,6 +7,7 @@
 
 #include "audio/effects/effect.h"
 #include <vector>
+#include <array>
 
 namespace Amplitron {
 
@@ -47,6 +48,16 @@ class PitchShifter : public Effect {
     float fine_smooth_ = 0.0f;
     float mix_smooth_ = 0.0f;
 
+    // --- NEW OPTIMIZATION VARIABLES ---
+    // Adds the function to pre-calculate the cosine math
+    void build_hann_lut();
+
+    // 8192 is a power of 2 (allows fast bitwise wrapping) and fits easily in L1 cache
+    std::array<float, 8192> hann_lut_; 
+    
+    // Cached pitch ratio to avoid per-sample pow()
+    float ratio_ = 1.0f;
+
     float read_linear(float phase) const;
 };
 
diff --git a/src/audio/engine/audio_engine.h b/src/audio/engine/audio_engine.h
@@ -344,7 +344,7 @@ class AudioEngine {
     std::atomic<float> output_rms_{0.0f};
     std::atomic<bool> input_clipped_{false};
     std::atomic<bool> output_clipped_{false};
-    std::atomic<bool> analyzer_enabled_{false};
+    std::atomic<bool> analyzer_enabled_{true};
 
     // std::vector<std::shared_ptr<Effect>> effects_;
     std::vector<float>     process_buffer_;
diff --git a/src/audio/engine/audio_engine_process.cpp b/src/audio/engine/audio_engine_process.cpp
@@ -141,7 +141,6 @@ void AudioEngine::process_audio(const float* input, float* output, int frame_cou
 
     float out_gain = output_gain_.load(std::memory_order_relaxed);
     float peak_out = 0.0f;
-    constexpr float kTwoPi = 6.28318530718f;
     auto next_metronome_sample = [this]() -> float {
         
         metronome_bpm_smoothed_ += metronome_bpm_smooth_alpha_ * (metronome_bpm_ - metronome_bpm_smoothed_);
@@ -164,6 +163,7 @@ void AudioEngine::process_audio(const float* input, float* output, int frame_cou
         if (metronome_click_samples_remaining_ <= 0) {
             return 0.0f;
         }
+        static constexpr float kTwoPi = 6.28318530718f;
         float click = std::sin(metronome_click_phase_) * metronome_click_env_ * metronome_volume_smoothed_;
         metronome_click_phase_ += metronome_click_phase_inc_;
         if (metronome_click_phase_ >= kTwoPi) {
diff --git a/src/gui/gui_manager.cpp b/src/gui/gui_manager.cpp
@@ -48,6 +48,7 @@ GuiManager::GuiManager(AudioEngine& engine)
     pedal_board_ = std::make_unique<PedalBoard>(engine_, command_history_, &gui_midi_);
     gui_presets_.set_pedal_board(pedal_board_.get());
     gui_presets_.set_midi_manager(&midi_manager_);
+    gui_analyzer_.set_expanded(engine_.is_analyzer_enabled());
 }
 
 GuiManager::~GuiManager() {
diff --git a/src/gui/pedalboard/pedal_board_chain.cpp b/src/gui/pedalboard/pedal_board_chain.cpp
@@ -116,33 +116,17 @@ void PedalBoard::render_signal_chain() {
       ui_state.target_zoom = 1.0f;
     }
   }
-  if (ui_state.show_grid) {
-    float GRID_SZ = 32.0f * ui_state.zoom;
-    ImU32 GRID_COLOR = IM_COL32(36, 34, 30, 255);
-    for (float x = std::fmod(ui_state.scrolling.x, GRID_SZ); x < canvas_size.x;
-         x += GRID_SZ) {
-      draw_list->AddLine(ImVec2(canvas_pos.x + x, canvas_pos.y),
-                         ImVec2(canvas_pos.x + x, canvas_end.y), GRID_COLOR);
-    }
-    for (float y = std::fmod(ui_state.scrolling.y, GRID_SZ); y < canvas_size.y;
-         y += GRID_SZ) {
-      draw_list->AddLine(ImVec2(canvas_pos.x, canvas_pos.y + y),
-                         ImVec2(canvas_end.x, canvas_pos.y + y), GRID_COLOR);
-    }
-  }
-  draw_list->PushClipRect(canvas_pos, canvas_end, true);
-  ImVec2 offset = ImVec2(canvas_pos.x + ui_state.scrolling.x,
-                         canvas_pos.y + ui_state.scrolling.y);
-  std::unordered_map<int, ImVec2> pin_positions_cache;
-  int node_to_delete = -1; // Safely track deletions outside the render loop
-  // Prune stale nodes from the UI state if the backend graph was reset or
-  // rebuilt
   std::vector<int> stale_ids;
-  for (auto &pair : ui_state.node_positions) {
-    if (!audio_graph.find_node(pair.first)) {
-      stale_ids.push_back(pair.first);
+  for (auto it = ui_state.node_positions.begin(); it != ui_state.node_positions.end(); ) {
+    bool found = false;
+    for (const auto &node : audio_graph.get_nodes()) {
+      if (node.id == it->first) { found = true; break; }
     }
+    if (!found) { stale_ids.push_back(it->first); it = ui_state.node_positions.erase(it); }
+    else ++it;
   }
+  draw_list->PushClipRect(canvas_pos, canvas_end, true);
+  ImVec2 offset(canvas_pos.x + ui_state.scrolling.x, canvas_pos.y + ui_state.scrolling.y);
   for (int id : stale_ids) {
     ui_state.node_positions.erase(id);
   }
@@ -178,6 +162,8 @@ void PedalBoard::render_signal_chain() {
   float level = engine_.get_output_level();
   float time = (float)ImGui::GetTime();
   bool is_running = engine_.is_running();
+  int node_to_delete = -1;
+  std::unordered_map<int, ImVec2> pin_positions_cache;
   for (const auto &node : audio_graph.get_nodes()) {
     auto &node_layout = ui_state.node_positions[node.id];
     ImVec2 node_screen_pos =
@@ -260,14 +246,57 @@ void PedalBoard::render_signal_chain() {
           node_layout.is_dragging = true;
           node_layout.drag_start_pos = node_layout.position;
         }
-        node_layout.position.x += ImGui::GetIO().MouseDelta.x / ui_state.zoom;
-        node_layout.position.y += ImGui::GetIO().MouseDelta.y / ui_state.zoom;
-      } else if (node_layout.is_dragging && ImGui::IsItemDeactivated()) {
-        node_layout.is_dragging = false;
-        if (node_layout.position.x != node_layout.drag_start_pos.x ||
-            node_layout.position.y != node_layout.drag_start_pos.y) {
-          history_.push_executed(std::make_unique<MoveGraphNodeCommand>(
-              node.id, node_layout.drag_start_pos, node_layout.position));
+        float node_width = (target_widget ? (is_mb_comp ? 190.0f * 2.2f : 190.0f) : 110.0f) * ui_state.zoom;
+        float node_height = (target_widget ? 360.0f : 70.0f) * ui_state.zoom;
+        ImGui::PushID(node.id);
+        if (target_widget) {
+            ImGui::SetCursorScreenPos(node_screen_pos);
+            ImGui::BeginGroup();
+            ImGui::SetWindowFontScale(ui_state.zoom);
+            target_widget->render(ui_state.zoom); 
+            ImGui::SetWindowFontScale(1.0f);
+            ImGui::EndGroup();
+            ImGui::SetCursorScreenPos(node_screen_pos);
+            ImGui::SetNextItemAllowOverlap(); 
+            ImGui::InvisibleButton("native_drag_handle", ImVec2(node_width - 25.0f * ui_state.zoom, 30.0f * ui_state.zoom));
+            if (ImGui::IsItemActive() && ImGui::IsMouseDragging(ImGuiMouseButton_Left)) {
+                if (!node_layout.is_dragging) {
+                    node_layout.is_dragging = true;
+                    node_layout.drag_start_pos = node_layout.position;
+                }
+                node_layout.position.x += ImGui::GetIO().MouseDelta.x / ui_state.zoom;
+                node_layout.position.y += ImGui::GetIO().MouseDelta.y / ui_state.zoom;
+            } else if (node_layout.is_dragging && ImGui::IsItemDeactivated()) {
+                node_layout.is_dragging = false;
+                if (node_layout.position.x != node_layout.drag_start_pos.x || node_layout.position.y != node_layout.drag_start_pos.y) {
+                    history_.push_executed(std::make_unique<MoveGraphNodeCommand>(node.id, node_layout.drag_start_pos, node_layout.position));
+                }
+            }
+        } else {
+            ImVec2 node_end = ImVec2(node_screen_pos.x + node_width, node_screen_pos.y + node_height);
+            ImU32 bg_color = IM_COL32(50, 35, 60, 255);
+            draw_list->AddRectFilled(node_screen_pos, node_end, bg_color, Theme::ROUNDING_MD * ui_state.zoom);
+            draw_list->AddRect(node_screen_pos, node_end, IM_COL32(180, 140, 80, 180), Theme::ROUNDING_MD * ui_state.zoom, 0, 1.5f * ui_state.zoom);
+            ImGui::SetCursorScreenPos(node_screen_pos);
+            ImGui::SetNextItemAllowOverlap();
+            ImGui::InvisibleButton("util_drag_handle", ImVec2(node_width - 25.0f * ui_state.zoom, node_height));
+            if (ImGui::IsItemActive() && ImGui::IsMouseDragging(ImGuiMouseButton_Left)) {
+                if (!node_layout.is_dragging) {
+                    node_layout.is_dragging = true;
+                    node_layout.drag_start_pos = node_layout.position;
+                }
+                node_layout.position.x += ImGui::GetIO().MouseDelta.x / ui_state.zoom;
+                node_layout.position.y += ImGui::GetIO().MouseDelta.y / ui_state.zoom;
+            } else if (node_layout.is_dragging && ImGui::IsItemDeactivated()) {
+                node_layout.is_dragging = false;
+                if (node_layout.position.x != node_layout.drag_start_pos.x || node_layout.position.y != node_layout.drag_start_pos.y) {
+                    history_.push_executed(std::make_unique<MoveGraphNodeCommand>(node.id, node_layout.drag_start_pos, node_layout.position));
+                }
+            }
+            ImVec2 text_pos = ImVec2(node_screen_pos.x + 12.0f * ui_state.zoom, node_screen_pos.y + 25.0f * ui_state.zoom);
+            ImGui::SetWindowFontScale(ui_state.zoom);
+            draw_list->AddText(text_pos, IM_COL32(255, 255, 255, 255), node.name.c_str());
+            ImGui::SetWindowFontScale(1.0f);
         }
       }
       ImVec2 text_pos = ImVec2(node_screen_pos.x + 12.0f * ui_state.zoom, node_screen_pos.y + 25.0f * ui_state.zoom);
diff --git a/src/gui/views/gui_analyzer.cpp b/src/gui/views/gui_analyzer.cpp
@@ -142,7 +142,8 @@ void GuiAnalyzer::render() {
     float panel_h = expanded_ ? 230.0f : 34.0f;
     ImGui::BeginChild("AnalyzerPanel", ImVec2(0, panel_h), true, ImGuiWindowFlags_NoScrollbar);
 
-    const bool expanded = ImGui::CollapsingHeader("Real-Time Analyzer", ImGuiTreeNodeFlags_DefaultOpen);
+    ImGui::SetNextItemOpen(expanded_, ImGuiCond_Once);
+    const bool expanded = ImGui::CollapsingHeader("Real-Time Analyzer");
     if (expanded != expanded_) {
         expanded_ = expanded;
         if (p.on_expanded_changed) p.on_expanded_changed(expanded_);
diff --git a/src/gui/views/gui_analyzer.h b/src/gui/views/gui_analyzer.h
diff --git a/tests/test_framework.h b/tests/test_framework.h
diff --git a/tests/ui/test_pedal_board.cpp b/tests/ui/test_pedal_board.cpp
diff --git a/tests/unit/test_pitch_shifter.cpp b/tests/unit/test_pitch_shifter.cpp

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ GuiManager::GuiManager(AudioEngine& engine)`
`48`	`48`	`pedal_board_ = std::make_unique<PedalBoard>(engine_, command_history_, &gui_midi_);`
`49`	`49`	`gui_presets_.set_pedal_board(pedal_board_.get());`
`50`	`50`	`gui_presets_.set_midi_manager(&midi_manager_);`
	`51`	`+ gui_analyzer_.set_expanded(engine_.is_analyzer_enabled());`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`GuiManager::~GuiManager() {`