native_audio 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9a953a3fe6e4bd23e99278c28dbd273bc08268105382a4dae34854e3917aa64
-  data.tar.gz: af2a5c84a91fa2957984d4c36637bbe914f38fab7d26903406051eb2456dbc96
+  metadata.gz: e0dd09de66ecf033b152768c52c807b025e05f1a7a3cbbc5b0b15bab85746a42
+  data.tar.gz: 4af9bdb8da0bcb06d75335a69d56f5a513206ce06f5a849c7837f5bf713aa2cf
 SHA512:
-  metadata.gz: '094beb2919f1a5e0b9e18ea7ac5e5776f5f5ed5eb213f9aac5c976ec3e74cb740ba73632f3bab2acb589afc4d2f12a1fe8485b3ddd59b5bc71d8d21fa758f357'
-  data.tar.gz: b0c335b765410df6cfbae2a730f921388e5761639f96b329113ef398527dd46f9067680a55e0fb7541cf801784158f07b744f07e9570251ea0485503b573c81f
+  metadata.gz: 84abd6f60b5f33320866d5ad74aac58c604236322fe9d62c1894502ca531b203148631588dcd2d41afc63e4da08aa75805145eb951ce839dcc1e5eeaa8f18577
+  data.tar.gz: f37a3d01e2fba67d3b34c9b830ff53907b02a9a64d47df968c97365866d8b58a1870baa672cf0c553739bb58120646b16b68ecadec5224056c1d3384a90c4415

data/ext/audio/audio.c

@@ -180,6 +180,29 @@ VALUE audio_duration(VALUE self, VALUE clip)
 // Playback Controls
 // ============================================================================
 
+static void cleanup_finished_channels(void)
+{
+    for (int i = 0; i < MAX_CHANNELS; i++) {
+        if (channels[i] != NULL && ma_sound_at_end(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;
+            }
+        }
+    }
+}
+
 VALUE audio_play(VALUE self, VALUE channel_id, VALUE clip)
 {
     int channel = NUM2INT(channel_id);
@@ -195,6 +218,8 @@ VALUE audio_play(VALUE self, VALUE channel_id, VALUE clip)
         return Qnil;
     }
 
+    cleanup_finished_channels();
+
     // Clean up existing resources on this channel
     if (channels[channel] != NULL) {
         ma_sound_stop(channels[channel]);
@@ -295,7 +320,21 @@ VALUE audio_stop(VALUE self, VALUE channel_id)
     }
 
     ma_sound_stop(channels[channel]);
-    ma_sound_seek_to_pcm_frame(channels[channel], 0);
+    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;
+    }
 
     return Qnil;
 }

data/lib/native_audio.rb

@@ -25,6 +25,7 @@ module NativeAudio
 
   class DelayTap
     attr_reader :id, :audio_source, :time_ms, :volume
+    attr_writer :id
 
     def initialize(audio_source, id, time_ms, volume)
       @audio_source = audio_source
@@ -56,11 +57,13 @@ module NativeAudio
       @clip = clip
       @channel = AudioSource.channels.count
       @delay_taps = []
+      @params = {}
       AudioSource.channels << self
     end
 
     def play
       NativeAudio.audio_driver.play(@channel, @clip.clip)
+      apply_params
     end
 
     def stop
@@ -76,18 +79,22 @@ module NativeAudio
     end
 
     def set_pos(angle, distance)
+      @params[:pos] = [angle, distance]
       NativeAudio.audio_driver.set_pos(@channel, angle, distance)
     end
 
     def set_volume(volume)
+      @params[:volume] = volume
       NativeAudio.audio_driver.set_volume(@channel, volume)
     end
 
     def set_pitch(pitch)
+      @params[:pitch] = pitch
       NativeAudio.audio_driver.set_pitch(@channel, pitch)
     end
 
     def set_looping(looping)
+      @params[:looping] = looping
       NativeAudio.audio_driver.set_looping(@channel, looping)
     end
 
@@ -99,10 +106,12 @@ module NativeAudio
     end
 
     def enable_reverb(enabled = true)
+      @params[:reverb_enabled] = enabled
       NativeAudio.audio_driver.enable_reverb(@channel, enabled)
     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)
@@ -117,5 +126,29 @@ module NativeAudio
     def self.channels
       @channels ||= []
     end
+
+    private
+
+    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)
+      NativeAudio.audio_driver.set_looping(@channel, @params[:looping]) if @params.key?(:looping)
+      NativeAudio.audio_driver.set_pos(@channel, *@params[:pos]) if @params.key?(:pos)
+
+      if @params.key?(:reverb)
+        r = @params[:reverb]
+        NativeAudio.audio_driver.enable_reverb(@channel, true)
+        NativeAudio.audio_driver.set_reverb_room_size(@channel, r[:room_size])
+        NativeAudio.audio_driver.set_reverb_damping(@channel, r[:damping])
+        NativeAudio.audio_driver.set_reverb_wet(@channel, r[:wet])
+        NativeAudio.audio_driver.set_reverb_dry(@channel, r[:dry])
+      elsif @params.key?(:reverb_enabled)
+        NativeAudio.audio_driver.enable_reverb(@channel, @params[:reverb_enabled])
+      end
+
+      @delay_taps.each do |tap|
+        tap.id = NativeAudio.audio_driver.add_delay_tap(@channel, tap.time_ms, tap.volume)
+      end
+    end
   end
 end

metadata

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