hallon-openal 0.0.3 → 1.0.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v1.0.0
+- Fix bug when stopping audio when currently playing (see #1)
+- Bumped to v1.0.0. The API is stable, even though the gem is not. :p
+
 # v0.0.3
 - Check for headers in multiple locations: OpenAL/ and AL/
 - Link against openal on non-OSX platforms

data/README.md

@@ -3,14 +3,17 @@
 This gem supplies Hallon with the ability to stream audio through your
 speakers using OpenAL.
 
+As far as API goes it follows the [Hallon audio driver protocol](http://rubydoc.info/github/Burgestrand/Hallon/Hallon/ExampleAudioDriver).
+
 ## Installation
 
     gem install hallon-openal
 
 ## Issues? Bugs? Feedback?
 
-I’d be happy to discuss any and all of these with you. Feel free to [create an issue](https://github.com/Burgestrand/hallon-openal/issues),
-[email me](http://github.com/Burgestrand) or [tweet me at @Burgestrand](http://twitter.com/Burgestrand).
+- __Got questions?__ Ask on the mailing list: <mailto:ruby-hallon@googlegroups.com> (<https://groups.google.com/d/forum/ruby-hallon>)
+- __Found a bug?__ Report an issue: <https://github.com/Burgestrand/hallon-openal/issues/new>
+- __Have feedback?__ I ❤ feedback! Please send it to the mailing list.
 
 ## License
 

data/ext/hallon/extconf.rb

@@ -11,6 +11,9 @@ $CFLAGS << ' -ggdb -O0 -Wextra'
 
 error 'Missing ruby header' unless have_header 'ruby.h'
 
+# Allow configuration of openal directory
+dir_config 'openal'
+
 if have_header('OpenAL/alc.h')
   # yay, probably mac os!
 elsif have_header('AL/alc.h')
@@ -28,4 +31,8 @@ else
   error 'Missing openal library'
 end
 
+%w[alcOpenDevice alGetError].each do |func|
+  abort "Missing function #{func}" unless have_func(func)
+end
+
 create_makefile('openal_ext')

data/ext/hallon/openal_ext.c

@@ -4,7 +4,7 @@
 #ifdef HAVE_AL_ALC_H
 #  include <AL/alc.h>
 #  include <AL/al.h>
-#elif HAVE_OPENAL_ALC_H
+#else
 #  include <OpenAL/alc.h>
 #  include <OpenAL/al.h>
 #endif
@@ -90,7 +90,7 @@ static inline int _oa_format_channels(VALUE self)
 static inline int _oa_format_rate(VALUE self)
 {
   VALUE rate = rb_hash_aref(oa_format_get(self), oa_key_rate);
-  return FIX2LONG(rate);
+  return FIX2INT(rate);
 }
 
 static inline VALUE _oa_format_type(VALUE self)
@@ -188,14 +188,14 @@ static VALUE oa_stop(VALUE self)
   ALuint source = oa_struct(self)->source;
   rb_ivar_set(self, oa_iv_playing, Qfalse);
 
-  // remove all buffers from the source
-  alSourcei(source, AL_BUFFER, 0);
-  OA_CHECK_ERRORS("remove buffers!");
-
   // and stop the source
   alSourceStop(source);
   OA_CHECK_ERRORS("stop!");
 
+  // remove all buffers from the source
+  alSourcei(source, AL_BUFFER, 0);
+  OA_CHECK_ERRORS("remove buffers!");
+
   return self;
 }
 
@@ -267,14 +267,14 @@ static VALUE oa_stream(VALUE self)
 
   for (;;)
   {
-    // make sure we have no preattached buffers
-    alSourcei(source, AL_BUFFER, 0);
-    OA_CHECK_ERRORS("detach all buffers from the source");
-
     // make sure we’re not playing audio
     alSourceStop(source);
     OA_CHECK_ERRORS("reset driver");
 
+    // make sure we have no preattached buffers
+    alSourcei(source, AL_BUFFER, 0);
+    OA_CHECK_ERRORS("detach all buffers from the source");
+
     // read the format (it never changes in the inner loop)
     int f_channels = _oa_format_channels(self);
     int f_rate     = _oa_format_rate(self);
@@ -336,7 +336,7 @@ static VALUE oa_stream(VALUE self)
 
       // pucker up all the params
       ALenum type  = f_channels == 1 ? AL_FORMAT_MONO16 : AL_FORMAT_STEREO16;
-      ALsizei size = f_size * num_current_samples;
+      ALsizei size = (ALsizei) f_size * num_current_samples;
       ALsizei freq = f_rate;
 
       // queue the data!

data/lib/hallon/openal/version.rb

@@ -1,5 +1,5 @@
 module Hallon
   class OpenAL
-    VERSION = '0.0.3'
+    VERSION = '1.0.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hallon-openal
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-05 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hallon
-  requirement: &70277904130900 !ruby/object:Gem::Requirement
+  requirement: &70151857522300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.13'
   type: :runtime
   prerelease: false
-  version_requirements: *70277904130900
+  version_requirements: *70151857522300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70277904130280 !ruby/object:Gem::Requirement
+  requirement: &70151857521660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70277904130280
+  version_requirements: *70151857521660
 description: 
 email:
 - kim@burgestrand.se
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: ! 'OpenAL audio drivers for Hallon: http://rubygems.org/gems/hallon'