native_audio 0.5.7 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 646dd4b14196feef5695e9b95a1712f876217bd360876234780ce4276ae08eee
-  data.tar.gz: dab8e4e10ffa4b1e0195d0d2fd94c8d4da41b33406bdbd453d347674cdf71912
+  metadata.gz: 2d09213f5d2dc53028449b52f6fad665fbfc6c82514a5eb7f51f70111960e22c
+  data.tar.gz: ee29df7951ff18217a556256f24c1e9e847a631e99e7460572167ab81fd8f2ba
 SHA512:
-  metadata.gz: 66a2c9fd9214622524a76dc79f45ea5ef7e49a8cd4bc0c4eb2eacce63ad505b163dd94fe49856e4518746604a0cb94a1660d6515bd5f3e6ea2b27e081db16583
-  data.tar.gz: 18cf9f7de80f4274ee8a256f20510596692e97556be706af7c5e1d67c552d73076b99b4f0d15cf38aa6a166c81bd98a24faa5d7d916d14d5b26f7bfc13540f2a
+  metadata.gz: dac3d8730c25b971ee92c337ab27cba7ed2ba2f629a027ec4597e165bc1ebc96dff7048233dd0e72d096db26c965ca807f52c3ffe57bd292ad42c822539f4990
+  data.tar.gz: 0ce1c4bed90ef8605987ebbc41e9cf3cf545bd185229eb1a66ccc99894fc293016c60e78e4203e08c7b5a3d6cbf993fcb6ef7260fbe437c331feb71f1041dd1b

data/ext/audio/audio.c

@@ -22,6 +22,7 @@ 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];
+static VALUE channel_freed_callback = Qnil;
 int sound_count = 0;
 int engine_initialized = 0;
 int context_initialized = 0;
@@ -101,6 +102,7 @@ VALUE audio_init(VALUE self)
 
     ma_engine_config config = ma_engine_config_init();
     config.listenerCount = 1;
+    config.channels = 2;
 
     if (use_null) {
         ma_backend backends[] = { ma_backend_null };
@@ -181,19 +183,24 @@ VALUE audio_duration(VALUE self, VALUE clip)
 // Playback Controls
 // ============================================================================
 
-static void cleanup_finished_channels(void)
+static void cleanup_finished_channels(int skip_channel)
 {
     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++) {
+        if (i == skip_channel) continue;
         // Phase 1: sound finished - uninit the sound, start drain timer
         if (channels[i] != NULL && ma_sound_at_end(channels[i]) && !ma_sound_is_looping(channels[i])) {
             ma_sound_uninit(channels[i]);
             free(channels[i]);
             channels[i] = NULL;
             drain_until_frame[i] = now + drain_frames;
+
+            if (channel_freed_callback != Qnil) {
+                rb_funcall(channel_freed_callback, rb_intern("call"), 1, INT2NUM(i));
+            }
         }
 
         // Phase 2: drain timer expired - uninit delay and reverb nodes
@@ -230,7 +237,7 @@ VALUE audio_play(VALUE self, VALUE channel_id, VALUE clip)
         return Qnil;
     }
 
-    cleanup_finished_channels();
+    cleanup_finished_channels(channel);
 
     // Cancel any pending drain timer for this channel
     drain_until_frame[channel] = 0;
@@ -604,6 +611,71 @@ VALUE audio_set_reverb_dry(VALUE self, VALUE channel_id, VALUE dry)
     return Qnil;
 }
 
+// ============================================================================
+// Channel Query
+// ============================================================================
+
+VALUE audio_next_free_channel(VALUE self)
+{
+    cleanup_finished_channels(-1);
+
+    // Prefer fully drained channels to preserve reverb tails
+    for (int i = 0; i < MAX_CHANNELS; i++) {
+        if (channels[i] == NULL && drain_until_frame[i] == 0) {
+            return rb_int2inum(i);
+        }
+    }
+
+    // Fall back to draining channels if all else is exhausted
+    for (int i = 0; i < MAX_CHANNELS; i++) {
+        if (channels[i] == NULL) {
+            return rb_int2inum(i);
+        }
+    }
+
+    return rb_int2inum(-1);
+}
+
+VALUE audio_reset_all_channels(VALUE self)
+{
+    for (int i = 0; i < MAX_CHANNELS; i++) {
+        if (channels[i] != NULL) {
+            ma_sound_stop(channels[i]);
+            ma_sound_uninit(channels[i]);
+            free(channels[i]);
+            channels[i] = NULL;
+        }
+
+        if (delay_nodes[i] != NULL) {
+            multi_tap_delay_uninit(delay_nodes[i]);
+            free(delay_nodes[i]);
+            delay_nodes[i] = NULL;
+        }
+
+        if (reverb_nodes[i] != NULL) {
+            reverb_uninit(reverb_nodes[i]);
+            free(reverb_nodes[i]);
+            reverb_nodes[i] = NULL;
+        }
+
+        drain_until_frame[i] = 0;
+    }
+
+    return Qnil;
+}
+
+VALUE audio_on_channel_freed(VALUE self, VALUE callback)
+{
+    if (channel_freed_callback != Qnil) {
+        rb_gc_unregister_address(&channel_freed_callback);
+    }
+
+    channel_freed_callback = callback;
+    rb_gc_register_address(&channel_freed_callback);
+
+    return Qnil;
+}
+
 // ============================================================================
 // Ruby Module Setup
 // ============================================================================
@@ -653,4 +725,9 @@ void Init_audio(void)
     rb_define_singleton_method(mAudio, "set_reverb_damping", audio_set_reverb_damping, 2);
     rb_define_singleton_method(mAudio, "set_reverb_wet", audio_set_reverb_wet, 2);
     rb_define_singleton_method(mAudio, "set_reverb_dry", audio_set_reverb_dry, 2);
+
+    // Channel query
+    rb_define_singleton_method(mAudio, "next_free_channel", audio_next_free_channel, 0);
+    rb_define_singleton_method(mAudio, "on_channel_freed", audio_on_channel_freed, 1);
+    rb_define_singleton_method(mAudio, "reset_all_channels", audio_reset_all_channels, 0);
 }

data/lib/dummy_audio.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
+require 'set'
+
 # Dummy audio backend for CI/testing environments without audio hardware.
 # Has the same interface as the Audio C extension but does nothing.
 module DummyAudio
   @sound_count = 0
   @tap_counts = {}
+  @active_channels = Set.new
+  @channel_freed_callback = nil
 
   def self.init
     nil
@@ -22,10 +26,12 @@ module DummyAudio
 
   def self.play(channel, clip)
     @tap_counts[channel] = 0
+    @active_channels << channel
     channel
   end
 
   def self.stop(channel)
+    @active_channels.delete(channel)
     nil
   end
 
@@ -99,4 +105,16 @@ module DummyAudio
   def self.set_reverb_dry(channel, dry)
     nil
   end
+
+  def self.next_free_channel
+    (0..1023).find { |i| !@active_channels.include?(i) } || -1
+  end
+
+  def self.on_channel_freed(callback)
+    @channel_freed_callback = callback
+  end
+
+  def self.reset_all_channels
+    @active_channels.clear
+  end
 end

data/lib/native_audio.rb

@@ -3,7 +3,9 @@
 require_relative './audio'
 require_relative './dummy_audio'
 
-Audio.init unless ENV['DUMMY_AUDIO_BACKEND'] == 'true'
+unless ENV['DUMMY_AUDIO_BACKEND'] == 'true'
+  Audio.init
+end
 
 module NativeAudio
   def self.audio_driver
@@ -55,56 +57,74 @@ module NativeAudio
 
     def initialize(clip)
       @clip = clip
-      @channel = AudioSource.channels.count
       @delay_taps = []
       @params = {}
-      AudioSource.channels << self
+      @channel = nil
     end
 
     def play
+      acquire_channel unless @channel
       NativeAudio.audio_driver.play(@channel, @clip.clip)
       apply_params
     end
 
     def stop
+      return unless @channel
       NativeAudio.audio_driver.stop(@channel)
+      self.class.owners.delete(@channel)
+      @channel = nil
+    end
+
+    def channel_freed
+      @channel = nil
+    end
+
+    def self.owners
+      @owners ||= {}
+    end
+
+    def self.setup_channel_freed_callback
+      NativeAudio.audio_driver.on_channel_freed(proc { |channel|
+        owner = owners.delete(channel)
+        owner&.channel_freed
+      })
     end
 
     def pause
-      NativeAudio.audio_driver.pause(@channel)
+      NativeAudio.audio_driver.pause(@channel) if @channel
     end
 
     def resume
-      NativeAudio.audio_driver.resume(@channel)
+      NativeAudio.audio_driver.resume(@channel) if @channel
     end
 
     def set_pos(angle, distance)
       @params[:pos] = [angle, distance]
-      NativeAudio.audio_driver.set_pos(@channel, angle, distance)
+      NativeAudio.audio_driver.set_pos(@channel, angle, distance) if @channel
     end
 
     def set_pan(pan)
       @params[:pan] = pan
-      NativeAudio.audio_driver.set_pan(@channel, pan)
+      NativeAudio.audio_driver.set_pan(@channel, pan) if @channel
     end
 
     def seek(seconds)
-      NativeAudio.audio_driver.seek(@channel, seconds)
+      NativeAudio.audio_driver.seek(@channel, seconds) if @channel
     end
 
     def set_volume(volume)
       @params[:volume] = volume
-      NativeAudio.audio_driver.set_volume(@channel, volume)
+      NativeAudio.audio_driver.set_volume(@channel, volume) if @channel
     end
 
     def set_pitch(pitch)
       @params[:pitch] = pitch
-      NativeAudio.audio_driver.set_pitch(@channel, pitch)
+      NativeAudio.audio_driver.set_pitch(@channel, pitch) if @channel
     end
 
     def set_looping(looping)
       @params[:looping] = looping
-      NativeAudio.audio_driver.set_looping(@channel, looping)
+      NativeAudio.audio_driver.set_looping(@channel, looping) if @channel
     end
 
     def add_delay_tap(time_ms:, volume:)
@@ -116,28 +136,32 @@ module NativeAudio
 
     def enable_reverb(enabled = true)
       @params[:reverb_enabled] = enabled
-      NativeAudio.audio_driver.enable_reverb(@channel, enabled)
+      NativeAudio.audio_driver.enable_reverb(@channel, enabled) if @channel
     end
 
     def set_reverb(room_size: 0.5, damping: 0.3, wet: 0.3, dry: 1.0)
       @params[:reverb] = { room_size: room_size, damping: damping, wet: wet, dry: dry }
-      NativeAudio.audio_driver.enable_reverb(@channel, true)
-      NativeAudio.audio_driver.set_reverb_room_size(@channel, room_size)
-      NativeAudio.audio_driver.set_reverb_damping(@channel, damping)
-      NativeAudio.audio_driver.set_reverb_wet(@channel, wet)
-      NativeAudio.audio_driver.set_reverb_dry(@channel, dry)
+      if @channel
+        NativeAudio.audio_driver.enable_reverb(@channel, true)
+        NativeAudio.audio_driver.set_reverb_room_size(@channel, room_size)
+        NativeAudio.audio_driver.set_reverb_damping(@channel, damping)
+        NativeAudio.audio_driver.set_reverb_wet(@channel, wet)
+        NativeAudio.audio_driver.set_reverb_dry(@channel, dry)
+      end
     end
 
     def delay_taps
       @delay_taps
     end
 
-    def self.channels
-      @channels ||= []
-    end
-
     private
 
+    def acquire_channel
+      @channel = NativeAudio.audio_driver.next_free_channel
+      raise "No free audio channels available" if @channel < 0
+      self.class.owners[@channel] = self
+    end
+
     def apply_params
       NativeAudio.audio_driver.set_volume(@channel, @params[:volume]) if @params.key?(:volume)
       NativeAudio.audio_driver.set_pitch(@channel, @params[:pitch]) if @params.key?(:pitch)
@@ -161,4 +185,6 @@ module NativeAudio
       end
     end
   end
+
+  AudioSource.setup_channel_freed_callback
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: native_audio
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.9
 platform: ruby
 authors:
 - Max Hatfull
@@ -47,7 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.16
 specification_version: 4
 summary: A simple audio library for Ruby
 test_files: []