native_audio 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0dd09de66ecf033b152768c52c807b025e05f1a7a3cbbc5b0b15bab85746a42
-  data.tar.gz: 4af9bdb8da0bcb06d75335a69d56f5a513206ce06f5a849c7837f5bf713aa2cf
+  metadata.gz: 8ba1115278418cb8e450777a6f99843bfb5a1510979e2d44979786aef4e0f86d
+  data.tar.gz: 903c73d6e09842504d851406db41a18dc7a6f7a3b579092f32a43481438bc205
 SHA512:
-  metadata.gz: 84abd6f60b5f33320866d5ad74aac58c604236322fe9d62c1894502ca531b203148631588dcd2d41afc63e4da08aa75805145eb951ce839dcc1e5eeaa8f18577
-  data.tar.gz: f37a3d01e2fba67d3b34c9b830ff53907b02a9a64d47df968c97365866d8b58a1870baa672cf0c553739bb58120646b16b68ecadec5224056c1d3384a90c4415
+  metadata.gz: e05701f74ee36749bf0fa7c51dc61dd84f79a95c736d59fb7d067507f31b7b4ad4f741b28e1370698a434292110701bb51dcf0fdfcb3076a91e1874a5947c88a
+  data.tar.gz: 13226093d8f6923944f1a83ea3651075d1a388c1fb0e5897b15dbd8772dd84de6ab26e6897f39646495ae3b16eeb2a56ac9eb91732b3270e017d974bd2e4daa2

data/ext/audio/audio.c

@@ -21,6 +21,7 @@ ma_sound *sounds[MAX_SOUNDS];
 ma_sound *channels[MAX_CHANNELS];
 multi_tap_delay_node *delay_nodes[MAX_CHANNELS];
 reverb_node *reverb_nodes[MAX_CHANNELS];
+ma_uint64 drain_until_frame[MAX_CHANNELS];
 int sound_count = 0;
 int engine_initialized = 0;
 int context_initialized = 0;
@@ -182,12 +183,21 @@ VALUE audio_duration(VALUE self, VALUE clip)
 
 static void cleanup_finished_channels(void)
 {
+    ma_uint64 now = ma_engine_get_time_in_pcm_frames(&engine);
+    ma_uint32 sample_rate = ma_engine_get_sample_rate(&engine);
+    ma_uint64 drain_frames = (ma_uint64)(REVERB_DRAIN_SECONDS * sample_rate);
+
     for (int i = 0; i < MAX_CHANNELS; i++) {
+        // Phase 1: sound finished - uninit the sound, start drain timer
         if (channels[i] != NULL && ma_sound_at_end(channels[i])) {
             ma_sound_uninit(channels[i]);
             free(channels[i]);
             channels[i] = NULL;
+            drain_until_frame[i] = now + drain_frames;
+        }
 
+        // Phase 2: drain timer expired - uninit delay and reverb nodes
+        if (drain_until_frame[i] != 0 && now >= drain_until_frame[i]) {
             if (delay_nodes[i] != NULL) {
                 multi_tap_delay_uninit(delay_nodes[i]);
                 free(delay_nodes[i]);
@@ -199,6 +209,8 @@ static void cleanup_finished_channels(void)
                 free(reverb_nodes[i]);
                 reverb_nodes[i] = NULL;
             }
+
+            drain_until_frame[i] = 0;
         }
     }
 }
@@ -319,22 +331,15 @@ VALUE audio_stop(VALUE self, VALUE channel_id)
         return Qnil;
     }
 
+    ma_uint64 now = ma_engine_get_time_in_pcm_frames(&engine);
+    ma_uint32 sample_rate = ma_engine_get_sample_rate(&engine);
+
     ma_sound_stop(channels[channel]);
     ma_sound_uninit(channels[channel]);
     free(channels[channel]);
     channels[channel] = NULL;
 
-    if (delay_nodes[channel] != NULL) {
-        multi_tap_delay_uninit(delay_nodes[channel]);
-        free(delay_nodes[channel]);
-        delay_nodes[channel] = NULL;
-    }
-
-    if (reverb_nodes[channel] != NULL) {
-        reverb_uninit(reverb_nodes[channel]);
-        free(reverb_nodes[channel]);
-        reverb_nodes[channel] = NULL;
-    }
+    drain_until_frame[channel] = now + (ma_uint64)(REVERB_DRAIN_SECONDS * sample_rate);
 
     return Qnil;
 }
@@ -579,6 +584,7 @@ void Init_audio(void)
         channels[i] = NULL;
         delay_nodes[i] = NULL;
         reverb_nodes[i] = NULL;
+        drain_until_frame[i] = 0;
     }
 
     VALUE mAudio = rb_define_module("Audio");

data/ext/audio/audio.h

@@ -15,6 +15,7 @@
 
 #define MAX_SOUNDS 1024
 #define MAX_CHANNELS 1024
+#define REVERB_DRAIN_SECONDS 3.0f
 
 // ============================================================================
 // Globals (defined in audio.c)
@@ -26,6 +27,7 @@ extern ma_sound *sounds[MAX_SOUNDS];
 extern ma_sound *channels[MAX_CHANNELS];
 extern multi_tap_delay_node *delay_nodes[MAX_CHANNELS];
 extern reverb_node *reverb_nodes[MAX_CHANNELS];
+extern ma_uint64 drain_until_frame[MAX_CHANNELS];
 extern int sound_count;
 extern int engine_initialized;
 extern int context_initialized;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: native_audio
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Max Hatfull