beeps 0.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4df684684e65c0ee091bb8054a55e57cee8e8d9b932382defa62229027cedb7
-  data.tar.gz: 6c59120efd1f32823ef0d1982f243106f38ea4543a568739e9739811ee1e3d4c
+  metadata.gz: c83b46a4b2d1c3e24bcf22711ef53a8776651c7a4f7d90d069b96c9cc5e62064
+  data.tar.gz: 162ddb6915de1cbae2c11af0a92dcf14e6c9e35968b4fb6374868a42a11a7eef
 SHA512:
-  metadata.gz: db163aa74ddac2978422aa52b3bef3e157295aa93f46a79e8e32b88c0b0752f337cd6bc1636e53dae751ddaac554c86b4daa72ad57f038ddf3586078253bb669
-  data.tar.gz: 9997be8c7be61a021087d05b3e17aa695a07d3a70e9fed9bd61b3b82d66cda81c2e5279a74ef0100771281480d1ada8b9b52d6a936375f1a361fe6aa3d97d5bf
+  metadata.gz: 56d4eea3b0323dae779d4ec28c8b6a779b15b9fe3377178acca350ebc82e605f4be39e5969b008527fb1c14e7071ebeb08d6f1204b12c79282faa509cecc187a
+  data.tar.gz: cdd5ebec38e614f2cbb015c21f2899dcf5ee2e1bbdb9e83bd69681d83c7cc022a5a6002ac2044c86cb0d93a3874644787848c42120e97651cdd1343fc09e888c

data/.doc/ext/beeps/{adsr.cpp → envelope.cpp}

@@ -5,17 +5,17 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::ADSR)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Envelope)
 
-#define THIS  to<Beeps::ADSR*>(self)
+#define THIS  to<Beeps::Envelope*>(self)
 
-#define CHECK RUCY_CHECK_OBJ(Beeps::ADSR, self)
+#define CHECK RUCY_CHECK_OBJ(Beeps::Envelope, self)
 
 
 static
 VALUE alloc(VALUE klass)
 {
-	return value(new Beeps::RubyProcessor<Beeps::ADSR>, klass);
+	return value(new Beeps::RubyProcessor<Beeps::Envelope>, klass);
 }
 
 static
@@ -103,25 +103,25 @@ VALUE get_release_time(VALUE self)
 }
 
 
-static Class cADSR;
+static Class cEnvelope;
 
 void
-Init_beeps_adsr ()
+Init_beeps_envelope ()
 {
 	Module mBeeps = rb_define_module("Beeps");
 
-	cADSR = mBeeps.define_class("ADSR", Beeps::processor_class());
-	rb_define_alloc_func(cADSR, alloc);
-	cADSR.define_private_method("note_on!",  note_on);
-	cADSR.define_private_method("note_off!", note_off);
-	rb_define_method(cADSR, "attack_time=", RUBY_METHOD_FUNC(set_attack_time), 1);
-	rb_define_method(cADSR, "attack_time", RUBY_METHOD_FUNC(get_attack_time), 0);
-	rb_define_method(cADSR, "decay_time=", RUBY_METHOD_FUNC(set_decay_time), 1);
-	rb_define_method(cADSR, "decay_time", RUBY_METHOD_FUNC(get_decay_time), 0);
-	rb_define_method(cADSR, "sustain_level=", RUBY_METHOD_FUNC(set_sustain_level), 1);
-	rb_define_method(cADSR, "sustain_level", RUBY_METHOD_FUNC(get_sustain_level), 0);
-	rb_define_method(cADSR, "release_time=", RUBY_METHOD_FUNC(set_release_time), 1);
-	rb_define_method(cADSR, "release_time", RUBY_METHOD_FUNC(get_release_time), 0);
+	cEnvelope = mBeeps.define_class("Envelope", Beeps::processor_class());
+	rb_define_alloc_func(cEnvelope, alloc);
+	cEnvelope.define_private_method("note_on!",  note_on);
+	cEnvelope.define_private_method("note_off!", note_off);
+	rb_define_method(cEnvelope, "attack_time=", RUBY_METHOD_FUNC(set_attack_time), 1);
+	rb_define_method(cEnvelope, "attack_time", RUBY_METHOD_FUNC(get_attack_time), 0);
+	rb_define_method(cEnvelope, "decay_time=", RUBY_METHOD_FUNC(set_decay_time), 1);
+	rb_define_method(cEnvelope, "decay_time", RUBY_METHOD_FUNC(get_decay_time), 0);
+	rb_define_method(cEnvelope, "sustain_level=", RUBY_METHOD_FUNC(set_sustain_level), 1);
+	rb_define_method(cEnvelope, "sustain_level", RUBY_METHOD_FUNC(get_sustain_level), 0);
+	rb_define_method(cEnvelope, "release_time=", RUBY_METHOD_FUNC(set_release_time), 1);
+	rb_define_method(cEnvelope, "release_time", RUBY_METHOD_FUNC(get_release_time), 0);
 }
 
 
@@ -130,9 +130,9 @@ namespace Beeps
 
 
 	Class
-	adsr_class ()
+	envelope_class ()
 	{
-		return cADSR;
+		return cEnvelope;
 	}
 
 

data/.doc/ext/beeps/native.cpp

@@ -9,11 +9,12 @@ void Init_beeps_sound_player ();
 void Init_beeps_processor ();
 
 void Init_beeps_oscillator ();
+void Init_beeps_sequencer ();
 void Init_beeps_file_in ();
 void Init_beeps_mic_in ();
 
 void Init_beeps_gain ();
-void Init_beeps_adsr ();
+void Init_beeps_envelope ();
 void Init_beeps_time_stretch ();
 void Init_beeps_pitch_shift ();
 void Init_beeps_analyser ();
@@ -38,11 +39,12 @@ extern "C" void
 	Init_beeps_processor();
 
 	Init_beeps_oscillator();
+	Init_beeps_sequencer();
 	Init_beeps_file_in();
 	Init_beeps_mic_in();
 
 	Init_beeps_gain();
-	Init_beeps_adsr();
+	Init_beeps_envelope();
 	Init_beeps_time_stretch();
 	Init_beeps_pitch_shift();
 	Init_beeps_analyser();

data/.doc/ext/beeps/sequencer.cpp

@@ -0,0 +1,87 @@
+#include "beeps/ruby/generator.h"
+
+
+#include "beeps/ruby/processor.h"
+#include "defs.h"
+
+
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Sequencer)
+
+#define THIS  to<Beeps::Sequencer*>(self)
+
+#define CHECK RUCY_CHECK_OBJ(Beeps::Sequencer, self)
+
+
+static
+VALUE alloc(VALUE klass)
+{
+	return value(new Beeps::RubyProcessor<Beeps::Sequencer>, klass);
+}
+
+static
+VALUE add(VALUE self, VALUE processor, VALUE offset, VALUE duration)
+{
+	CHECK;
+
+	THIS->add(
+		to<Beeps::Processor*>(processor),
+		to<float>(offset),
+		to<float>(duration));
+}
+
+static
+VALUE remove(VALUE self, VALUE processor, VALUE offset)
+{
+	CHECK;
+
+	THIS->remove(
+		to<Beeps::Processor*>(processor),
+		to<float>(offset));
+}
+
+static
+VALUE set_time_scale(VALUE self, VALUE time_scale)
+{
+	CHECK;
+
+	THIS->set_time_scale(to<float>(time_scale));
+	return time_scale;
+}
+
+static
+VALUE get_time_scale(VALUE self)
+{
+	CHECK;
+
+	return value(THIS->time_scale());
+}
+
+
+static Class cSequencer;
+
+void
+Init_beeps_sequencer ()
+{
+	Module mBeeps = rb_define_module("Beeps");
+
+	cSequencer = mBeeps.define_class("Sequencer", Beeps::processor_class());
+	rb_define_alloc_func(cSequencer, alloc);
+	rb_define_method(cSequencer, "add", RUBY_METHOD_FUNC(add), 3);
+	rb_define_method(cSequencer, "remove", RUBY_METHOD_FUNC(remove), 2);
+	//rb_define_method(cSequencer, "time_scale=", RUBY_METHOD_FUNC(set_time_scale), 1);
+	//rb_define_method(cSequencer, "time_scale", RUBY_METHOD_FUNC(get_time_scale), 0);
+}
+
+
+namespace Beeps
+{
+
+
+	Class
+	sequencer_class ()
+	{
+		return cSequencer;
+	}
+
+
+}// Beeps

data/ChangeLog.md

@@ -1,6 +1,14 @@
 # beeps ChangeLog
 
 
+## [v0.3.1] - 2025-01-13
+
+- Add Sequencer class
+- Add 'triangle' type to Oscillator
+- Add LICENSE file
+- Rename: ADSR -> Envelope
+
+
 ## [v0.3] - 2024-07-06
 
 - Support Windows

data/Gemfile.lock

@@ -9,7 +9,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-21
-  arm64-darwin-22
+  arm64-darwin-23
 
 DEPENDENCIES
   rake

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2015 xord.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/Rakefile

@@ -1,6 +1,5 @@
 # -*- mode: ruby -*-
 
-
 %w[../xot ../rucy .]
   .map  {|s| File.expand_path "#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/VERSION

@@ -1 +1 @@
-0.3
+0.3.1

data/beeps.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_runtime_dependency 'xot',  '~> 0.3'
-  s.add_runtime_dependency 'rucy', '~> 0.3'
+  s.add_runtime_dependency 'xot',  '~> 0.3.1'
+  s.add_runtime_dependency 'rucy', '~> 0.3.1'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/ext/beeps/{adsr.cpp → envelope.cpp}

@@ -5,17 +5,17 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::ADSR)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Envelope)
 
-#define THIS  to<Beeps::ADSR*>(self)
+#define THIS  to<Beeps::Envelope*>(self)
 
-#define CHECK RUCY_CHECK_OBJ(Beeps::ADSR, self)
+#define CHECK RUCY_CHECK_OBJ(Beeps::Envelope, self)
 
 
 static
 RUCY_DEF_ALLOC(alloc, klass)
 {
-	return value(new Beeps::RubyProcessor<Beeps::ADSR>, klass);
+	return value(new Beeps::RubyProcessor<Beeps::Envelope>, klass);
 }
 RUCY_END
 
@@ -114,25 +114,25 @@ RUCY_DEF0(get_release_time)
 RUCY_END
 
 
-static Class cADSR;
+static Class cEnvelope;
 
 void
-Init_beeps_adsr ()
+Init_beeps_envelope ()
 {
 	Module mBeeps = define_module("Beeps");
 
-	cADSR = mBeeps.define_class("ADSR", Beeps::processor_class());
-	cADSR.define_alloc_func(alloc);
-	cADSR.define_private_method("note_on!",  note_on);
-	cADSR.define_private_method("note_off!", note_off);
-	cADSR.define_method( "attack_time=",   set_attack_time);
-	cADSR.define_method( "attack_time",    get_attack_time);
-	cADSR.define_method(  "decay_time=",    set_decay_time);
-	cADSR.define_method(  "decay_time",     get_decay_time);
-	cADSR.define_method("sustain_level=", set_sustain_level);
-	cADSR.define_method("sustain_level",  get_sustain_level);
-	cADSR.define_method("release_time=",  set_release_time);
-	cADSR.define_method("release_time",   get_release_time);
+	cEnvelope = mBeeps.define_class("Envelope", Beeps::processor_class());
+	cEnvelope.define_alloc_func(alloc);
+	cEnvelope.define_private_method("note_on!",  note_on);
+	cEnvelope.define_private_method("note_off!", note_off);
+	cEnvelope.define_method( "attack_time=",   set_attack_time);
+	cEnvelope.define_method( "attack_time",    get_attack_time);
+	cEnvelope.define_method(  "decay_time=",    set_decay_time);
+	cEnvelope.define_method(  "decay_time",     get_decay_time);
+	cEnvelope.define_method("sustain_level=", set_sustain_level);
+	cEnvelope.define_method("sustain_level",  get_sustain_level);
+	cEnvelope.define_method("release_time=",  set_release_time);
+	cEnvelope.define_method("release_time",   get_release_time);
 }
 
 
@@ -141,9 +141,9 @@ namespace Beeps
 
 
 	Class
-	adsr_class ()
+	envelope_class ()
 	{
-		return cADSR;
+		return cEnvelope;
 	}
 
 

data/ext/beeps/native.cpp

@@ -9,11 +9,12 @@ void Init_beeps_sound_player ();
 void Init_beeps_processor ();
 
 void Init_beeps_oscillator ();
+void Init_beeps_sequencer ();
 void Init_beeps_file_in ();
 void Init_beeps_mic_in ();
 
 void Init_beeps_gain ();
-void Init_beeps_adsr ();
+void Init_beeps_envelope ();
 void Init_beeps_time_stretch ();
 void Init_beeps_pitch_shift ();
 void Init_beeps_analyser ();
@@ -38,11 +39,12 @@ extern "C" void
 	Init_beeps_processor();
 
 	Init_beeps_oscillator();
+	Init_beeps_sequencer();
 	Init_beeps_file_in();
 	Init_beeps_mic_in();
 
 	Init_beeps_gain();
-	Init_beeps_adsr();
+	Init_beeps_envelope();
 	Init_beeps_time_stretch();
 	Init_beeps_pitch_shift();
 	Init_beeps_analyser();

data/ext/beeps/sequencer.cpp

@@ -0,0 +1,92 @@
+#include "beeps/ruby/generator.h"
+
+
+#include "beeps/ruby/processor.h"
+#include "defs.h"
+
+
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Sequencer)
+
+#define THIS  to<Beeps::Sequencer*>(self)
+
+#define CHECK RUCY_CHECK_OBJ(Beeps::Sequencer, self)
+
+
+static
+RUCY_DEF_ALLOC(alloc, klass)
+{
+	return value(new Beeps::RubyProcessor<Beeps::Sequencer>, klass);
+}
+RUCY_END
+
+static
+RUCY_DEF3(add, processor, offset, duration)
+{
+	CHECK;
+
+	THIS->add(
+		to<Beeps::Processor*>(processor),
+		to<float>(offset),
+		to<float>(duration));
+}
+RUCY_END
+
+static
+RUCY_DEF2(remove, processor, offset)
+{
+	CHECK;
+
+	THIS->remove(
+		to<Beeps::Processor*>(processor),
+		to<float>(offset));
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_time_scale, time_scale)
+{
+	CHECK;
+
+	THIS->set_time_scale(to<float>(time_scale));
+	return time_scale;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_time_scale)
+{
+	CHECK;
+
+	return value(THIS->time_scale());
+}
+RUCY_END
+
+
+static Class cSequencer;
+
+void
+Init_beeps_sequencer ()
+{
+	Module mBeeps = define_module("Beeps");
+
+	cSequencer = mBeeps.define_class("Sequencer", Beeps::processor_class());
+	cSequencer.define_alloc_func(alloc);
+	cSequencer.define_method("add",    add);
+	cSequencer.define_method("remove", remove);
+	//cSequencer.define_method("time_scale=", set_time_scale);
+	//cSequencer.define_method("time_scale",  get_time_scale);
+}
+
+
+namespace Beeps
+{
+
+
+	Class
+	sequencer_class ()
+	{
+		return cSequencer;
+	}
+
+
+}// Beeps

data/include/beeps/filter.h

@@ -37,16 +37,16 @@ namespace Beeps
 	};// Gain
 
 
-	class ADSR : public Filter
+	class Envelope : public Filter
 	{
 
 		typedef Filter Super;
 
 		public:
 
-			ADSR (Processor* input = NULL);
+			Envelope (Processor* input = NULL);
 
-			virtual ~ADSR ();
+			virtual ~Envelope ();
 
 			virtual void note_on  (float delay = 0);
 
@@ -77,7 +77,7 @@ namespace Beeps
 
 			Xot::PImpl<Data> self;
 
-	};// ADSR
+	};// Envelope
 
 
 	class TimeStretch : public Filter

data/include/beeps/generator.h

@@ -46,6 +46,37 @@ namespace Beeps
 	};// Oscillator
 
 
+	class Sequencer : public Generator
+	{
+
+		typedef Generator Super;
+
+		public:
+
+			Sequencer ();
+
+			virtual ~Sequencer ();
+
+			virtual void add    (Processor* processor, float offset, float duration);
+
+			virtual void remove (Processor* processor, float offset);
+
+			virtual void set_time_scale (float scale);
+
+			virtual float    time_scale () const;
+
+			virtual void generate (
+				Context* context, Signals* signals, uint* offset) override;
+
+			virtual operator bool () const override;
+
+			struct Data;
+
+			Xot::PImpl<Data> self;
+
+	};// Sequencer
+
+
 	class FileIn : public Generator
 	{
 

data/include/beeps/ruby/filter.h

@@ -9,10 +9,16 @@
 #include <beeps/filter.h>
 
 
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Gain)
+
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Envelope)
+
 RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::TimeStretch)
 
 RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::PitchShift)
 
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Analyser)
+
 
 namespace Beeps
 {
@@ -21,8 +27,8 @@ namespace Beeps
 	BEEPS_EXPORT Rucy::Class gain_class ();
 	// class Beeps::Gain
 
-	BEEPS_EXPORT Rucy::Class adsr_class ();
-	// class Beeps::ADSR
+	BEEPS_EXPORT Rucy::Class envelope_class ();
+	// class Beeps::Envelope
 
 	BEEPS_EXPORT Rucy::Class time_stretch_class ();
 	// class Beeps::TimeStretch
@@ -48,9 +54,9 @@ namespace Rucy
 	}
 
 	template <> inline Class
-	get_ruby_class<Beeps::ADSR> ()
+	get_ruby_class<Beeps::Envelope> ()
 	{
-		return Beeps::adsr_class();
+		return Beeps::envelope_class();
 	}
 
 	template <> inline Class

data/include/beeps/ruby/generator.h

@@ -11,8 +11,12 @@
 
 RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Oscillator)
 
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Sequencer)
+
 RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::FileIn)
 
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::MicIn)
+
 
 namespace Beeps
 {
@@ -21,6 +25,9 @@ namespace Beeps
 	BEEPS_EXPORT Rucy::Class oscillator_class ();
 	// class Beeps::Oscillator
 
+	BEEPS_EXPORT Rucy::Class sequencer_class ();
+	// class Beeps::Sequencer
+
 	BEEPS_EXPORT Rucy::Class file_in_class ();
 	// class Beeps::FileIn
 
@@ -41,6 +48,12 @@ namespace Rucy
 		return Beeps::oscillator_class();
 	}
 
+	template <> inline Class
+	get_ruby_class<Beeps::Sequencer> ()
+	{
+		return Beeps::sequencer_class();
+	}
+
 	template <> inline Class
 	get_ruby_class<Beeps::FileIn> ()
 	{

data/lib/beeps/processor.rb

@@ -75,7 +75,7 @@ module Beeps
   end# Gain
 
 
-  class ADSR
+  class Envelope
 
     def note_on(delay = 0)
       note_on! delay
@@ -96,7 +96,7 @@ module Beeps
     alias release= release_time=
     alias release  release_time
 
-  end# ADSR
+  end# Envelope
 
 
   class TimeStretch