native_audio 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ff74b87bd6668a2022c0730d5bb9597602694866ea05c08e90d9a9ac1e1248d
-  data.tar.gz: 142d1ca8c651a8ab51cac75f70d426daf369d8e09e1b37b88e16e323a044bbe3
+  metadata.gz: 64a48d1c26dbc98e6b0231d7ccc72455ad5ee487141ce0dd9eb170ee43b47976
+  data.tar.gz: 7962a4fd132fa2fe79e1f33eb87b7c06595a6cf8405850dd983b45ba9f2c596b
 SHA512:
-  metadata.gz: 4f419874ed73b34b3810d7fd93e97b6184496a0841b34281d2122370b61ec3201d47df2caccf8de5d18cea85655fd471099aab432a51597edbb013a85408cd54
-  data.tar.gz: 28785f40b88bc23e31f2a449590802bb3c800f049dcd59ddba1f1121525e8103c3879c6bd3b53d0dd85b7b46775606d4569ffaf96754474934fa1d9d2f70fd77
+  metadata.gz: 3098316f693c450a8f0300f157964a7ddce5f9f1320bafd0447ce1e8707a568e48604fb2c10d5bcb8e1349dc7dca7db419757b9dc91c69f29b6e24e64103fd14
+  data.tar.gz: 96ae5fd5579fb9132f2a428688453cc9885cd5bfc86edbe3a546e1ed50e8f06ec4fbd251dbfb6dfb58b1e484b7e51294b47bec4812c9938b3b62160425111e3f

data/ext/audio/audio.c

@@ -232,6 +232,9 @@ VALUE audio_play(VALUE self, VALUE channel_id, VALUE clip)
 
     cleanup_finished_channels();
 
+    // Cancel any pending drain timer for this channel
+    drain_until_frame[channel] = 0;
+
     // Clean up existing resources on this channel
     if (channels[channel] != NULL) {
         ma_sound_stop(channels[channel]);
@@ -422,6 +425,34 @@ VALUE audio_set_pos(VALUE self, VALUE channel_id, VALUE angle, VALUE distance)
     return Qnil;
 }
 
+VALUE audio_set_pan(VALUE self, VALUE channel_id, VALUE pan)
+{
+    int channel = NUM2INT(channel_id);
+    float p = (float)NUM2DBL(pan);
+
+    if (channel < 0 || channel >= MAX_CHANNELS || channels[channel] == NULL) {
+        return Qnil;
+    }
+
+    ma_sound_set_pan(channels[channel], p);
+
+    return Qnil;
+}
+
+VALUE audio_seek(VALUE self, VALUE channel_id, VALUE seconds)
+{
+    int channel = NUM2INT(channel_id);
+    float s = (float)NUM2DBL(seconds);
+
+    if (channel < 0 || channel >= MAX_CHANNELS || channels[channel] == NULL) {
+        return Qnil;
+    }
+
+    ma_sound_seek_to_second(channels[channel], s);
+
+    return Qnil;
+}
+
 VALUE audio_set_looping(VALUE self, VALUE channel_id, VALUE looping)
 {
     int channel = NUM2INT(channel_id);
@@ -606,7 +637,9 @@ void Init_audio(void)
     rb_define_singleton_method(mAudio, "set_volume", audio_set_volume, 2);
     rb_define_singleton_method(mAudio, "set_pitch", audio_set_pitch, 2);
     rb_define_singleton_method(mAudio, "set_pos", audio_set_pos, 3);
+    rb_define_singleton_method(mAudio, "set_pan", audio_set_pan, 2);
     rb_define_singleton_method(mAudio, "set_looping", audio_set_looping, 2);
+    rb_define_singleton_method(mAudio, "seek", audio_seek, 2);
 
     // Delay taps
     rb_define_singleton_method(mAudio, "add_delay_tap", audio_add_delay_tap, 3);

data/lib/dummy_audio.rb

@@ -49,6 +49,14 @@ module DummyAudio
     nil
   end
 
+  def self.set_pan(channel, pan)
+    nil
+  end
+
+  def self.seek(channel, seconds)
+    nil
+  end
+
   def self.set_looping(channel, looping)
     nil
   end

data/lib/native_audio.rb

@@ -3,6 +3,7 @@
 require_relative './audio'
 require_relative './dummy_audio'
 
+puts "[NativeAudio] Loading local development version"
 Audio.init unless ENV['DUMMY_AUDIO_BACKEND'] == 'true'
 
 module NativeAudio
@@ -83,6 +84,15 @@ module NativeAudio
       NativeAudio.audio_driver.set_pos(@channel, angle, distance)
     end
 
+    def set_pan(pan)
+      @params[:pan] = pan
+      NativeAudio.audio_driver.set_pan(@channel, pan)
+    end
+
+    def seek(seconds)
+      NativeAudio.audio_driver.seek(@channel, seconds)
+    end
+
     def set_volume(volume)
       @params[:volume] = volume
       NativeAudio.audio_driver.set_volume(@channel, volume)
@@ -133,6 +143,7 @@ module NativeAudio
       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_pan(@channel, @params[:pan]) if @params.key?(:pan)
       NativeAudio.audio_driver.set_pos(@channel, *@params[:pos]) if @params.key?(:pos)
 
       if @params.key?(:reverb)

metadata

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