native_audio 0.2.0 → 0.3.0

data/ext/{audio.c → audio/audio.c}

@@ -1,80 +1,80 @@
-#include <ruby.h>
-#include "extconf.h"
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_mixer.h>
-
-Mix_Chunk *sounds[1024];
-int sound_count = 0;
-
-VALUE audio_play(VALUE self, VALUE channel_id, VALUE clip)
-{
-  Mix_Chunk *sound = sounds[NUM2INT(clip)];
-  int channel = Mix_PlayChannel(NUM2INT(channel_id), sound, 0);
-  return rb_int2inum(channel);
-}
-
-VALUE audio_load(VALUE self, VALUE file)
-{
-  Mix_Chunk *sound = NULL;
-  sound = Mix_LoadWAV(StringValueCStr(file));
-  if(sound == NULL)
-  {
-    fprintf(stderr, "Unable to load WAV file: %s\n", Mix_GetError());
-  }
-
-  sounds[0] = sound;
-  sound_count++;
-
-  return rb_int2inum(sound_count - 1);
-}
-
-VALUE audio_set_pos(VALUE self, VALUE channel_id, VALUE angle, VALUE distance)
-{
-  Mix_SetPosition(NUM2INT(channel_id), NUM2INT(angle), NUM2INT(distance));
-  return Qnil;
-}
-
-VALUE audio_stop(VALUE self, VALUE channel_id)
-{
-  Mix_HaltChannel(NUM2INT(channel_id));
-  return Qnil;
-}
-
-VALUE audio_pause(VALUE self, VALUE channel_id)
-{
-  Mix_Pause(NUM2INT(channel_id));
-  return Qnil;
-}
-
-VALUE audio_resume(VALUE self, VALUE channel_id)
-{
-  Mix_Resume(NUM2INT(channel_id));
-  return Qnil;
-}
-
-VALUE audio_set_volume(VALUE self, VALUE channel_id, VALUE volume)
-{
-  Mix_Volume(NUM2INT(channel_id), NUM2INT(volume));
-  return Qnil;
-}
-
-void Init_audio()
-{
-  if (SDL_Init(SDL_INIT_AUDIO) != 0) { exit(1); }
-
-  int audio_rate = 22050;
-  Uint16 audio_format = AUDIO_S16SYS;
-  int audio_channels = 2;
-  int audio_buffers = 4096;
-
-  if(Mix_OpenAudio(audio_rate, audio_format, audio_channels, audio_buffers) != 0) { exit(1); }
-
-  VALUE mAudio = rb_define_module("Audio");
-  rb_define_singleton_method(mAudio, "load", audio_load, 1);
-  rb_define_singleton_method(mAudio, "play", audio_play, 2);
-  rb_define_singleton_method(mAudio, "set_pos", audio_set_pos, 3);
-  rb_define_singleton_method(mAudio, "stop", audio_stop, 1);
-  rb_define_singleton_method(mAudio, "pause", audio_pause, 1);
-  rb_define_singleton_method(mAudio, "resume", audio_resume, 1);
-  rb_define_singleton_method(mAudio, "set_volume", audio_set_volume, 2);
-}
+#include <ruby.h>
+#include "extconf.h"
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_mixer.h>
+
+Mix_Chunk *sounds[1024];
+int sound_count = 0;
+
+VALUE audio_play(VALUE self, VALUE channel_id, VALUE clip)
+{
+  Mix_Chunk *sound = sounds[NUM2INT(clip)];
+  int channel = Mix_PlayChannel(NUM2INT(channel_id), sound, 0);
+  return rb_int2inum(channel);
+}
+
+VALUE audio_load(VALUE self, VALUE file)
+{
+  Mix_Chunk *sound = NULL;
+  sound = Mix_LoadWAV(StringValueCStr(file));
+  if(sound == NULL)
+  {
+    fprintf(stderr, "Unable to load WAV file: %s\n", Mix_GetError());
+  }
+
+  sounds[0] = sound;
+  sound_count++;
+
+  return rb_int2inum(sound_count - 1);
+}
+
+VALUE audio_set_pos(VALUE self, VALUE channel_id, VALUE angle, VALUE distance)
+{
+  Mix_SetPosition(NUM2INT(channel_id), NUM2INT(angle), NUM2INT(distance));
+  return Qnil;
+}
+
+VALUE audio_stop(VALUE self, VALUE channel_id)
+{
+  Mix_HaltChannel(NUM2INT(channel_id));
+  return Qnil;
+}
+
+VALUE audio_pause(VALUE self, VALUE channel_id)
+{
+  Mix_Pause(NUM2INT(channel_id));
+  return Qnil;
+}
+
+VALUE audio_resume(VALUE self, VALUE channel_id)
+{
+  Mix_Resume(NUM2INT(channel_id));
+  return Qnil;
+}
+
+VALUE audio_set_volume(VALUE self, VALUE channel_id, VALUE volume)
+{
+  Mix_Volume(NUM2INT(channel_id), NUM2INT(volume));
+  return Qnil;
+}
+
+void Init_audio()
+{
+  if (SDL_Init(SDL_INIT_AUDIO) != 0) { exit(1); }
+
+  int audio_rate = 22050;
+  Uint16 audio_format = AUDIO_S16SYS;
+  int audio_channels = 2;
+  int audio_buffers = 4096;
+
+  if(Mix_OpenAudio(audio_rate, audio_format, audio_channels, audio_buffers) != 0) { exit(1); }
+
+  VALUE mAudio = rb_define_module("Audio");
+  rb_define_singleton_method(mAudio, "load", audio_load, 1);
+  rb_define_singleton_method(mAudio, "play", audio_play, 2);
+  rb_define_singleton_method(mAudio, "set_pos", audio_set_pos, 3);
+  rb_define_singleton_method(mAudio, "stop", audio_stop, 1);
+  rb_define_singleton_method(mAudio, "pause", audio_pause, 1);
+  rb_define_singleton_method(mAudio, "resume", audio_resume, 1);
+  rb_define_singleton_method(mAudio, "set_volume", audio_set_volume, 2);
+}

data/ext/{extconf.h → audio/extconf.h}

@@ -1,3 +1,3 @@
-#ifndef EXTCONF_H
-#define EXTCONF_H
-#endif
+#ifndef EXTCONF_H
+#define EXTCONF_H
+#endif

data/ext/audio/extconf.rb

@@ -0,0 +1,115 @@
+require 'mkmf'
+
+# Get the root directory of the gem (two levels up from ext/audio/)
+ROOT_DIR = File.expand_path('../..', __dir__)
+ASSETS_DIR = File.join(ROOT_DIR, 'assets')
+
+# Detect platform
+PLATFORM = case RUBY_PLATFORM
+when /darwin/ then :macos
+when /linux/  then :linux
+when /mingw/  then :windows
+end
+
+def add_flags(type, flags)
+  case type
+  when :c  then $CFLAGS << " #{flags} "
+  when :ld then $LDFLAGS << " #{flags} "
+  end
+end
+
+def check_sdl
+  return if have_library('SDL2') && have_library('SDL2_mixer')
+
+  msg = ["SDL2 libraries not found."]
+
+  if PLATFORM == :linux
+    if system('which apt >/dev/null 2>&1')
+      msg << "Install with: sudo apt install libsdl2-dev libsdl2-mixer-dev"
+    elsif system('which dnf >/dev/null 2>&1') || system('which yum >/dev/null 2>&1')
+      msg << "Install with: sudo dnf install SDL2-devel SDL2_mixer-devel"
+    elsif system('which pacman >/dev/null 2>&1')
+      msg << "Install with: sudo pacman -S sdl2 sdl2_mixer"
+    elsif system('which zypper >/dev/null 2>&1')
+      msg << "Install with: sudo zypper install libSDL2-devel libSDL2_mixer-devel"
+    end
+  end
+
+  abort msg.join("\n")
+end
+
+def set_linux_flags
+  check_sdl
+  add_flags(:ld, "-lSDL2 -lSDL2_mixer -lm")
+end
+
+def use_dev_libs
+  case PLATFORM
+  when :macos
+    add_flags(:c, `sdl2-config --cflags`)
+    add_flags(:c, '-I/opt/homebrew/include')
+    add_flags(:ld, `sdl2-config --libs`)
+    add_flags(:ld, '-lSDL2 -lSDL2_mixer')
+  when :windows
+    add_flags(:ld, '-lSDL2 -lSDL2_mixer')
+  when :linux
+    set_linux_flags
+  end
+end
+
+def use_bundled_libs
+  add_flags(:c, '-std=c11')
+
+  case PLATFORM
+  when :macos
+    add_flags(:c, "-I#{ASSETS_DIR}/include")
+    ldir = "#{ASSETS_DIR}/macos/universal/lib"
+
+    add_flags(:ld, "#{ldir}/libSDL2.a #{ldir}/libSDL2_mixer.a")
+    add_flags(:ld, "#{ldir}/libmpg123.a #{ldir}/libogg.a #{ldir}/libFLAC.a")
+    add_flags(:ld, "#{ldir}/libvorbis.a #{ldir}/libvorbisfile.a #{ldir}/libmodplug.a")
+    add_flags(:ld, "-lz -liconv -lstdc++")
+
+    frameworks = %w[Cocoa Carbon GameController ForceFeedback
+                    AudioToolbox CoreAudio IOKit CoreHaptics CoreVideo Metal]
+    add_flags(:ld, frameworks.map { |f| "-Wl,-framework,#{f}" }.join(' '))
+
+  when :windows
+    add_flags(:c, "-I#{ASSETS_DIR}/include")
+
+    ldir = if RUBY_PLATFORM =~ /ucrt/
+      "#{ASSETS_DIR}/windows/mingw-w64-ucrt-x86_64/lib"
+    else
+      "#{ASSETS_DIR}/windows/mingw-w64-x86_64/lib"
+    end
+
+    add_flags(:ld, "-Wl,--start-group")
+    add_flags(:ld, "#{ldir}/libSDL2.a #{ldir}/libSDL2_mixer.a")
+    add_flags(:ld, "#{ldir}/libmpg123.a #{ldir}/libFLAC.a #{ldir}/libvorbis.a")
+    add_flags(:ld, "#{ldir}/libvorbisfile.a #{ldir}/libogg.a #{ldir}/libmodplug.a")
+    add_flags(:ld, "#{ldir}/libopus.a #{ldir}/libopusfile.a #{ldir}/libsndfile.a")
+    add_flags(:ld, "#{ldir}/libstdc++.a #{ldir}/libz.a")
+    add_flags(:ld, '-lmingw32 -lole32 -loleaut32 -limm32')
+    add_flags(:ld, '-lversion -lwinmm -lrpcrt4 -mwindows -lsetupapi -ldwrite')
+    add_flags(:ld, "-Wl,--end-group")
+
+  when :linux
+    set_linux_flags
+
+  else
+    use_dev_libs
+  end
+end
+
+# Main configuration
+if ARGV.include?('dev')
+  use_dev_libs
+else
+  use_bundled_libs
+end
+
+$CFLAGS.gsub!(/\n/, ' ')
+$LDFLAGS.gsub!(/\n/, ' ')
+
+create_header
+create_makefile('audio')

data/lib/native_audio.rb

@@ -1,50 +1,50 @@
-# frozen_string_literal: true
-
-require_relative './audio'
-
-module NativeAudio
-  class Clip
-    attr_reader :clip
-
-    def initialize(path)
-      @path = path
-      @clip = Audio.load(path)
-    end
-  end
-
-  class AudioSource
-    def initialize(clip)
-      @clip = clip
-      @channel = AudioSource.channels.count
-      AudioSource.channels << self
-    end
-
-    def play
-      Audio.play(@channel, @clip.clip)
-    end
-
-    def stop
-      Audio.stop(@channel)
-    end
-
-    def pause
-      Audio.pause(@channel)
-    end
-
-    def resume
-      Audio.resume(@channel)
-    end
-
-    def set_pos(angle, distance)
-      Audio.set_pos(@channel, angle, distance)
-    end
-
-    def set_volume(volume)
-      Audio.set_volume(@channel, volume)
-    end
-
-    def self.channels
-      @channels ||= []
-    end
-  end
-end
+# frozen_string_literal: true
+
+require_relative './audio'
+
+module NativeAudio
+  class Clip
+    attr_reader :clip
+
+    def initialize(path)
+      @path = path
+      @clip = Audio.load(path)
+    end
+  end
+
+  class AudioSource
+    def initialize(clip)
+      @clip = clip
+      @channel = AudioSource.channels.count
+      AudioSource.channels << self
+    end
+
+    def play
+      Audio.play(@channel, @clip.clip)
+    end
+
+    def stop
+      Audio.stop(@channel)
+    end
+
+    def pause
+      Audio.pause(@channel)
+    end
+
+    def resume
+      Audio.resume(@channel)
+    end
+
+    def set_pos(angle, distance)
+      Audio.set_pos(@channel, angle, distance)
+    end
+
+    def set_volume(volume)
+      Audio.set_volume(@channel, volume)
+    end
+
+    def self.channels
+      @channels ||= []
+    end
+  end
+end

metadata

@@ -1,32 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: native_audio
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Max Hatfull
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-01-26 00:00:00.000000000 Z
 dependencies: []
 description: A simple audio library for Ruby
 email:
 - max.hatfull@gmail.com
 executables: []
 extensions:
-- ext/extconf.rb
+- ext/audio/extconf.rb
 extra_rdoc_files: []
 files:
-- assets/include/GL/glew.h
-- assets/include/GLES2/gl2.h
-- assets/include/GLES2/gl2ext.h
-- assets/include/GLES2/gl2ext_angle.h
-- assets/include/GLES2/gl2platform.h
-- assets/include/GLES3/gl3.h
-- assets/include/GLES3/gl31.h
-- assets/include/GLES3/gl32.h
-- assets/include/GLES3/gl3platform.h
-- assets/include/KHR/khrplatform.h
 - assets/include/SDL2/SDL.h
 - assets/include/SDL2/SDL_assert.h
 - assets/include/SDL2/SDL_atomic.h
@@ -123,9 +113,7 @@ files:
 - assets/include/SDL2/close_code.h
 - assets/macos/universal/lib/libFLAC.a
 - assets/macos/universal/lib/libSDL2.a
-- assets/macos/universal/lib/libSDL2_image.a
 - assets/macos/universal/lib/libSDL2_mixer.a
-- assets/macos/universal/lib/libSDL2_ttf.a
 - assets/macos/universal/lib/libmodplug.a
 - assets/macos/universal/lib/libmpg123.a
 - assets/macos/universal/lib/libogg.a
@@ -134,40 +122,32 @@ files:
 - assets/windows/mingw-w64-ucrt-x86_64/lib/libFLAC.a
 - assets/windows/mingw-w64-ucrt-x86_64/lib/libSDL2.a
 - assets/windows/mingw-w64-ucrt-x86_64/lib/libSDL2_mixer.a
-- assets/windows/mingw-w64-ucrt-x86_64/lib/libglew32.a
 - assets/windows/mingw-w64-ucrt-x86_64/lib/libmodplug.a
 - assets/windows/mingw-w64-ucrt-x86_64/lib/libmpg123.a
 - assets/windows/mingw-w64-ucrt-x86_64/lib/libogg.a
 - assets/windows/mingw-w64-ucrt-x86_64/lib/libopus.a
 - assets/windows/mingw-w64-ucrt-x86_64/lib/libopusfile.a
 - assets/windows/mingw-w64-ucrt-x86_64/lib/libsndfile.a
-- assets/windows/mingw-w64-ucrt-x86_64/lib/libssp.a
 - assets/windows/mingw-w64-ucrt-x86_64/lib/libstdc++.a
 - assets/windows/mingw-w64-ucrt-x86_64/lib/libvorbis.a
 - assets/windows/mingw-w64-ucrt-x86_64/lib/libvorbisfile.a
 - assets/windows/mingw-w64-ucrt-x86_64/lib/libz.a
-- assets/windows/mingw-w64-ucrt-x86_64/lib/libzstd.a
 - assets/windows/mingw-w64-x86_64/lib/libFLAC.a
 - assets/windows/mingw-w64-x86_64/lib/libSDL2.a
 - assets/windows/mingw-w64-x86_64/lib/libSDL2_mixer.a
-- assets/windows/mingw-w64-x86_64/lib/libglew32.a
 - assets/windows/mingw-w64-x86_64/lib/libmodplug.a
 - assets/windows/mingw-w64-x86_64/lib/libmpg123.a
 - assets/windows/mingw-w64-x86_64/lib/libogg.a
 - assets/windows/mingw-w64-x86_64/lib/libopus.a
 - assets/windows/mingw-w64-x86_64/lib/libopusfile.a
 - assets/windows/mingw-w64-x86_64/lib/libsndfile.a
-- assets/windows/mingw-w64-x86_64/lib/libssp.a
 - assets/windows/mingw-w64-x86_64/lib/libstdc++.a
 - assets/windows/mingw-w64-x86_64/lib/libvorbis.a
 - assets/windows/mingw-w64-x86_64/lib/libvorbisfile.a
 - assets/windows/mingw-w64-x86_64/lib/libz.a
-- assets/windows/mingw-w64-x86_64/lib/libzstd.a
-- ext/audio.c
-- ext/extconf.h
-- ext/extconf.rb
-- lib/audio.bundle
-- lib/audio.so
+- ext/audio/audio.c
+- ext/audio/extconf.h
+- ext/audio/extconf.rb
 - lib/native_audio.rb
 homepage: https://github.com/rubyrpg/native_audio
 licenses:
@@ -187,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A simple audio library for Ruby
 test_files: []