hallon-openal 1.0.0 → 1.0.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v1.0.1
+- Fix bug when stopping while trying to find an empty buffer.
+
 # 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

data/ext/hallon/extconf.rb

@@ -32,7 +32,7 @@ else
 end
 
 %w[alcOpenDevice alGetError].each do |func|
-  abort "Missing function #{func}" unless have_func(func)
+  error "Missing function #{func}" unless have_func(func)
 end
 
 create_makefile('openal_ext')

data/ext/hallon/openal_ext.c

@@ -103,8 +103,6 @@ static inline VALUE _oa_format_type(VALUE self)
 
 static void oa_free(oa_struct_t *data_ptr)
 {
-  int i;
-
   // exit early if we have no data_ptr at all
   if ( ! data_ptr) return;
 
@@ -139,7 +137,6 @@ static VALUE oa_allocate(VALUE klass)
 static VALUE oa_initialize(VALUE self)
 {
   oa_struct_t *data_ptr;
-  ALenum error = AL_NO_ERROR;
 
   // initialize openal
   Data_Get_Struct(self, oa_struct_t, data_ptr);
@@ -174,6 +171,8 @@ static VALUE oa_initialize(VALUE self)
   // generate our source
 	alGenSources(1, &data_ptr->source);
   OA_CHECK_ERRORS("gen sources");
+
+  return self;
 }
 
 static VALUE oa_play(VALUE self)
@@ -220,29 +219,48 @@ static ALuint find_empty_buffer(VALUE self)
   ALuint source   = data_ptr->source;
   ALuint *buffers = data_ptr->buffers;
 
-  ALint num_queued = 0;
-  alGetSourcei(source, AL_BUFFERS_QUEUED, &num_queued);
-  OA_CHECK_ERRORS("AL_BUFFERS_QUEUED");
+  struct timeval poll_time;
+  poll_time.tv_sec  = 0;
+  poll_time.tv_usec = 100;	/* 0.000100 sec */
 
-  if (num_queued < NUM_BUFFERS)
-  {
-    empty_buffer = buffers[num_queued];
-  }
-  else
+  /* infinite loop until we break */
+  for (;;rb_thread_wait_for(poll_time))
   {
-    int processed;
-    struct timeval poll_time;
-    poll_time.tv_sec  = 0;
-    poll_time.tv_usec = 100;	/* 0.000100 sec */
+    ALint num_queued = 0;
+    alGetSourcei(source, AL_BUFFERS_QUEUED, &num_queued);
+    OA_CHECK_ERRORS("AL_BUFFERS_QUEUED");
 
-    for (processed = 0; processed == 0; rb_thread_wait_for(poll_time))
+    if (num_queued < NUM_BUFFERS)
     {
-      alGetSourcei(source, AL_BUFFERS_PROCESSED, &processed);
-      OA_CHECK_ERRORS("AL_BUFFERS_PROCESSED");
+      empty_buffer = buffers[num_queued];
+      DEBUG("Q/B: %d/%d\n", num_queued, NUM_BUFFERS);
+      break;
+    }
+    else
+    {
+      ALint state;
+      alGetSourcei(source, AL_SOURCE_STATE, &state);
+      OA_CHECK_ERRORS("AL_SOURCE_STATE");
+
+      /* there is an openal bug that appears to assume
+       * all queued buffers are processed when the source
+       * is not playing */
+      if (state == AL_PLAYING)
+      {
+        int processed = 0;
+
+        alGetSourcei(source, AL_BUFFERS_PROCESSED, &processed);
+        OA_CHECK_ERRORS("AL_BUFFERS_PROCESSED");
+
+        if (processed > 0)
+        {
+          DEBUG("processed: %d\n", processed);
+          alSourceUnqueueBuffers(source, 1, &empty_buffer);
+          OA_CHECK_ERRORS("alSourceUnqueueBuffers");
+          break;
+        }
+      }
     }
-
-    alSourceUnqueueBuffers(source, 1, &empty_buffer);
-    OA_CHECK_ERRORS("alSourceUnqueueBuffers");
   }
 
   return empty_buffer;
@@ -301,6 +319,9 @@ static VALUE oa_stream(VALUE self)
 
     for (;;)
     {
+      ALuint buffer = find_empty_buffer(self);
+      OA_CHECK_ERRORS("find_empty_buffer");
+
       // pull some audio out of hallon
       VALUE frames = rb_yield(INT2FIX(sample_ary_frames));
 
@@ -311,9 +332,6 @@ static VALUE oa_stream(VALUE self)
         break;
       }
 
-      ALuint buffer = find_empty_buffer(self);
-      OA_CHECK_ERRORS("find_empty_buffer");
-
       // convert the frames from ruby to C
       int num_current_samples = ((int) RARRAY_LEN(frames)) * f_channels;
 

data/lib/hallon/openal/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hallon-openal
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,30 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-08 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hallon
-  requirement: &70151857522300 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.13'
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *70151857522300
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.13'
+    none: false
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70151857521660 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
+    none: false
   type: :development
-  prerelease: false
-  version_requirements: *70151857521660
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
+    none: false
 description: 
 email:
 - kim@burgestrand.se
@@ -63,20 +73,20 @@ require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ! 'OpenAL audio drivers for Hallon: http://rubygems.org/gems/hallon'