ao 0.0.4 → 0.1.0

data/ext/audio/thread.h

@@ -0,0 +1,5 @@
+#ifndef THREAD_H
+#define THREAD_H
+void *thread_player(void *device);
+ao_struct *create_thread(ao_struct *aos);
+#endif

data/lib/ao.rb

@@ -0,0 +1,3 @@
+#-*- coding: utf-8 -*-
+
+require 'audio/output'

data/lib/audio/output.rb

@@ -9,7 +9,7 @@ class Audio::LiveOutput < Audio::LiveOutputC
         bits: 16, rate: 44100, channels: 2,
         byte_format:
           Audio::Info::FMT_NATIVE,
-        matrix: nil, options: nil)
+        matrix: nil, options: nil, thread: nil)
     ao = super(driver_id, bits, rate, channels,
                byte_format, matrix, options)
     if block_given?
@@ -30,7 +30,7 @@ class Audio::FileOutput < Audio::FileOutputC
         bits: 16, rate: 44100, channels: 2,
         byte_format:
           Audio::Info::FMT_NATIVE,
-        matrix: nil, options: nil)
+        matrix: nil, options: nil, thread: nil)
     ao = super(driver_id, filename, overwrite,
                bits, rate, channels, byte_format,
                matrix, options)

metadata

@@ -1,47 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: ao
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Akito Miura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-19 00:00:00.000000000 Z
+date: 2018-01-17 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
 executables: []
 extensions:
-- ext/extconf.rb
+- ext/audio/extconf.rb
 extra_rdoc_files:
 - README.rdoc
 - CHANGELOG.rdoc
-- ext/cao.h
-- ext/output.c
-- ext/device.c
-- ext/info.c
-- ext/option.c
-- ext/exception.c
-- ext/constant.c
+- ext/audio/cao.h
+- ext/audio/output.c
+- ext/audio/thread.c
+- ext/audio/queue.c
+- ext/audio/mixer.c
+- ext/audio/device.c
+- ext/audio/info.c
+- ext/audio/option.c
+- ext/audio/exception.c
+- ext/audio/constant.c
 - lib/audio/output.rb
 files:
 - CHANGELOG.rdoc
 - LICENSE
 - README.rdoc
+- Rakefile
 - example/beeplay.rb
 - example/drivers.rb
 - example/raw2wav.rb
 - example/rawplay.rb
-- ext/cao.h
-- ext/constant.c
-- ext/device.c
-- ext/exception.c
-- ext/extconf.rb
-- ext/info.c
-- ext/option.c
-- ext/output.c
+- ext/audio/cao.h
+- ext/audio/constant.c
+- ext/audio/device.c
+- ext/audio/exception.c
+- ext/audio/extconf.rb
+- ext/audio/file.c
+- ext/audio/info.c
+- ext/audio/live.c
+- ext/audio/mixer.c
+- ext/audio/option.c
+- ext/audio/output.c
+- ext/audio/queue.c
+- ext/audio/queue.h
+- ext/audio/thread.c
+- ext/audio/thread.h
+- lib/ao.rb
 - lib/audio/output.rb
 homepage: http://bitbucket.org/phenomer/ruby-ao
 licenses:
@@ -56,7 +68,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -64,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: simple & cross platform audio output library

data/ext/cao.h

@@ -1,61 +0,0 @@
-#ifndef CAO_H
-#define CAO_H
-
-#include <ruby.h>
-#include <ruby/thread.h>
-#include <ao/ao.h>
-#include <ao/os_types.h>
-
-extern VALUE cAudio;
-extern VALUE cAO_Live;
-extern VALUE cAO_File;
-extern VALUE cAO_Info;
-extern VALUE cAO_DeviceData;
-extern VALUE cAO_eAOError;
-extern VALUE cAO_eDeviceError;
-extern VALUE cAO_eUnknownError;
-
-extern VALUE cAO_eNoDriver;
-extern VALUE cAO_eNotFile;
-extern VALUE cAO_eNotLive;
-extern VALUE cAO_eBadOption;
-extern VALUE cAO_eDriverError;
-
-extern VALUE cAO_eFileError;
-extern VALUE cAO_eFileExists;
-extern VALUE cAO_eBadFormat;
-
-typedef struct sample_buffer {
-  int   bytes;
-  char *samples;
-  struct sample_buffer *next;
-} sample_buffer;
-
-typedef struct dev_data {
-  ao_device        *device;
-  ao_sample_format *format;
-  ao_option        *option;
-  sample_buffer    *buffer;
-  int               playing;
-} dev_data;
-
-dev_data * append_device(ao_device *dev,
-			 ao_sample_format *format,
-			 ao_option *option);
-void close_device(dev_data *devdat);
-void remove_device(dev_data *devdat);
-
-void init_exception(void);
-void init_constant(void);
-ao_sample_format *
-set_format(VALUE bits, VALUE rate, VALUE channels,
-	   VALUE byte_format, VALUE matrix);
-void free_format(ao_sample_format *format);
-ao_option * set_option(VALUE a_options);
-
-VALUE
-raodev_play(VALUE obj, VALUE output_samples);
-
-VALUE raodev_close(VALUE obj);
-VALUE raodev_closed(VALUE obj);
-#endif

data/ext/device.c

@@ -1,133 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "cao.h"
-
-typedef struct play_data {
-  ao_device *device;
-  char *samples;
-  uint_32 bytes;
-  int result;
-} play_data;
-
-void *nogvl_ao_play(void *playdata){
-  play_data *pd = playdata;
-  pd->result =
-    ao_play(pd->device, pd->samples, pd->bytes);
-  return NULL;
-}
-
-/*
- * デバイス一覧にデバイスを追加する。
- * 追加した構造体へのポインタを返す。
- * 割当に失敗した場合は-1を返す。
- */
-dev_data *
-append_device(ao_device *dev, ao_sample_format *format,
-	      ao_option *option)
-{
-  dev_data *newdev;
-  newdev          = ALLOC(dev_data);
-  newdev->device  = dev;
-  newdev->format  = format;
-  newdev->option  = option;
-  newdev->playing = 0;
-  newdev->buffer  = NULL;
-  return newdev;
-}
-
-/*
- * devdata構造体の持つデバイスを全て閉じ、
- * またオプションとフォーマットの情報も削除する。
- * メンバ変数にはNULLを設定する。
- * devdata構造体自体は開放しない。
- * (rubyのGCによって実行されるremove_device関数に任せるため)
- */
-void
-close_device(dev_data *devdat){
-  if (devdat->device != NULL){
-    ao_close(devdat->device);
-  }
-  if (devdat->option != NULL){
-    ao_free_options(devdat->option);
-  }
-  if (devdat->format != NULL){
-    free_format(devdat->format);
-  }
-  devdat->device = NULL;
-  devdat->option = NULL;
-  devdat->format = NULL;
-  devdat->buffer = NULL;
-  return;
-}
-
-/* 
- * GCが実行された時にデバイスを閉じ、構造体を開放する。
- * この関数はopen_live()とopen_file()にてdev_data構造体をWrapする時に
- * 構造体free用関数として渡す(rubyのGCにて呼ばれるよう設定する)
- * Data_Wrap_Struct(cAO_DeviceData, 0, remove_device, devdat);
- */
-void
-remove_device(dev_data *devdat)
-{
-  close_device(devdat);
-  free(devdat);
-  return;
-}
-
-/*
- * call-seq: ao.play(output_samples)
- *
- * 受け取ったサンプルを再生する。
- * (デバイスがファイル出力の場合はファイルに書き出す)
- * 一度に渡せる量はunsigned int(32bit)の範囲まで。
- *
- * [arg1] buffer(String)
- * [return] Fixnum
-*/
-VALUE
-raodev_play(VALUE obj, VALUE output_samples)
-{
-  dev_data  *devdata;
-  play_data  playdata;
-
-  Check_Type(output_samples, T_STRING);
-  Data_Get_Struct(rb_ivar_get(obj, rb_intern("@device")),
-		  dev_data, devdata);
-  playdata.device  = devdata->device;
-  playdata.bytes   = RSTRING_LENINT(output_samples);
-  if ((playdata.samples = malloc(playdata.bytes)) == NULL){
-    rb_raise(cAO_eAOError, "Memory allocation failure.");
-  }
-  memcpy(playdata.samples, StringValuePtr(output_samples), playdata.bytes);
-#ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
-  rb_thread_call_without_gvl2(nogvl_ao_play, &playdata, NULL, NULL);
-  /*rb_thread_call_without_gvl2((rb_blocking_function_t *)nogvl_ao_play, &playdata, NULL, NULL);*/
-#else
-  nogvl_ao_play(&playdata);
-#endif
-  free(playdata.samples);
-  if (playdata.result == 0){
-    rb_raise(cAO_eDeviceError, "Device should be closed.");
-  }
-  return INT2FIX(playdata.result);
-}
-
-/*
- * call-seq: ao.closed?
- *
- * デバイスが既に閉じられているか確認する。
- * [return] true or false
-*/
-VALUE
-raodev_closed(VALUE obj)
-{
-  dev_data  *devdata;
-  Data_Get_Struct(rb_ivar_get(obj, rb_intern("@device")),
-		  dev_data, devdata);
-  if (devdata->device == NULL){
-    return Qtrue;
-  }
-  return Qfalse;
-}

data/ext/output.c

@@ -1,309 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include "cao.h"
-
-VALUE cAudio;
-VALUE cAO_Live;
-VALUE cAO_File;
-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 cAO_eFileError;
-VALUE cAO_eFileExists;
-VALUE cAO_eBadFormat;
-
-/*
- * call-seq: Audio::LiveOutput.new(driver_id, bits, rate, channels, byte_format, matrix, options)
- *
- * オーディオ出力デバイスを開く。
- * 引数に指定するmatrixとoptionについては以下を参照。
- * [matrix] http://xiph.org/ao/doc/ao_sample_format.html
- * [option] http://xiph.org/ao/doc/drivers.html
- * optionはKey-Valueを要素に含む2次元配列を設定する。
- * 特に設定が必要なければnilで構わない。
- * ex) ALSAドライバのデバイスをhw:1に設定する場合は [["dev", "hw:1"]] を渡す。
- *
- * [arg1] DriverID
- * [arg2] bits(Fixnum)
- * [arg3] rate(Fixnum)
- * [arg4] channels(fixnum)
- * [arg5] byte_format(fixnum)
- * [arg6] matrix(String or nil)
- * [arg7] options(Array or nil)
- * [return] self
- */
-static VALUE
-rao_open_live(VALUE obj,      VALUE driver_id,
-	      VALUE bits, VALUE rate, VALUE channels,
-	      VALUE byte_format, VALUE matrix, 
-	      VALUE a_options)
-{
-  ao_device        *dev;
-  ao_sample_format *format;
-  ao_option        *option;
-  dev_data         *devdat;
-  VALUE             rdev;
-
-  if (rb_iv_get(obj, "@device") != Qnil){
-    Data_Get_Struct(rb_iv_get(obj, "@device"),
-		    dev_data, devdat);
-    rb_raise(cAO_eDeviceError,
-	     "Device is already open.\n");
-  }
-  
-  Check_Type(driver_id,   T_FIXNUM);
-  format = set_format(bits, rate, channels, byte_format, matrix);
-  option = set_option(a_options);
-  dev    = ao_open_live(FIX2INT(driver_id), format, option);
-  if (dev == NULL){
-    free_format(format);
-    ao_free_options(option);
-    switch(errno){
-    case AO_ENODRIVER:
-      rb_raise(cAO_eNoDriver,
-	       "No driver corresponds - %s",
-	       strerror(errno));
-      break;
-    case AO_ENOTLIVE:
-      rb_raise(cAO_eNotLive,
-	       "This driver is not a live output device - %s",
-	       strerror(errno));
-      break;
-    case AO_EBADOPTION:
-      rb_raise(cAO_eBadOption,
-	       "A valid option key has an invalid value - %s",
-	       strerror(errno));
-      break;
-    case AO_EOPENDEVICE:
-      rb_raise(cAO_eDeviceError,
-	       "Cannot open the device - %s",
-	       strerror(errno));
-      break;
-    case AO_EFAIL:
-      rb_raise(cAO_eUnknownError,
-	       "Any other cause of failure - %s",
-	       strerror(errno));
-      break;
-    default:
-      rb_raise(cAO_eUnknownError,
-	       "Unknown error - %s",
-	       strerror(errno));
-    }
-  }
-  if ((devdat = append_device(dev, format, option)) == NULL){
-    rb_raise(cAO_eUnknownError,
-	     "memory allocation failure - %s",
-	     strerror(errno));
-  }
-
-  rdev = Data_Wrap_Struct(cAO_DeviceData, 0,
-			  remove_device, devdat);
-  rb_iv_set(obj, "@device", rdev);  
-  rb_ary_push(rb_cv_get(cAO_Live, "@@devices"), rdev);
-  
-  return obj;
-}
-
-/*
- * call-seq: Audio::FileOutput.new(driver_id, filepath, overwrite, bits, rate, channels, byte_format, matrix, options)
- *
- * ファイルを開く。引数に指定するmatrixとoptionについては以下を参照。
- * [matrix] http://xiph.org/ao/doc/ao_sample_format.html
- * [option] http://xiph.org/ao/doc/drivers.html
- * optionはKey-Valueを要素に含む2次元配列を設定する。
- * 特に設定が必要なければnilで構わない。
- * ex) RAWドライバの出力エンディアンをビッグエンディアンに設定する場合は [["byteirder", "big"]] を渡す。
- *
- * [arg1] DriverID(Fixnum)
- * [arg2] filepath(String)
- * [arg3] overwrite?(true or false)
- * [arg4] bits(Fixnum)
- * [arg5] rate(Fixnum)
- * [arg6] channels(fixnum)
- * [arg7] byte_format(fixnum)
- * [arg8] matrix(String or nil)
- * [arg9] options(Array or nil)
- * [return] self
- */
-static VALUE
-rao_open_file(VALUE obj,      VALUE driver_id,
-	      VALUE filename, VALUE overwrite,
-	      VALUE bits, VALUE rate, VALUE channels,
-	      VALUE byte_format, VALUE matrix,
-	      VALUE a_options)
-{
-  dev_data         *devdat;
-  ao_device        *dev;
-  ao_sample_format *format;
-  ao_option        *option;
-  int               overwrite_int = 0;
-  VALUE             rdev;
-  
-  
-  if (rb_iv_get(obj, "@device") != Qnil){
-    Data_Get_Struct(rb_iv_get(obj, "@device"),
-		    dev_data, devdat);
-    rb_raise(cAO_eDeviceError,
-	     "Device is already open.\n");
-  }
-  
-  Check_Type(filename,  T_STRING);
-  Check_Type(driver_id, T_FIXNUM);
-  if (TYPE(overwrite) == T_TRUE){
-    overwrite_int = 1;
-  }
-  format = set_format(bits, rate, channels, byte_format, matrix);
-  option = set_option(a_options);
-  dev = ao_open_file(FIX2INT(driver_id), StringValuePtr(filename), 
-		     overwrite_int, format, option);
-  if (dev == NULL){
-    free_format(format);
-    ao_free_options(option);
-    switch(errno){
-    case AO_ENODRIVER:
-      rb_raise(cAO_eNoDriver,
-	       "No driver corresponds - %s",
-	       strerror(errno));
-      break;
-    case AO_ENOTFILE:
-      rb_raise(cAO_eNotFile,
-	       "This driver is not a file output device - %s",
-	       strerror(errno));
-      break;
-    case AO_EBADOPTION:
-      rb_raise(cAO_eBadOption,
-	       "A valid option key has an invalid value - %s",
-	       strerror(errno));
-      break;
-    case AO_EOPENFILE:
-      rb_raise(cAO_eFileError,
-	       "Cannot open the device - %s",
-	       strerror(errno));
-      break;
-    case AO_EFILEEXISTS:
-      rb_raise(cAO_eFileExists,
-	       "The file already exists - %s",
-	       strerror(errno));
-    case AO_EFAIL:
-      rb_raise(cAO_eUnknownError,
-	       "Any other cause of failure - %s",
-	       strerror(errno));
-      break;
-    default:
-      rb_raise(cAO_eUnknownError,
-	       "Unknown error - %s",
-	       strerror(errno));
-    }
-  }  
-  if ((devdat = append_device(dev, format, option)) == NULL){
-    rb_raise(cAO_eUnknownError,
-	     "memory allocation failure - %s",
-	     strerror(errno));
-  }
-
-  rdev = Data_Wrap_Struct(cAO_DeviceData, 0,
-			  remove_device, devdat);
-  rb_iv_set(obj, "@device", rdev);
-  rb_ary_push(rb_cv_get(cAO_File, "@@devices"), rdev);
-    
-  return obj;
-}
-
-static VALUE
-rao_close(VALUE obj)
-{
-  dev_data *devdata;
-
-  if (rb_iv_get(obj, "@device") == Qnil){
-    return Qfalse;
-  }
-  
-  Data_Get_Struct(rb_iv_get(obj, "@device"),
-		  dev_data, devdata);
-  close_device(devdata);
-  rb_ary_delete(rb_cv_get(cAO_Live, "@@devices"), rb_intern("@device"));
-  rb_iv_set(obj, "@device", Qnil);
-  return Qtrue;
-}
-
-/*
- * libaoを終了する。shutdownの前に開いている全てのデバイスを
- * closeしておかなければならない。
- *
- * [return] nil
- */
-void
-rao_shutdown(VALUE obj){
-  VALUE rdev;
-  dev_data *devdata;
-  
-  rb_gc_start();
-  while ((rdev = rb_ary_pop(rb_cv_get(cAO_Live, "@@devices"))) != Qnil){
-    Data_Get_Struct(rdev, dev_data, devdata);
-    close_device(devdata);
-  }
-  ao_shutdown();
-  return;
-}
-
-void
-Init_outputc(void)
-{
-  ao_initialize();
-  /*
-   * Document-class: Audio
-   *
-   * Ruby-AOの基礎となるクラス。
-   */
-  cAudio = rb_define_class("Audio", rb_cObject);
-
-  /*
-   * Document-class: Audio::LiveOutput
-   *
-   * オーディオデバイス出力機能をサポートするクラス。
-   */
-  cAO_Live = rb_define_class_under(cAudio, "LiveOutputC", rb_cObject);
-  rb_cv_set(cAO_Live, "@@devices", rb_ary_new());
-  
-  /*
-   * Document-class: Audio::BasicOutput::DeviceData
-   *
-   * 開いたデバイスに関する基本的な情報を保持するクラス。
-   * ruby側から操作はしない。
-   */
-  cAO_DeviceData = rb_define_class_under(cAO_Live, "DeviceData", rb_cData);
-
-  /* library initialize & shutdown */
-  rb_define_private_method(cAO_Live, "initialize", rao_open_live, 7);
-
-  /* device setup */
-  rb_define_method(cAO_Live, "close",   rao_close,     0);
-  rb_define_method(cAO_Live, "play",    raodev_play,   1);
-  rb_define_method(cAO_Live, "closed?", raodev_closed, 0);
-
-  /*
-   * Document-class: Audio::FileOutput
-   *
-   * オーディオファイル出力機能をサポートするクラス。
-   */
-  cAO_File = rb_define_class_under(cAudio, "FileOutputC", cAO_Live);
-  rb_define_private_method(cAO_File, "initialize", rao_open_file, 9);
-
-  init_exception();
-  init_info();
-  init_constant();
-  init_option();
-
-  /* Shutdown */
-  rb_set_end_proc(rao_shutdown, (VALUE)NULL);
-}