native_audio 0.1.0 → 0.2.0

data/ext/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

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

data/ext/extconf.rb

@@ -1,177 +1,173 @@
-
-require 'mkmf'
-
-case RUBY_PLATFORM
-when /darwin/
-  $PLATFORM = :macos
-when /linux/
-  $PLATFORM = :linux
-  if `cat /etc/os-release` =~ /raspbian/
-    $PLATFORM = :linux_rpi
-  end
-when /bsd/
-  $PLATFORM = :bsd
-when /mingw/
-  $PLATFORM = :windows
-else
-  $PLATFORM = nil
-end
-$errors = []  # Holds errors
-
-# Helper functions #############################################################
-
-# Print installation errors
-def print_errors
-  puts "
-#{"== #{"Ruby 2D Installation Errors".error} =======================================\n"}
-  #{$errors.join("\n  ")}\n
-#{"======================================================================"}"
-end
-
-# Add compiler and linker flags
-def add_flags(type, flags)
-  case type
-  when :c
-    $CFLAGS << " #{flags} "
-  when :ld
-    $LDFLAGS << " #{flags} "
-  end
-end
-
-# Check for SDL libraries
-def check_sdl
-  unless have_library('SDL2') && have_library('SDL2_mixer')
-
-    $errors << "Couldn't find packages needed."
-
-    case $platform
-    when :linux, :linux_rpi
-      # Fedora and CentOS
-      if system('which yum')
-        $errors << "Install the following packages using `yum` (or `dnf`) and try again:\n" <<
-          "  SDL2-devel SDL2_mixer-devel".bold
-
-        # Arch
-      elsif system('which pacman')
-        $errors << "Install the following packages using `pacman` and try again:\n" <<
-          "  sdl2 sdl2_mixer".bold
-
-        # openSUSE
-      elsif system('which zypper')
-        $errors << "Install the following packages using `zypper` and try again:\n" <<
-          "  libSDL2-devel libSDL2_mixer-devel".bold
-
-        # Ubuntu, Debian, and Mint
-        # `apt` must be last because openSUSE has it aliased to `zypper`
-      elsif system('which apt')
-        $errors << "Install the following packages using `apt` and try again:\n" <<
-          "  libsdl2-dev libsdl2-mixer-dev".bold
-      end
-    when :bsd
-      $errors << "Install the following packages using `pkg` and try again:\n" <<
-        "  sdl2 sdl2_mixer".bold
-    end
-
-    $errors << "" << "See #{"ruby2d.com".bold} for additional help."
-    print_errors; exit
-  end
-end
-
-# Set Raspberry Pi flags
-def set_rpi_flags
-  if $platform == :linux_rpi
-    add_flags(:c, '-I/opt/vc/include')
-    add_flags(:ld, '-L/opt/vc/lib -lbrcmGLESv2')
-  end
-end
-
-# Set flags for Linux and BSD
-def set_linux_bsd_flags
-  check_sdl
-  set_rpi_flags
-  add_flags(:ld, "-lSDL2 -lSDL2_mixer -lm")
-  if $PLATFORM == :linux then add_flags(:ld, '-lGL') end
-end
-
-
-# Use SDL and other libraries installed by the user (not those bundled with the gem)
-def use_usr_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_image -lSDL2_mixer -lSDL2_ttf')
-    add_flags(:ld, '-Wl,-framework,OpenGL')
-  when :windows
-    add_flags(:ld, '-lSDL2 -lSDL2_mixer')
-    add_flags(:ld, '-lopengl32 -lglew32')
-  when :linux_rpi
-    set_linux_bsd_flags
-  end
-end
-
-
-# Configure native extension ###################################################
-
-# Build Ruby 2D native extention using libraries installed by user
-# To use install flag: `gem install ruby2d -- dev`
-if ARGV.include? 'dev'
-  use_usr_libs
-
-  # Use libraries provided by the gem (default)
-else
-  add_flags(:c, '-std=c11')
-
-  case $PLATFORM
-  when :macos
-    add_flags(:c, '-I../assets/include')
-    ldir = "#{Dir.pwd}/../assets/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 #{ldir}/libvorbis.a #{ldir}/libvorbisfile.a #{ldir}/libmodplug.a")
-    add_flags(:ld, "-lz -liconv -lstdc++")
-    add_flags(:ld, "-Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,GameController -Wl,-framework,ForceFeedback -Wl,-framework,OpenGL -Wl,-framework,AudioToolbox -Wl,-framework,CoreAudio -Wl,-framework,IOKit -Wl,-framework,CoreHaptics -Wl,-framework,CoreVideo -Wl,-framework,Metal")
-
-  when :windows
-    add_flags(:c, '-I../assets/include')
-
-    if RUBY_PLATFORM =~ /ucrt/
-      ldir = "#{Dir.pwd}/../assets/windows/mingw-w64-ucrt-x86_64/lib"
-    else
-      ldir = "#{Dir.pwd}/../assets/windows/mingw-w64-x86_64/lib"
-    end
-
-    # Start linker flags (needed to avoid circular dependencies)
-    add_flags(:ld, "-Wl,--start-group")
-
-    # SDL2
-    add_flags(:ld, "#{ldir}/libSDL2.a")
-
-    # SDL2_mixer
-    add_flags(:ld, "#{ldir}/libSDL2_mixer.a")
-    add_flags(:ld, "#{ldir}/libmpg123.a #{ldir}/libFLAC.a #{ldir}/libvorbis.a #{ldir}/libvorbisfile.a #{ldir}/libogg.a "\
-      "#{ldir}/libmodplug.a #{ldir}/libopus.a #{ldir}/libopusfile.a #{ldir}/libsndfile.a")
-
-    # Other dependencies
-    add_flags(:ld, "#{ldir}/libglew32.a #{ldir}/libstdc++.a #{ldir}/libz.a")
-    add_flags(:ld, '-lmingw32 -lopengl32 -lole32 -loleaut32 -limm32 -lversion -lwinmm -lrpcrt4 -mwindows -lsetupapi -ldwrite')
-
-    # End linker flags
-    add_flags(:ld, "-Wl,--end-group")
-
-  when :linux, :linux_rpi, :bsd
-    set_linux_bsd_flags
-
-    # If can't detect the platform, use libraries installed by the user
-  else
-    use_usr_libs
-  end
-end
-
-$CFLAGS.gsub!(/\n/, ' ')  # remove newlines in flags, they can cause problems
-$LDFLAGS.gsub!(/\n/, ' ')  # remove newlines in flags, they can cause problems
-
-# Create Makefile
-create_header
-create_makefile('audio')
+
+require 'mkmf'
+
+case RUBY_PLATFORM
+when /darwin/
+  $PLATFORM = :macos
+when /linux/
+  $PLATFORM = :linux
+  if `cat /etc/os-release` =~ /raspbian/
+    $PLATFORM = :linux_rpi
+  end
+when /bsd/
+  $PLATFORM = :bsd
+when /mingw/
+  $PLATFORM = :windows
+else
+  $PLATFORM = nil
+end
+$errors = []  # Holds errors
+
+# Helper functions #############################################################
+
+# Print installation errors
+def print_errors
+  puts "
+#{"== #{"Ruby 2D Installation Errors".error} =======================================\n"}
+  #{$errors.join("\n  ")}\n
+#{"======================================================================"}"
+end
+
+# Add compiler and linker flags
+def add_flags(type, flags)
+  case type
+  when :c
+    $CFLAGS << " #{flags} "
+  when :ld
+    $LDFLAGS << " #{flags} "
+  end
+end
+
+# Check for SDL libraries
+def check_sdl
+  unless have_library('SDL2') && have_library('SDL2_mixer')
+
+    $errors << "Couldn't find packages needed."
+
+    case $platform
+    when :linux, :linux_rpi
+      # Fedora and CentOS
+      if system('which yum')
+        $errors << "Install the following packages using `yum` (or `dnf`) and try again:\n" <<
+          "  SDL2-devel SDL2_mixer-devel".bold
+
+      elsif system('which pacman') # Arch
+        $errors << "Install the following packages using `pacman` and try again:\n" <<
+          "  sdl2 sdl2_mixer".bold
+
+      elsif system('which zypper') # openSUSE
+        $errors << "Install the following packages using `zypper` and try again:\n" <<
+          "  libSDL2-devel libSDL2_mixer-devel".bold
+
+        # Ubuntu, Debian, and Mint
+        # `apt` must be last because openSUSE has it aliased to `zypper`
+      elsif system('which apt')
+        $errors << "Install the following packages using `apt` and try again:\n" <<
+          "  libsdl2-dev libsdl2-mixer-dev".bold
+      end
+    when :bsd
+      $errors << "Install the following packages using `pkg` and try again:\n" <<
+        "  sdl2 sdl2_mixer".bold
+    end
+
+    $errors << "" << "See #{"ruby2d.com".bold} for additional help."
+    print_errors; exit
+  end
+end
+
+# Set Raspberry Pi flags
+def set_rpi_flags
+  if $platform == :linux_rpi
+    add_flags(:c, '-I/opt/vc/include')
+    add_flags(:ld, '-L/opt/vc/lib -lbrcmGLESv2')
+  end
+end
+
+# Set flags for Linux and BSD
+def set_linux_bsd_flags
+  check_sdl
+  set_rpi_flags
+  add_flags(:ld, "-lSDL2 -lSDL2_mixer -lm")
+  if $PLATFORM == :linux then add_flags(:ld, '-lGL') end
+end
+
+
+# Use SDL and other libraries installed by the user (not those bundled with the gem)
+def use_usr_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_image -lSDL2_mixer -lSDL2_ttf')
+    add_flags(:ld, '-Wl,-framework,OpenGL')
+  when :windows
+    add_flags(:ld, '-lSDL2 -lSDL2_mixer')
+    add_flags(:ld, '-lopengl32 -lglew32')
+  when :linux_rpi
+    set_linux_bsd_flags
+  end
+end
+
+
+# Configure native extension ###################################################
+
+# Build Ruby 2D native extention using libraries installed by user
+# To use install flag: `gem install ruby2d -- dev`
+if ARGV.include? 'dev'
+  use_usr_libs
+
+else # Use libraries provided by the gem (default)
+  add_flags(:c, '-std=c11')
+
+  case $PLATFORM
+  when :macos
+    add_flags(:c, '-I../assets/include')
+    ldir = "#{Dir.pwd}/../assets/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 #{ldir}/libvorbis.a #{ldir}/libvorbisfile.a #{ldir}/libmodplug.a")
+    add_flags(:ld, "-lz -liconv -lstdc++")
+    add_flags(:ld, "-Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,GameController -Wl,-framework,ForceFeedback -Wl,-framework,OpenGL -Wl,-framework,AudioToolbox -Wl,-framework,CoreAudio -Wl,-framework,IOKit -Wl,-framework,CoreHaptics -Wl,-framework,CoreVideo -Wl,-framework,Metal")
+
+  when :windows
+    add_flags(:c, '-I../assets/include')
+
+    if RUBY_PLATFORM =~ /ucrt/
+      ldir = "#{Dir.pwd}/../assets/windows/mingw-w64-ucrt-x86_64/lib"
+    else
+      ldir = "#{Dir.pwd}/../assets/windows/mingw-w64-x86_64/lib"
+    end
+
+    # Start linker flags (needed to avoid circular dependencies)
+    add_flags(:ld, "-Wl,--start-group")
+
+    # SDL2
+    add_flags(:ld, "#{ldir}/libSDL2.a")
+
+    # SDL2_mixer
+    add_flags(:ld, "#{ldir}/libSDL2_mixer.a")
+    add_flags(:ld, "#{ldir}/libmpg123.a #{ldir}/libFLAC.a #{ldir}/libvorbis.a #{ldir}/libvorbisfile.a #{ldir}/libogg.a "\
+      "#{ldir}/libmodplug.a #{ldir}/libopus.a #{ldir}/libopusfile.a #{ldir}/libsndfile.a")
+
+    # Other dependencies
+    add_flags(:ld, "#{ldir}/libglew32.a #{ldir}/libstdc++.a #{ldir}/libz.a")
+    add_flags(:ld, '-lmingw32 -lopengl32 -lole32 -loleaut32 -limm32 -lversion -lwinmm -lrpcrt4 -mwindows -lsetupapi -ldwrite')
+
+    # End linker flags
+    add_flags(:ld, "-Wl,--end-group")
+
+  when :linux, :linux_rpi, :bsd
+    set_linux_bsd_flags
+
+  else # If can't detect the platform, use libraries installed by the user
+    use_usr_libs
+  end
+end
+
+$CFLAGS.gsub!(/\n/, ' ')  # remove newlines in flags, they can cause problems
+$LDFLAGS.gsub!(/\n/, ' ')  # remove newlines in flags, they can cause problems
+
+# Create Makefile
+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