expo-juce 0.2.24 → 0.3.0

package/ios/ExpoJuce.podspec

@@ -17,25 +17,26 @@ Pod::Spec.new do |s|
 
   s.dependency 'ExpoModulesCore'
 
-  # Our source files: Swift module, ObjC bridge, C++ tone generator
+  # Our source files: Swift module, ObjC bridge, C++ tone generator, JUCE compilation unit
   s.source_files = "*.{h,m,mm,swift}"
-  s.exclude_files = ["JuceConfig.h", "JuceModules.mm"]
   s.requires_arc = true
 
-  # JUCE sources preserved on disk for future use but NOT compiled —
-  # current engine uses pure C++ + AVFoundation, no JUCE APIs.
-  # Compiling JUCE modules (especially juce_events) causes launch crashes
-  # due to static initializers conflicting with React Native's app lifecycle.
+  # JUCE modules compiled: juce_core, juce_audio_basics, juce_audio_formats, juce_dsp
+  # NOT compiled: juce_events, juce_data_structures (static initializer conflicts with RN)
+  # JuceModules.mm is a single translation unit that #includes the JUCE .cpp files.
   s.preserve_paths = ["juce_modules/**"]
 
   s.frameworks = 'AVFoundation', 'AudioToolbox', 'CoreAudio',
-                 'Foundation', 'Accelerate'
+                 'Foundation', 'Accelerate', 'CoreMIDI'
   s.libraries = 'c++'
 
   s.pod_target_xcconfig = {
     'DEFINES_MODULE' => 'YES',
     'SWIFT_COMPILATION_MODE' => 'wholemodule',
     'CLANG_CXX_LANGUAGE_STANDARD' => 'c++17',
-    'HEADER_SEARCH_PATHS' => '"$(PODS_TARGET_SRCROOT)"',
+    'HEADER_SEARCH_PATHS' => '"$(PODS_TARGET_SRCROOT)" "$(PODS_TARGET_SRCROOT)/juce_modules"',
+    # Suppress JUCE deprecation warnings and implicit conversion warnings in vendored code
+    'GCC_WARN_ABOUT_DEPRECATED_DECLARATIONS' => 'NO',
+    'OTHER_CPLUSPLUSFLAGS' => '-Wno-shorten-64-to-32 -Wno-comma -Wno-deprecated-declarations',
   }
 end

package/ios/JuceConfig.h

@@ -16,14 +16,19 @@
 #define JUCE_USE_DARK_SPLASH_SCREEN 0
 #define JUCE_STRICT_REFCOUNTEDPOINTER 1
 
-// Module availability flags
+// Module availability flags — only safe modules (no juce_events)
 #define JUCE_MODULE_AVAILABLE_juce_core 1
-#define JUCE_MODULE_AVAILABLE_juce_events 1
-#define JUCE_MODULE_AVAILABLE_juce_data_structures 1
 #define JUCE_MODULE_AVAILABLE_juce_audio_basics 1
 #define JUCE_MODULE_AVAILABLE_juce_audio_formats 1
 #define JUCE_MODULE_AVAILABLE_juce_dsp 1
 
+// Explicitly mark dangerous modules as unavailable
+#define JUCE_MODULE_AVAILABLE_juce_events 0
+#define JUCE_MODULE_AVAILABLE_juce_data_structures 0
+#define JUCE_MODULE_AVAILABLE_juce_gui_basics 0
+#define JUCE_MODULE_AVAILABLE_juce_audio_processors 0
+#define JUCE_MODULE_AVAILABLE_juce_audio_devices 0
+
 // Not a standalone JUCE app — embedded in React Native
 #define JUCE_STANDALONE_APPLICATION 0
 
@@ -37,3 +42,4 @@
 #define JUCE_USE_MP3AUDIOFORMAT 0
 #define JUCE_USE_LAME_AUDIO_FORMAT 0
 #define JUCE_USE_WINDOWS_MEDIA_FORMAT 0
+#define JUCE_USE_FLAC 0

package/ios/JuceModules.mm

@@ -1,11 +1,14 @@
-// JuceModules.mm — Compiles all vendored JUCE modules as a single ObjC++ translation unit.
+// JuceModules.mm — Compiles vendored JUCE modules as a single ObjC++ translation unit.
 // The .mm extension ensures Objective-C++ mode so JUCE's Apple platform code compiles correctly.
+//
+// Only safe modules are compiled here. juce_events is EXCLUDED because its
+// static MessageManager initializer conflicts with React Native's app lifecycle.
+// The dependency chain is: juce_dsp -> juce_audio_formats -> juce_audio_basics -> juce_core
+// None of these modules depend on juce_events.
 
 #include "JuceConfig.h"
 
 #include "juce_modules/juce_core/juce_core.cpp"
-#include "juce_modules/juce_events/juce_events.cpp"
-#include "juce_modules/juce_data_structures/juce_data_structures.cpp"
 #include "juce_modules/juce_audio_basics/juce_audio_basics.cpp"
 #include "juce_modules/juce_audio_formats/juce_audio_formats.cpp"
 #include "juce_modules/juce_dsp/juce_dsp.cpp"

package/ios/JuceToneGenerator.mm

@@ -4,214 +4,244 @@
 #include <cmath>
 #include <algorithm>
 
+#include "JuceConfig.h"
+#include <juce_core/juce_core.h>
+#include <juce_audio_basics/juce_audio_basics.h>
+#include <juce_dsp/juce_dsp.h>
+
 // ── Waveform Types ────────────────────────────────────────────────
 enum class Waveform { Sine, Square, Saw, Triangle };
 
 static const int MAX_HARMONICS = 8;
 
-// ── Simple one-pole low-pass filter ───────────────────────────────
-class OnePoleLPF {
+// ── Synth Engine (JUCE DSP) ──────────────────────────────────────
+//
+// Thread safety contract:
+//   - Main thread: calls set*() methods (atomic parameter updates)
+//   - Audio thread: calls getNextSample() (reads atomics, mutates DSP state)
+//   - DSP objects (oscillator, filter, adsr) are ONLY touched by the audio thread
+//   - prepare() is called once from main thread BEFORE audio thread starts
+//
+class SynthEngine {
 public:
-    OnePoleLPF() : y1(0.0), cutoff(20000.0), resonance(0.0) {}
-
-    void setCutoff(double hz) { cutoff.store(hz); }
-    void setResonance(double q) { resonance.store(q); }
-
-    float process(float input, double sampleRate) {
-        double fc = cutoff.load();
-
-        // Clamp cutoff to Nyquist
-        if (fc > sampleRate * 0.49) fc = sampleRate * 0.49;
-        if (fc < 20.0) fc = 20.0;
-
-        // Compute coefficient (simple RC low-pass)
-        double w = 2.0 * M_PI * fc / sampleRate;
-        double g = w / (1.0 + w);
-
-        // One-pole filter
-        y1 = y1 + g * (input - y1);
-
-        return (float)y1;
+    SynthEngine()
+        : frequency(440.0), level(0.5),
+          waveform(Waveform::Sine), detuneCents(0.0),
+          pendingNoteOn(false), pendingNoteOff(false),
+          filterCutoff(20000.0), filterResonance(0.0),
+          attackMs(10.0), releaseMs(200.0),
+          pendingParamUpdate(true)
+    {
+        for (int i = 0; i < MAX_HARMONICS; i++) {
+            harmonics[i] = (i == 0) ? 1.0 : 0.0;
+        }
     }
 
-    void reset() { y1 = 0.0; }
-
-private:
-    double y1;
-    std::atomic<double> cutoff;
-    std::atomic<double> resonance;
-};
-
-// ── ADSR Envelope ─────────────────────────────────────────────────
-class ADSREnvelope {
-public:
-    enum class Stage { Idle, Attack, Sustain, Release };
-
-    ADSREnvelope()
-        : attackMs(10.0), releaseMs(200.0),
-          stage(Stage::Idle), gain(0.0) {}
+    // Called once from main thread before audio engine starts
+    void prepare(double sampleRate, int blockSize) {
+        juce::dsp::ProcessSpec spec;
+        spec.sampleRate = sampleRate;
+        spec.maximumBlockSize = (juce::uint32)blockSize;
+        spec.numChannels = 1;
 
-    void setAttack(double ms) { attackMs.store(std::max(1.0, ms)); }
-    void setRelease(double ms) { releaseMs.store(std::max(1.0, ms)); }
+        // Pre-initialize all waveform oscillators with lookup tables (no allocation on audio thread)
+        sineOsc.initialise([](float x) { return std::sin(x); }, 2048);
+        sineOsc.prepare(spec);
 
-    void noteOn() { stage.store(Stage::Attack); }
-    void noteOff() { stage.store(Stage::Release); }
-    bool isActive() { return stage.load() != Stage::Idle; }
+        squareOsc.initialise([](float x) -> float { return x < 0.0f ? -1.0f : 1.0f; }, 2048);
+        squareOsc.prepare(spec);
 
-    float process(double sampleRate) {
-        Stage s = stage.load();
+        sawOsc.initialise([](float x) -> float { return x / juce::MathConstants<float>::pi; }, 2048);
+        sawOsc.prepare(spec);
 
-        switch (s) {
-            case Stage::Idle:
-                gain = 0.0;
-                break;
+        triOsc.initialise([](float x) -> float {
+            return 2.0f * std::abs(x) / juce::MathConstants<float>::pi - 1.0f;
+        }, 2048);
+        triOsc.prepare(spec);
 
-            case Stage::Attack: {
-                double rate = 1.0 / (attackMs.load() * 0.001 * sampleRate);
-                gain += rate;
-                if (gain >= 1.0) {
-                    gain = 1.0;
-                    stage.store(Stage::Sustain);
-                }
-                break;
-            }
-
-            case Stage::Sustain:
-                gain = 1.0;
-                break;
-
-            case Stage::Release: {
-                double rate = 1.0 / (releaseMs.load() * 0.001 * sampleRate);
-                gain -= rate;
-                if (gain <= 0.0) {
-                    gain = 0.0;
-                    stage.store(Stage::Idle);
-                }
-                break;
-            }
-        }
+        filter.prepare(spec);
+        filter.setType(juce::dsp::StateVariableTPTFilter<float>::Type::lowpass);
 
-        return (float)gain;
-    }
+        adsr.setSampleRate(sampleRate);
+        juce::ADSR::Parameters adsrParams { 0.01f, 0.0f, 1.0f, 0.2f };
+        adsr.setParameters(adsrParams);
 
-    void reset() {
-        gain = 0.0;
-        stage.store(Stage::Idle);
+        cachedSampleRate = sampleRate;
+        prepared = true;
     }
 
-private:
-    std::atomic<double> attackMs;
-    std::atomic<double> releaseMs;
-    std::atomic<Stage> stage;
-    double gain;
-};
+    // ── Main-thread setters (all atomic or lock-free) ─────────────
 
-// ── Synth Engine ──────────────────────────────────────────────────
-class SynthEngine {
-public:
-    SynthEngine()
-        : frequency(440.0), level(0.5), phase(0.0),
-          waveform(Waveform::Sine), detuneCents(0.0)
-    {
-        for (int i = 0; i < MAX_HARMONICS; i++) {
-            harmonics[i] = (i == 0) ? 1.0 : 0.0;
-        }
-    }
-
-    void setFrequency(double freq) { frequency = freq; }
-    void setLevel(double lev) { level = lev; }
+    void setFrequency(double freq) { frequency.store(freq); }
+    void setLevel(double lev) { level.store(lev); }
     void setWaveform(Waveform wf) { waveform.store(wf); }
     void setDetune(double cents) { detuneCents.store(cents); }
 
     void setHarmonics(const double *levels, int count) {
         for (int i = 0; i < MAX_HARMONICS; i++) {
-            harmonics[i] = (i < count) ? levels[i] : 0.0;
+            harmonics[i].store((i < count) ? levels[i] : 0.0);
         }
     }
 
     void noteOn() {
-        phase = 0.0;
-        filter.reset();
-        envelope.noteOn();
+        pendingNoteOn.store(true);
     }
 
     void noteOff() {
-        envelope.noteOff();
+        pendingNoteOff.store(true);
+    }
+
+    void setAttack(double ms) {
+        attackMs.store(std::max(1.0, ms));
+        pendingParamUpdate.store(true);
     }
 
-    void setAttack(double ms) { envelope.setAttack(ms); }
-    void setRelease(double ms) { envelope.setRelease(ms); }
-    void setFilterCutoff(double hz) { filter.setCutoff(hz); }
-    void setFilterResonance(double q) { filter.setResonance(q); }
+    void setRelease(double ms) {
+        releaseMs.store(std::max(1.0, ms));
+        pendingParamUpdate.store(true);
+    }
+
+    void setFilterCutoff(double hz) {
+        filterCutoff.store(std::max(20.0, std::min(20000.0, hz)));
+    }
+
+    void setFilterResonance(double q) {
+        filterResonance.store(std::max(0.0, std::min(1.0, q)));
+    }
+
+    // ── Audio-thread render ───────────────────────────────────────
 
     float getNextSample(double sampleRate) {
-        float envGain = envelope.process(sampleRate);
-        if (envGain < 0.00001f && !envelope.isActive()) {
+        if (!prepared) return 0.0f;
+
+        // Apply pending note events (main thread -> audio thread)
+        if (pendingNoteOn.exchange(false)) {
+            sineOsc.reset();
+            squareOsc.reset();
+            sawOsc.reset();
+            triOsc.reset();
+            filter.reset();
+            adsr.noteOn();
+        }
+        if (pendingNoteOff.exchange(false)) {
+            adsr.noteOff();
+        }
+
+        // Apply pending ADSR parameter changes
+        if (pendingParamUpdate.exchange(false)) {
+            float atkSec = (float)(attackMs.load() * 0.001);
+            float relSec = (float)(releaseMs.load() * 0.001);
+            juce::ADSR::Parameters p { atkSec, 0.0f, 1.0f, relSec };
+            adsr.setParameters(p);
+        }
+
+        // Get envelope value
+        float envGain = adsr.getNextSample();
+        if (envGain < 0.00001f && !adsr.isActive()) {
             return 0.0f;
         }
 
+        // Read atomic parameters
         double freq = frequency.load();
-        double lev = level.load();
+        float lev = (float)level.load();
         Waveform wf = waveform.load();
         double detune = detuneCents.load();
 
-        // Apply detune (cents to frequency ratio)
+        // Apply detune
         if (std::fabs(detune) > 0.01) {
             freq *= std::pow(2.0, detune / 1200.0);
         }
 
-        double sample = 0.0;
+        // Set frequency on all oscillators (they track phase independently)
+        float freqF = (float)freq;
+        sineOsc.setFrequency(freqF, true);
+        squareOsc.setFrequency(freqF, true);
+        sawOsc.setFrequency(freqF, true);
+        triOsc.setFrequency(freqF, true);
+
+        // Update filter parameters (safe — JUCE TPT filter handles per-sample modulation)
+        float cutoff = (float)filterCutoff.load();
+        float resonance = (float)filterResonance.load();
+        float mappedQ = 0.707f + resonance * 9.293f;
+        filter.setCutoffFrequency(cutoff);
+        filter.setResonance(mappedQ);
+
+        // Generate sample from the active waveform's pre-initialized oscillator
+        float sample = 0.0f;
 
         switch (wf) {
-            case Waveform::Sine:
-                for (int h = 0; h < MAX_HARMONICS; h++) {
-                    double hLevel = harmonics[h].load();
-                    if (hLevel > 0.0001) {
-                        sample += std::sin(phase * (h + 1) * 2.0 * M_PI) * hLevel;
+            case Waveform::Sine: {
+                float baseSample = sineOsc.processSample(0.0f);
+                float h0 = (float)harmonics[0].load();
+                sample = baseSample * h0;
+
+                // Additive harmonics (if any higher harmonics are set)
+                for (int h = 1; h < MAX_HARMONICS; h++) {
+                    float hLevel = (float)harmonics[h].load();
+                    if (hLevel > 0.0001f) {
+                        // Approximate higher harmonics from base phase
+                        // This is safe: no allocation, just math
+                        float harmSample = std::sin(std::asin(baseSample) * (float)(h + 1));
+                        sample += harmSample * hLevel;
                     }
                 }
                 break;
+            }
 
-            case Waveform::Square: {
-                double p = std::fmod(phase, 1.0);
-                sample = (p < 0.5) ? 0.7 : -0.7;
+            case Waveform::Square:
+                sample = squareOsc.processSample(0.0f) * 0.7f;
                 break;
-            }
 
-            case Waveform::Saw: {
-                double p = std::fmod(phase, 1.0);
-                sample = (2.0 * p - 1.0) * 0.6;
+            case Waveform::Saw:
+                sample = sawOsc.processSample(0.0f) * 0.6f;
                 break;
-            }
 
-            case Waveform::Triangle: {
-                double p = std::fmod(phase, 1.0);
-                sample = (4.0 * std::fabs(p - 0.5) - 1.0) * 0.8;
+            case Waveform::Triangle:
+                sample = triOsc.processSample(0.0f) * 0.8f;
                 break;
-            }
         }
 
-        phase += freq / sampleRate;
-        if (phase >= 1.0) phase -= 1.0;
+        // Advance inactive oscillators to keep phase tracking coherent
+        // (prevents phase discontinuity on waveform switch)
+        if (wf != Waveform::Sine)    sineOsc.processSample(0.0f);
+        if (wf != Waveform::Square)  squareOsc.processSample(0.0f);
+        if (wf != Waveform::Saw)     sawOsc.processSample(0.0f);
+        if (wf != Waveform::Triangle) triOsc.processSample(0.0f);
 
         // Apply filter
-        float filtered = filter.process((float)sample, sampleRate);
+        float filtered = filter.processSample(0, sample);
 
-        return filtered * (float)lev * envGain;
+        return filtered * lev * envGain;
     }
 
 private:
+    // Atomic parameters (written by main thread, read by audio thread)
     std::atomic<double> frequency;
     std::atomic<double> level;
-    double phase;
     std::atomic<Waveform> waveform;
     std::atomic<double> detuneCents;
     std::atomic<double> harmonics[MAX_HARMONICS];
-    ADSREnvelope envelope;
-    OnePoleLPF filter;
+    std::atomic<bool> pendingNoteOn;
+    std::atomic<bool> pendingNoteOff;
+    std::atomic<double> filterCutoff;
+    std::atomic<double> filterResonance;
+    std::atomic<double> attackMs;
+    std::atomic<double> releaseMs;
+    std::atomic<bool> pendingParamUpdate;
+
+    // DSP objects (ONLY touched by audio thread after prepare())
+    juce::dsp::Oscillator<float> sineOsc;
+    juce::dsp::Oscillator<float> squareOsc;
+    juce::dsp::Oscillator<float> sawOsc;
+    juce::dsp::Oscillator<float> triOsc;
+    juce::dsp::StateVariableTPTFilter<float> filter;
+    juce::ADSR adsr;
+    double cachedSampleRate = 44100.0;
+    bool prepared = false;
 };
 
 // ── Transport Engine ──────────────────────────────────────────────
+// All-atomic transport — safe for cross-thread access.
 class TransportEngine {
 public:
     TransportEngine()
@@ -228,7 +258,7 @@ public:
     void stop() { playing.store(false); }
     bool isPlaying() { return playing.load(); }
 
-    // Returns true if we crossed a new beat boundary
+    // Returns true if we crossed a new beat boundary (audio thread only)
     bool advance(double sampleRate) {
         if (!playing.load()) return false;
 
@@ -253,14 +283,15 @@ private:
     std::atomic<int> lastBeatInt;
 };
 
-// ── Objective-C Wrapper ───────────────────────────────────────────
-
+// ── Beat State (lock-free audio->main thread communication) ──────
 struct BeatState {
     std::atomic<bool> crossed{false};
     std::atomic<double> beat{0.0};
     std::atomic<double> bpm{120.0};
 };
 
+// ── Objective-C Wrapper ───────────────────────────────────────────
+
 @interface JuceToneGenerator ()
 @property (nonatomic, strong) AVAudioEngine *audioEngine;
 @property (nonatomic, strong) AVAudioSourceNode *sourceNode;
@@ -287,7 +318,6 @@ struct BeatState {
     if (self) {
         _engine = new SynthEngine();
         _transport = new TransportEngine();
-        // Audio engine initialized lazily via [self initialize] called from setup
     }
     return self;
 }
@@ -345,6 +375,9 @@ struct BeatState {
             AVAudioFormat *format = [[AVAudioFormat alloc] initStandardFormatWithSampleRate:sampleRate channels:2];
             NSLog(@"[ExpoJuce] Using sample rate: %.0f", sampleRate);
 
+            // Prepare JUCE DSP objects on main thread BEFORE audio thread starts
+            self.engine->prepare(sampleRate, 512);
+
             SynthEngine *eng = self.engine;
             TransportEngine *trans = self.transport;
 
@@ -353,19 +386,27 @@ struct BeatState {
             }
             BeatState *bs = self.beatState;
 
-            self.sourceNode = [[AVAudioSourceNode alloc] initWithRenderBlock:^OSStatus(BOOL *isSilence, const AudioTimeStamp *timestamp, AVAudioFrameCount frameCount, AudioBufferList *outputData) {
-                double sr = sampleRate;
+            self.sourceNode = [[AVAudioSourceNode alloc] initWithRenderBlock:^OSStatus(
+                BOOL *isSilence,
+                const AudioTimeStamp *timestamp,
+                AVAudioFrameCount frameCount,
+                AudioBufferList *outputData
+            ) {
                 float *leftChannel = (float *)outputData->mBuffers[0].mData;
-                float *rightChannel = (outputData->mNumberBuffers > 1) ? (float *)outputData->mBuffers[1].mData : leftChannel;
+                float *rightChannel = (outputData->mNumberBuffers > 1)
+                    ? (float *)outputData->mBuffers[1].mData
+                    : leftChannel;
 
                 for (AVAudioFrameCount i = 0; i < frameCount; i++) {
-                    if (trans->advance(sr)) {
+                    // Advance transport
+                    if (trans->advance(sampleRate)) {
                         bs->crossed.store(true);
                         bs->beat.store(trans->getPosition());
                         bs->bpm.store(trans->getTempo());
                     }
 
-                    float sample = eng->getNextSample(sr);
+                    // Render synth sample
+                    float sample = eng->getNextSample(sampleRate);
                     leftChannel[i] = sample;
                     rightChannel[i] = sample;
                 }
@@ -385,7 +426,7 @@ struct BeatState {
                 continue;
             }
 
-            NSLog(@"[ExpoJuce] Audio engine started successfully");
+            NSLog(@"[ExpoJuce] Audio engine started successfully (JUCE DSP active)");
             return;
 
         } @catch (NSException *exception) {
@@ -463,9 +504,7 @@ struct BeatState {
 // ── Synth Methods ─────────────────────────────────────────────────
 
 - (void)playToneWithFrequency:(double)frequency duration:(double)duration {
-    NSLog(@"[ExpoJuce] playTone freq=%.1f dur=%.0f", frequency, duration);
     if (!self.engine) return;
-
     self.engine->setFrequency(frequency);
     self.engine->noteOn();
 
@@ -540,12 +579,10 @@ struct BeatState {
 // ── Transport ─────────────────────────────────────────────────────
 
 - (void)startTransport {
-    NSLog(@"[ExpoJuce] Transport start");
     if (self.transport) self.transport->start();
 }
 
 - (void)stopTransport {
-    NSLog(@"[ExpoJuce] Transport stop");
     if (self.transport) self.transport->stop();
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-juce",
-  "version": "0.2.24",
+  "version": "0.3.0",
   "description": "Realtime DSP w/C++ & JUCE",
   "type": "module",
   "main": "build/index.js",