Merge branch 'main' of https://github.com/sudip-mondal-2002/Amplitron

Author: sudip-mondal-2002

.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
 
       - name: Resolve PR number from head branch
         id: resolve-pr
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             const headSha    = '${{ github.event.workflow_run.head_sha }}';
@@ -99,7 +99,7 @@ jobs:
 
       - name: Check pull request state
         id: pr-state
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             const { owner, repo } = context.repo;
@@ -124,7 +124,7 @@ jobs:
 
       - name: Comment preview URL on PR
         if: steps.pr-state.outputs.state == 'open'
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         env:
           PR_NUMBER: ${{ steps.preview-meta.outputs.pr_number }}
           PREVIEW_URL: ${{ steps.preview-meta.outputs.preview_url }}
@@ -207,7 +207,7 @@ jobs:
 
       - name: Comment cleanup on PR
         if: steps.pages-checkout.outcome == 'success'
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             const marker = '<!-- amplitron-pr-preview -->';

.github/workflows/deploy-preview.yml

@@ -32,6 +32,22 @@ else()
     endif()
 endif()
 
+# --- nlohmann/json (header-only, fetched at configure time) ----------------
+# 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.
+include(FetchContent)
+FetchContent_Declare(
+    nlohmann_json
+    GIT_REPOSITORY https://github.com/nlohmann/json.git
+    GIT_TAG        v3.11.3
+    GIT_SHALLOW    TRUE
+)
+set(JSON_BuildTests OFF CACHE INTERNAL "Disable nlohmann/json tests")
+set(JSON_Install    OFF CACHE INTERNAL "Disable nlohmann/json install")
+FetchContent_MakeAvailable(nlohmann_json)
+# ---------------------------------------------------------------------------
+
 # --- Dependencies ---
 # Emscripten provides SDL2, OpenGL ES, and audio via built-in ports.
 # Native builds find PortAudio, SDL2, and OpenGL from the system.
@@ -151,6 +167,7 @@ set(APP_SOURCES
     src/audio/effects/equalizer.cpp
     src/audio/effects/noise_gate.cpp
     src/audio/effects/compressor.cpp
+    src/audio/effects/looper.cpp
     src/audio/effects/cabinet_sim.cpp
     src/audio/effects/ir_cabinet.cpp
     src/audio/effects/amp_simulator.cpp
@@ -274,6 +291,8 @@ if(EMSCRIPTEN)
     # OpenGL ES 3 for ImGui's OpenGL3 backend on WebGL 2
     target_compile_definitions(Amplitron PRIVATE IMGUI_IMPL_OPENGL_ES3 AMPLITRON_VERSION="${AMPLITRON_VERSION}" AMPLITRON_NO_MIDI)
 
+    target_link_libraries(Amplitron PRIVATE nlohmann_json::nlohmann_json)
+
     # Emscripten linker flags for Web Audio + AudioWorklet + SharedArrayBuffer
     target_link_options(Amplitron PRIVATE
         "-sWASM=1"
@@ -341,8 +360,9 @@ elseif(ANDROID)
     target_include_directories(main PRIVATE ${OBOE_INCLUDE_DIRS})
 
     target_link_libraries(main PRIVATE
-        ${OBOE_LIBRARIES}         # Google Oboe (AAudio/OpenSL ES low-latency)
-        SDL2::SDL2-static         # Still used for display / ImGui rendering
+        nlohmann_json::nlohmann_json
+        ${OBOE_LIBRARIES}
+        SDL2::SDL2-static
         android
         log
         EGL
@@ -380,6 +400,7 @@ elseif(IOS)
     )
 
     target_link_libraries(Amplitron PRIVATE
+        nlohmann_json::nlohmann_json
         SDL2::SDL2main
         SDL2::SDL2-static
         "-framework UIKit"
@@ -430,9 +451,16 @@ else() # NOT EMSCRIPTEN, ANDROID, or IOS
         ${RTMIDI_INCLUDE_DIRS}
     )
 
-    target_compile_definitions(Amplitron PRIVATE AMPLITRON_VERSION="${AMPLITRON_VERSION}")
+    # ============================================================
+    # DEFINE AMPLITRON_HAS_MIDI FOR DESKTOP BUILDS
+    # ============================================================
+    target_compile_definitions(Amplitron PRIVATE 
+        AMPLITRON_VERSION="${AMPLITRON_VERSION}"
+        AMPLITRON_HAS_MIDI
+    )
 
     target_link_libraries(Amplitron PRIVATE
+        nlohmann_json::nlohmann_json
         ${PORTAUDIO_LIBRARIES}
         ${SDL2_LIBRARIES}
         ${OPENGL_LIBRARIES}
@@ -458,7 +486,9 @@ else() # NOT EMSCRIPTEN, ANDROID, or IOS
         tests/test_common.cpp
         tests/test_oboe_ring_buffer.cpp
         tests/test_effects.cpp
+        tests/test_looper.cpp
         tests/test_preset_manager.cpp
+        tests/test_json_serialization.cpp
         tests/test_recorder.cpp
         tests/test_theme.cpp
         tests/test_command_history.cpp
@@ -496,6 +526,7 @@ else() # NOT EMSCRIPTEN, ANDROID, or IOS
         src/audio/effects/equalizer.cpp
         src/audio/effects/noise_gate.cpp
         src/audio/effects/compressor.cpp
+        src/audio/effects/looper.cpp
         src/audio/effects/cabinet_sim.cpp
         src/audio/effects/ir_cabinet.cpp
         src/audio/effects/amp_simulator.cpp
@@ -529,7 +560,13 @@ else() # NOT EMSCRIPTEN, ANDROID, or IOS
         ${RTMIDI_INCLUDE_DIRS}
     )
 
+    # ============================================================
+    # DEFINE AMPLITRON_HAS_MIDI FOR TEST BUILDS
+    # ============================================================
+    target_compile_definitions(amplitron-tests PRIVATE AMPLITRON_HAS_MIDI)
+
     target_link_libraries(amplitron-tests PRIVATE
+        nlohmann_json::nlohmann_json
         ${PORTAUDIO_LIBRARIES}
         ${SDL2_LIBRARIES}
         ${OPENGL_LIBRARIES}
@@ -567,4 +604,4 @@ else() # NOT EMSCRIPTEN, ANDROID, or IOS
     install(DIRECTORY presets DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/amplitron)
     install(DIRECTORY assets/fonts DESTINATION bin/assets)
 
-endif() # EMSCRIPTEN / ANDROID / IOS / desktop
+endif() # EMSCRIPTEN / ANDROID / IOS / desktop

CMakeLists.txt

@@ -245,6 +245,11 @@ make build
 # Windows
 .\build\Release\amplitron.exe
 ```
+### Command-line options
+| Flag | Description |
+|------|-------------|
+| `-h`, `--help` | Print usage and exit |
+| `-v`, `--version` | Print version and exit |
 
 ### Controls
 - **Menu Bar** → File → Settings to configure audio devices, buffer size, and sample rate
@@ -259,7 +264,10 @@ make build
 ### Default Signal Chain
 The application starts with a clean acoustic preset. Only EQ and Reverb are enabled by default — all other effects start bypassed:
 ```
-Input → Noise Gate* → Compressor* → Overdrive* → Distortion* → EQ → Chorus* → Delay* → Reverb → Cabinet* → Output
+Input → [Noise Gate] → [Compressor] → [Overdrive] → EQ → [Cabinet] → [Delay] → Reverb → Output
+
+> Brackets [ ] = bypassed by default. Only **EQ** and **Reverb** are active on startup.
+> Click any pedal's footswitch in the GUI to enable it.
 ```
 (*bypassed by default — click the footswitch to enable)