beeps 0.1.31 → 0.1.33

data/.doc/ext/beeps/pitch_shift.cpp

@@ -0,0 +1,64 @@
+#include "beeps/ruby/filter.h"
+
+
+#include "beeps/ruby/processor.h"
+#include "defs.h"
+
+
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::PitchShift)
+
+#define THIS  to<Beeps::PitchShift*>(self)
+
+#define CHECK RUCY_CHECK_OBJ(Beeps::PitchShift, self)
+
+
+static
+VALUE alloc(VALUE klass)
+{
+	return value(new Beeps::RubyProcessor<Beeps::PitchShift>, klass);
+}
+
+static
+VALUE set_shift(VALUE self, VALUE shift)
+{
+	CHECK;
+
+	THIS->set_shift(to<float>(shift));
+	return shift;
+}
+
+static
+VALUE get_shift(VALUE self)
+{
+	CHECK;
+
+	return value(THIS->shift());
+}
+
+
+static Class cPitchShift;
+
+void
+Init_beeps_pitch_shift ()
+{
+	Module mBeeps = rb_define_module("Beeps");
+
+	cPitchShift = mBeeps.define_class("PitchShift", Beeps::processor_class());
+	rb_define_alloc_func(cPitchShift, alloc);
+	rb_define_method(cPitchShift, "shift=", RUBY_METHOD_FUNC(set_shift), 1);
+	rb_define_method(cPitchShift, "shift", RUBY_METHOD_FUNC(get_shift), 0);
+}
+
+
+namespace Beeps
+{
+
+
+	Class
+	pitch_shift_class ()
+	{
+		return cPitchShift;
+	}
+
+
+}// Beeps

data/.doc/ext/beeps/processor.cpp

@@ -5,11 +5,11 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_FROM_TO(Beeps::Processor)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::Processor)
 
 #define THIS  to<Beeps::Processor*>(self)
 
-#define CHECK RUCY_CHECK_OBJECT(Beeps::Processor, self)
+#define CHECK RUCY_CHECK_OBJ(Beeps::Processor, self)
 
 
 static
@@ -18,6 +18,32 @@ VALUE alloc(VALUE klass)
 	Beeps::beeps_error(__FILE__, __LINE__);
 }
 
+static
+VALUE reset(VALUE self)
+{
+	CHECK;
+
+	THIS->reset();
+	return self;
+}
+
+static
+VALUE set_input(VALUE self, VALUE input)
+{
+	CHECK;
+
+	THIS->set_input(input ? to<Beeps::Processor*>(input) : NULL);
+	return input;
+}
+
+static
+VALUE get_input(VALUE self)
+{
+	CHECK;
+
+	return value(THIS->input());
+}
+
 
 static Class cProcessor;
 
@@ -28,6 +54,9 @@ Init_beeps_processor ()
 
 	cProcessor = rb_define_class_under(mBeeps, "Processor", rb_cObject);
 	rb_define_alloc_func(cProcessor, alloc);
+	rb_define_method(cProcessor, "reset", RUBY_METHOD_FUNC(reset), 0);
+	rb_define_method(cProcessor, "input=", RUBY_METHOD_FUNC(set_input), 1);
+	rb_define_method(cProcessor, "input", RUBY_METHOD_FUNC(get_input), 0);
 }
 
 

data/.doc/ext/beeps/sound.cpp

@@ -8,7 +8,7 @@ RUCY_DEFINE_VALUE_FROM_TO(Beeps::Sound)
 
 #define THIS  to<Beeps::Sound*>(self)
 
-#define CHECK RUCY_CHECK_OBJECT(Beeps::Sound, self)
+#define CHECK RUCY_CHECK_OBJ(Beeps::Sound, self)
 
 
 static
@@ -18,11 +18,13 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE initialize(VALUE self, VALUE processor, VALUE seconds)
+VALUE setup(VALUE self, VALUE processor, VALUE seconds, VALUE nchannels, VALUE sample_rate)
 {
-	RUCY_CHECK_OBJ(Beeps::Sound, self);
+	CHECK;
 
-	*THIS = Beeps::Sound(to<Beeps::Processor*>(processor), to<float>(seconds));
+	*THIS = Beeps::Sound(
+		to<Beeps::Processor*>(processor),
+		to<float>(seconds), to<uint>(nchannels), to<double>(sample_rate));
 	return self;
 }
 
@@ -31,10 +33,82 @@ VALUE play(VALUE self)
 {
 	CHECK;
 
-	THIS->play();
+	return value(THIS->play());
+}
+
+static
+VALUE save(VALUE self, VALUE path)
+{
+	CHECK;
+
+	THIS->save(path.c_str());
 	return self;
 }
 
+static
+VALUE get_sample_rate(VALUE self)
+{
+	CHECK;
+
+	return value(THIS->sample_rate());
+}
+
+static
+VALUE get_nchannels(VALUE self)
+{
+	CHECK;
+
+	return value(THIS->nchannels());
+}
+
+static
+VALUE get_seconds(VALUE self)
+{
+	CHECK;
+
+	return value(THIS->seconds());
+}
+
+static
+VALUE set_gain(VALUE self, VALUE gain)
+{
+	CHECK;
+
+	THIS->set_gain(to<float>(gain));
+	return gain;
+}
+
+static
+VALUE get_gain(VALUE self)
+{
+	CHECK;
+
+	return value(THIS->gain());
+}
+
+static
+VALUE set_loop(VALUE self, VALUE loop)
+{
+	CHECK;
+
+	THIS->set_loop(to<bool>(loop));
+	return loop;
+}
+
+static
+VALUE get_loop(VALUE self)
+{
+	CHECK;
+
+	return value(THIS->loop());
+}
+
+static
+VALUE load(VALUE self, VALUE path)
+{
+	return value(Beeps::load_sound(to<const char*>(path)));
+}
+
 
 static Class cSound;
 
@@ -45,8 +119,17 @@ Init_beeps_sound ()
 
 	cSound = rb_define_class_under(mBeeps, "Sound", rb_cObject);
 	rb_define_alloc_func(cSound, alloc);
-	rb_define_private_method(cSound, "initialize", RUBY_METHOD_FUNC(initialize), 2);
-	rb_define_method(cSound, "play", RUBY_METHOD_FUNC(play), 0);
+	rb_define_private_method(cSound, "setup", RUBY_METHOD_FUNC(setup), 4);
+	cSound.define_private_method("play!", play);
+	rb_define_method(cSound, "save", RUBY_METHOD_FUNC(save), 1);
+	rb_define_method(cSound, "sample_rate", RUBY_METHOD_FUNC(get_sample_rate), 0);
+	rb_define_method(cSound, "nchannels", RUBY_METHOD_FUNC(get_nchannels), 0);
+	rb_define_method(cSound, "seconds", RUBY_METHOD_FUNC(get_seconds), 0);
+	rb_define_method(cSound, "gain=", RUBY_METHOD_FUNC(set_gain), 1);
+	rb_define_method(cSound, "gain", RUBY_METHOD_FUNC(get_gain), 0);
+	rb_define_method(cSound, "loop=", RUBY_METHOD_FUNC(set_loop), 1);
+	rb_define_method(cSound, "loop", RUBY_METHOD_FUNC(get_loop), 0);
+	rb_define_singleton_method(cSound, "load", RUBY_METHOD_FUNC(load), 1);
 }
 
 

data/.doc/ext/beeps/sound_player.cpp

@@ -0,0 +1,156 @@
+#include "beeps/ruby/sound.h"
+
+
+#include "defs.h"
+
+
+RUCY_DEFINE_VALUE_FROM_TO(Beeps::SoundPlayer)
+
+#define THIS  to<Beeps::SoundPlayer*>(self)
+
+#define CHECK RUCY_CHECK_OBJ(Beeps::SoundPlayer, self)
+
+
+static
+VALUE alloc(VALUE klass)
+{
+	return new_type<Beeps::SoundPlayer>(klass);
+}
+
+static
+VALUE play(VALUE self)
+{
+	CHECK;
+
+	THIS->play();
+	return self;
+}
+
+static
+VALUE pause(VALUE self)
+{
+	CHECK;
+
+	THIS->pause();
+	return self;
+}
+
+static
+VALUE rewind(VALUE self)
+{
+	CHECK;
+
+	THIS->rewind();
+	return self;
+}
+
+static
+VALUE stop(VALUE self)
+{
+	CHECK;
+
+	THIS->stop();
+	return self;
+}
+
+static
+VALUE is_playing(VALUE self)
+{
+	CHECK;
+
+	return value(THIS->is_playing());
+}
+
+static
+VALUE is_paused(VALUE self)
+{
+	CHECK;
+
+	return value(THIS->is_paused());
+}
+
+static
+VALUE is_stopped(VALUE self)
+{
+	CHECK;
+
+	return value(THIS->is_stopped());
+}
+
+static
+VALUE set_gain(VALUE self, VALUE gain)
+{
+	CHECK;
+
+	THIS->set_gain(to<float>(gain));
+	return gain;
+}
+
+static
+VALUE get_gain(VALUE self)
+{
+	CHECK;
+
+	return value(THIS->gain());
+}
+
+static
+VALUE set_loop(VALUE self, VALUE loop)
+{
+	CHECK;
+
+	THIS->set_loop(to<bool>(loop));
+	return loop;
+}
+
+static
+VALUE get_loop(VALUE self)
+{
+	CHECK;
+
+	return value(THIS->loop());
+}
+
+static
+VALUE stop_all(VALUE self)
+{
+	Beeps::stop_all_sound_players();
+}
+
+
+static Class cSoundPlayer;
+
+void
+Init_beeps_sound_player ()
+{
+	Module mBeeps = rb_define_module("Beeps");
+
+	cSoundPlayer = rb_define_class_under(mBeeps, "SoundPlayer", rb_cObject);
+	rb_define_alloc_func(cSoundPlayer, alloc);
+	rb_define_method(cSoundPlayer, "play", RUBY_METHOD_FUNC(play), 0);
+	rb_define_method(cSoundPlayer, "pause", RUBY_METHOD_FUNC(pause), 0);
+	rb_define_method(cSoundPlayer, "rewind", RUBY_METHOD_FUNC(rewind), 0);
+	rb_define_method(cSoundPlayer, "stop", RUBY_METHOD_FUNC(stop), 0);
+	cSoundPlayer.define_method("playing?", is_playing);
+	cSoundPlayer.define_method("paused?",  is_paused);
+	cSoundPlayer.define_method("stopped?", is_stopped);
+	rb_define_method(cSoundPlayer, "gain=", RUBY_METHOD_FUNC(set_gain), 1);
+	rb_define_method(cSoundPlayer, "gain", RUBY_METHOD_FUNC(get_gain), 0);
+	rb_define_method(cSoundPlayer, "loop=", RUBY_METHOD_FUNC(set_loop), 1);
+	rb_define_method(cSoundPlayer, "loop", RUBY_METHOD_FUNC(get_loop), 0);
+	rb_define_singleton_method(cSoundPlayer, "stop_all", RUBY_METHOD_FUNC(stop_all), 0);
+}
+
+
+namespace Beeps
+{
+
+
+	Class
+	sound_player_class ()
+	{
+		return cSoundPlayer;
+	}
+
+
+}// Beeps

data/.doc/ext/beeps/time_stretch.cpp

@@ -0,0 +1,64 @@
+#include "beeps/ruby/filter.h"
+
+
+#include "beeps/ruby/processor.h"
+#include "defs.h"
+
+
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::TimeStretch)
+
+#define THIS  to<Beeps::TimeStretch*>(self)
+
+#define CHECK RUCY_CHECK_OBJ(Beeps::TimeStretch, self)
+
+
+static
+VALUE alloc(VALUE klass)
+{
+	return value(new Beeps::RubyProcessor<Beeps::TimeStretch>, klass);
+}
+
+static
+VALUE set_scale(VALUE self, VALUE scale)
+{
+	CHECK;
+
+	THIS->set_scale(to<float>(scale));
+	return scale;
+}
+
+static
+VALUE get_scale(VALUE self)
+{
+	CHECK;
+
+	return value(THIS->scale());
+}
+
+
+static Class cTimeStretch;
+
+void
+Init_beeps_time_stretch ()
+{
+	Module mBeeps = rb_define_module("Beeps");
+
+	cTimeStretch = mBeeps.define_class("TimeStretch", Beeps::processor_class());
+	rb_define_alloc_func(cTimeStretch, alloc);
+	rb_define_method(cTimeStretch, "scale=", RUBY_METHOD_FUNC(set_scale), 1);
+	rb_define_method(cTimeStretch, "scale", RUBY_METHOD_FUNC(get_scale), 0);
+}
+
+
+namespace Beeps
+{
+
+
+	Class
+	time_stretch_class ()
+	{
+		return cTimeStretch;
+	}
+
+
+}// Beeps

data/.github/workflows/release-gem.yml

@@ -0,0 +1,62 @@
+name: Release Gem
+
+on:
+  push:
+    tags: ['v[0-9]*']
+
+jobs:
+  release:
+    runs-on: macos-latest
+
+    steps:
+      - name: ruby 3.2
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: setup dependencies
+        run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
+
+      - name: install gems
+        run: gem install yard
+
+      - name: test
+        run: rake quiet test
+
+      - name: create gem
+        id: gem
+        run: |
+          rake gem
+          echo path=$(ruby -e 'print Dir.glob("*.gem").first') >> $GITHUB_OUTPUT
+
+      - name: create github release
+        id: release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+
+      - name: upload to github release
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.release.outputs.upload_url }}
+          asset_path: ./${{ steps.gem.outputs.path }}
+          asset_name:   ${{ steps.gem.outputs.path }}
+          asset_content_type: application/zip
+
+      - name: upload to rubygems
+        env:
+          GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_AUTH_TOKEN }}
+        run: |
+          mkdir -p $HOME/.gem
+          touch $HOME/.gem/credentials
+          chmod 0600 $HOME/.gem/credentials
+          printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+          rake upload

data/.github/workflows/test.yml

@@ -22,11 +22,5 @@ jobs:
       - name: setup dependencies
         run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
-      - name: lib
-        run: rake lib
-
-      - name: ext
-        run: rake ext
-
       - name: test
         run: rake test

data/.github/workflows/utils.rb

@@ -1,3 +1,5 @@
+RENAMES = {reflex: 'reflexion'}
+
 def sh(cmd)
   puts cmd
   system cmd
@@ -5,8 +7,10 @@ end
 
 def setup_dependencies(build: true, only: nil)
   gemspec_path = `git ls-files`.lines(chomp: true).find {|l| l =~ /\.gemspec$/}
-  gemspec      = File.read gemspec_path
-  name         = File.basename gemspec_path, '.gemspec'
+  return unless gemspec_path
+
+  gemspec = File.read gemspec_path
+  name    = File.basename gemspec_path, '.gemspec'
 
   exts = File.readlines('Rakefile')
     .map {|l| l[%r|^\s*require\W+(\w+)/extension\W+$|, 1]}
@@ -15,9 +19,13 @@ def setup_dependencies(build: true, only: nil)
   exts = exts & [only].flatten.map(&:to_s) if only
 
   exts.each do |ext|
-    ver = gemspec[/add_runtime_dependency.*'#{ext}'.*'\s*~>\s*([\d\.]+)\s*'/, 1]
-    url = "https://github.com/xord/#{ext}.git"
-    sh %( git clone --depth 1 --branch v#{ver} #{url} ../#{ext} )
+    gem   = RENAMES[ext.to_sym].then {|s| s || ext}
+    clone = "git clone --depth 1 https://github.com/xord/#{ext}.git ../#{ext}"
+    ver   = gemspec[/add_runtime_dependency.*['"]#{gem}['"].*['"]\s*~>\s*([\d\.]+)\s*['"]/, 1]
+
+    # 'rake subtree:push' pushes all subrepos, so cloning by new tag
+    # often fails before tagging each new tag
+    sh %( #{clone} --branch v#{ver} || #{clone} )
     sh %( cd ../#{ext} && rake ext )
   end
 end

data/ChangeLog.md

@@ -1,6 +1,19 @@
 # beeps ChangeLog
 
 
+## [v0.1.33] - 2023-04-22
+
+- Stream playback is now supported.
+- Pause, resume, and stop after playback, as well as methods to check the status of the playback.
+- Support for saving and loading sound files
+- Added Oscillator, MicIn, Gain, ADSR, TimeStretch, PitchShift, and Analyser classes.
+
+
+## [v0.1.32] - 2023-03-01
+
+- fix bugs
+
+
 ## [v0.1.31] - 2023-02-27
 
 - add ChangeLog.md file

data/Rakefile

@@ -13,18 +13,39 @@ require 'beeps/extension'
 
 
 EXTENSIONS  = [Xot, Rucy, Beeps]
-TESTS_ALONE = ['test/test_beeps.rb']
+TESTS_ALONE = ['test/test_beeps_init.rb']
 
 use_external_library 'https://github.com/thestk/stk',
-  tag:      'v4.6.0',
-  incdir:   'include',
-  srcdir:   'src',
+  tag:      '4.6.2',
+  incdirs:  'include',
+  srcdirs:  'src',
   excludes: %w[stk/src/include Tcp Udp Socket Thread Mutex InetWv /Rt]
 
+use_external_library 'https://github.com/adamstark/AudioFile',
+  tag:      '1.1.1',
+  srcdirs:  'NOSRC',
+  excludes: %w[examples/ tests/]
+
+use_external_library 'https://github.com/avaneev/r8brain-free-src',
+  tag: 'version-6.2',
+  excludes: %w[DLL/ bench/ other/ pffft_double example.cpp],
+  &proc {
+    filter_file('r8bconf.h') do |conf|
+      <<~EOS + conf
+        #ifndef R8B_PFFFT
+        #define R8B_PFFFT 1
+        #endif
+      EOS
+    end
+  }
+
+use_external_library 'https://github.com/Signalsmith-Audio/signalsmith-stretch',
+  commit:  'fddcdb628f326ef187b7e5694f285f35a528aba3',
+  srcdirs: 'NOSRC'
+
+default_tasks :ext
 build_native_library
 build_ruby_extension
 test_ruby_extension
 generate_documents
 build_ruby_gem
-
-task :default => :ext

data/VERSION

@@ -1 +1 @@
-0.1.31
+0.1.33

data/beeps.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.7.0'
 
-  s.add_runtime_dependency 'xot',  '~> 0.1.31'
-  s.add_runtime_dependency 'rucy', '~> 0.1.31'
+  s.add_runtime_dependency 'xot',  '~> 0.1.33'
+  s.add_runtime_dependency 'rucy', '~> 0.1.33'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'