ao 0.1.2 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 453cbe5045fb3355237c6ac508bb22f7945035fae1c068ddc370beecb2d282d0
-  data.tar.gz: 9a3385722ad42cc9007157cd6ca4305c37b7692ce2d0b26da9dd5deacdc4da90
+  metadata.gz: 95b55efc78c4e08cecf01300b2498ae7d0167133de4c7b45eda9833096075574
+  data.tar.gz: c0642596b538bd9369747e314c338d1bca68154edf8d8799cadf346093968047
 SHA512:
-  metadata.gz: 1bf39b9ab09d450dff5c79dd57f7a934c3218700dddf38474b05c099637cd9c52a8180b509464fe179353d70839865154adecd030bf848b92ca2b7f5e64af834
-  data.tar.gz: 213ab51a9dede88944bf1629307c752a6ee3aba29e7c6a875b5e7342ae3d2937bf4763bf5eb80a5b5db7f7f62f39640cf63d9efb71abf33a881981d794fe7041
+  metadata.gz: 56453a03af111246aad7b0af58fd572f796021ffc006a65cb27cc91b3bb4c2509fd407153b236ac4028ef89ffe597bada7c0f33cae83f016ebb345eb777b8fbd
+  data.tar.gz: 6d2ef0d6a259de0fad48975ec617a14d0a1fc10e3303d86eb2ab57beebe6d2fb3a98edc02b1b6b93d3f91fdbdce3489e51000c1157e8463bbe352987f5108eb6

data/README.rdoc

@@ -1,6 +1,6 @@
 = Ruby-AO(libao Ruby Interface)
 
-* http://bitbucket.org/phenomer/ruby-ao
+* https://github.com/phenomer/ruby-ao
 
 == 概要
 ruby-aoは、シンプルでクロスプラットフォームなオーディオ出力ライブラリ

data/example/rawplay.rb

@@ -12,7 +12,7 @@ require 'audio/output'
 
 ARGV.each{|file|
   if File.file?(file)
-    Audio::LiveOutput.new(bits: 16, rate: 44100, channels: 2,
+    Audio::LiveOutput.new(driver_id: Audio::Info.default_driver_id, bits: 16, rate: 44100, channels: 2,
                           byte_format: Audio::Info::FMT_LITTLE){|ao|
       File.open(file){|f|
         while buffer = f.read(4096)

data/ext/audio/cao.h

@@ -52,6 +52,7 @@ typedef struct ao_struct {
   pthread_mutex_t   mutex;
   pthread_cond_t    cond;
   int               status;
+  int               tmode;
 } ao_struct;
 
 

data/ext/audio/device.c

@@ -35,7 +35,7 @@ init_aos(ao_device *dev, ao_sample_format *format,
   aos->queue   = NULL;
   aos->status  = 1;
   aos->qsize   = 0;
-  aos->thread  = 0;
+  aos->tmode   = 0;
   return aos;
 }
 
@@ -73,7 +73,7 @@ raodev_play(VALUE obj, VALUE output_samples)
   }
   memcpy(sample->buffer, StringValuePtr(output_samples), sample->bytes);
 
-  if (aos->thread == 1){
+  if (aos->tmode == 1){
     enqueue(aos, sample);
   } else {
     aosg.aos = aos;
@@ -97,10 +97,9 @@ raodev_play(VALUE obj, VALUE output_samples)
  */
 void
 close_device(ao_struct *aos){
-  int i;
   sample_t *sample;
 
-  if (aos->thread == 1){
+  if (aos->tmode == 1){
     assert(pthread_mutex_lock(&aos->mutex) == 0);
     if (aos->status > 0){
       aos->status = 0;
@@ -113,21 +112,21 @@ close_device(ao_struct *aos){
       free(sample);
     }
     pthread_join(aos->thread, NULL);
-  } else {
-    if (aos->device != NULL){
-      ao_close(aos->device);
-    }
-    if (aos->option != NULL){
-      ao_free_options(aos->option);
-    }
-    if (aos->format != NULL){
-      free_format(aos->format);
-    }
-    aos->device = NULL;
-    aos->option = NULL;
-    aos->format = NULL;
-    aos->queue  = NULL;
   }
+
+  if (aos->device != NULL){
+    ao_close(aos->device);
+  }
+  if (aos->option != NULL){
+    ao_free_options(aos->option);
+  }
+  if (aos->format != NULL){
+    free_format(aos->format);
+  }
+  aos->device = NULL;
+  aos->option = NULL;
+  aos->format = NULL;
+  aos->queue  = NULL;
   return;
 }
 

data/ext/audio/exception.c

@@ -1,8 +1,5 @@
 #include "cao.h"
 
-VALUE cAudio;
-VALUE cAO_Live;
-VALUE cAO_File;
 VALUE cAO_eAOError;
 VALUE cAO_eNoDriver;
 VALUE cAO_eNotFile;

data/ext/audio/info.c

@@ -4,12 +4,6 @@
 #include <errno.h>
 #include "cao.h"
 
-VALUE cAudio;
-VALUE cAO_Live;
-VALUE cAO_Info;
-VALUE cAO_eDriverError;
-VALUE cAO_eBadFormat;
-
 /*
   ao_info構造体をRubyのHashに変換し返す。
 */

data/ext/audio/mixer.c

@@ -9,7 +9,7 @@ int
 mix_sample_8(sample_t **samples,  sample_t *ret, int chs){
   int32_t sum;
   int ch;
-  int pos;
+  uint32_t pos;
   int8_t *buffer;
   int8_t *src;
 
@@ -31,7 +31,7 @@ int
 mix_sample_16(sample_t **samples, sample_t *ret, int chs){
   int32_t sum;
   int ch;
-  int pos;
+  uint32_t pos;
   int16_t *buffer;
   int16_t *src;
 
@@ -80,7 +80,7 @@ rao_mix_samples(VALUE obj, VALUE bits, VALUE rsamples){
   sample_t ret;
   int stat;
   int chs = 0;
-  int maxlen = 0;
+  uint32_t maxlen = 0;
 
   Check_Type(bits, T_FIXNUM);
   Check_Type(rsamples, T_ARRAY);

data/ext/audio/option.c

@@ -4,10 +4,6 @@
 #include <errno.h>
 #include "cao.h"
 
-VALUE cAudio;
-VALUE cAO_Info;
-VALUE cAO_eUnknownError;
-
 /*
   引数に設定されたサンプルフォーマットをao_sample_format構造体に設定する。
   成功したらao_sample_format構造体へのポインタを返す。
@@ -17,7 +13,6 @@ set_format(VALUE bits, VALUE rate, VALUE channels,
 	   VALUE byte_format, VALUE matrix)
 {
   ao_sample_format *format;
-  size_t len;
 
   if ((format = malloc(sizeof(ao_sample_format))) == NULL){
     rb_raise(cAO_eUnknownError, "memory allocation failure.");

data/ext/audio/output.c

@@ -4,21 +4,10 @@
 #include <errno.h>
 #include "cao.h"
 
-VALUE cAudio;
 VALUE cAO_Live;
 VALUE cAO_File;
-VALUE cAO_Info;
 VALUE cAO_Mixer;
 VALUE cAO_DeviceData;
-VALUE cAO_eAOError;
-VALUE cAO_eDeviceError;
-VALUE cAO_eUnknownError;
-
-VALUE cAO_eNoDriver;
-VALUE cAO_eNotFile;
-VALUE cAO_eNotLive;
-VALUE cAO_eBadOption;
-VALUE cAO_eDriverError;
 
 VALUE
 rao_close(VALUE obj)
@@ -82,7 +71,7 @@ Init_outputc(void)
    * 開いたデバイスに関する基本的な情報を保持するクラス。
    * ruby側から操作はしない。
    */
-  cAO_DeviceData = rb_define_class_under(cAO_Live, "DeviceData", rb_cData);
+  cAO_DeviceData = rb_define_class_under(cAO_Live, "DeviceData", rb_cObject);
 
   /* library initialize & shutdown */
   rb_define_private_method(cAO_Live, "initialize", rao_open_live, 8);

data/ext/audio/thread.c

@@ -12,7 +12,6 @@
 
 void *
 thread_player(void *val){
-  queue res;
   ao_struct *aos = val;
   sample_t *sample;
   struct timespec tout = {0, 1000000};
@@ -48,29 +47,10 @@ thread_player(void *val){
     assert(pthread_mutex_lock(&aos->mutex) == 0);
     if (aos->status == 2){
       aos->status = 1;
-      assert(pthread_mutex_unlock(&aos->mutex) == 0);
-      break;
     }
     assert(pthread_mutex_unlock(&aos->mutex) == 0);
   }
 
-  while ((sample = dequeue(aos)) != NULL){
-    free(sample->buffer);
-    free(sample);
-  }
-  if (aos->device != NULL){
-    ao_close(aos->device);
-  }
-  if (aos->option != NULL){
-    ao_free_options(aos->option);
-  }
-  if (aos->format != NULL){
-    free_format(aos->format);
-  }
-  aos->device = NULL;
-  aos->option = NULL;
-  aos->format = NULL;
-  aos->queue  = NULL;
   assert(pthread_mutex_lock(&aos->mutex) == 0);
   aos->status = -1;
   assert(pthread_mutex_unlock(&aos->mutex) == 0);
@@ -79,7 +59,7 @@ thread_player(void *val){
 
 ao_struct *
 create_thread(ao_struct *aos){
-  aos->thread = 1;
+  aos->tmode = 1;
   assert(pthread_mutex_init(&aos->mutex, NULL) == 0);
   assert(pthread_cond_init(&aos->cond, NULL) == 0);
   assert(pthread_create(&aos->thread, NULL,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ao
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors:
 - Akito Miura
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies: []
 description: simple & cross platform audio output library(libao binding http://http://xiph.org/ao/)
 email: phenomer@g.hachune.net
@@ -59,7 +59,7 @@ homepage: http://bitbucket.org/phenomer/ruby-ao
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "-m README.rdoc"
 require_paths:
@@ -68,16 +68,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: simple & cross platform audio output library
 test_files: []