beeps 0.1.32 → 0.1.34

data/src/sound.h

@@ -4,11 +4,16 @@
 #define __BEEPS_SRC_SOUND_H__
 
 
+#include <beeps/sound.h>
+
+
 namespace Beeps
 {
 
 
-	void Sound_cleanup_sources ();
+	void SoundPlayer_process_streams ();
+
+	void SoundPlayer_clear_streams ();
 
 
 }// Beeps

data/src/time_stretch.cpp

@@ -0,0 +1,91 @@
+#include "beeps/filter.h"
+
+
+#include "signalsmith-stretch.h"
+#include "signals.h"
+
+
+namespace Beeps
+{
+
+
+	struct TimeStretch::Data
+	{
+
+		signalsmith::stretch::SignalsmithStretch<float> stretch;
+
+		float scale = 1;
+
+	};// TimeStretch::Data
+
+
+	TimeStretch::TimeStretch (Processor* input)
+	:	Super(input)
+	{
+		set_buffering_seconds(1);
+	}
+
+	TimeStretch::~TimeStretch ()
+	{
+	}
+
+	void
+	TimeStretch::reset ()
+	{
+		Super::reset();
+
+		self->stretch.reset();
+	}
+
+	void
+	TimeStretch::set_scale (float scale)
+	{
+		if (scale <= 0)
+			argument_error(__FILE__, __LINE__, "'scale' must be greater than 0");
+
+		self->scale = scale;
+
+		set_updated();
+	}
+
+	float
+	TimeStretch::scale () const
+	{
+		return self->scale;
+	}
+
+	void
+	TimeStretch::filter (Context* context, Signals* signals, uint* offset)
+	{
+		if (self->scale == 1)
+			return Super::filter(context, signals, offset);
+
+		uint nsamples  = signals->capacity();
+		Signals source = Signals_create(
+			nsamples / self->scale, signals->nchannels(), signals->sample_rate());
+
+		Super::filter(context, &source, offset);
+
+		SignalSamples<float> input(source);
+		SignalSamples<float> output(
+			source.nsamples() < source.capacity()
+				?	source.nsamples() * self->scale
+				:	nsamples,
+			signals->nchannels());
+
+		self->stretch.presetDefault(signals->nchannels(), signals->sample_rate());
+		self->stretch.process(
+			 input.channels(),  input.nsamples(),
+			output.channels(), output.nsamples());
+
+		Signals_write_samples(signals, output);
+	}
+
+	TimeStretch::operator bool () const
+	{
+		if (!Super::operator bool()) return false;
+		return self->scale > 0;
+	}
+
+
+}// Beeps

data/test/helper.rb

@@ -5,10 +5,11 @@
   .map  {|s| File.expand_path "../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
-require 'test/unit'
 require 'xot/test'
 require 'beeps'
 
+require 'test/unit'
+
 include Xot::Test
 
 

data/test/test_beeps.rb

@@ -1,18 +1,21 @@
 # -*- coding: utf-8 -*-
 
 
-$BEEPS_NOAUTOINIT = true
-
 require_relative 'helper'
 
 
 class TestBeeps < Test::Unit::TestCase
 
-  def test_init!()
-    assert_raise(Beeps::BeepsError) {Beeps.fin!}
-    assert Beeps.init!
-    assert_raise(Beeps::BeepsError) {Beeps.init!}
-    assert Beeps.fin!
+  B = Beeps
+
+  def test_beep()
+    B.beep_processor = B::Oscillator.new >> B::Gain.new(gain: 0)
+    assert_nothing_raised {B.be}
+    assert_nothing_raised {B.bee}
+    assert_nothing_raised {B.beep}
+    assert_nothing_raised {B.beeep}
+    assert_nothing_raised {B.beeeep}
+    assert_nothing_raised {B.beeeeep}
   end
 
 end# TestBeeps

data/test/test_beeps_init.rb

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+
+$BEEPS_NOAUTOINIT = true
+
+require_relative 'helper'
+
+
+class TestBeepsInit < Test::Unit::TestCase
+
+  def test_init!()
+    assert_raise(Beeps::BeepsError) {Beeps.fin!}
+    assert Beeps.init!
+    assert_raise(Beeps::BeepsError) {Beeps.init!}
+    assert Beeps.fin!
+  end
+
+end# TestBeepsInit

data/test/test_file_in.rb

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+
+require_relative 'helper'
+
+
+class TestFileIn < Test::Unit::TestCase
+
+  B = Beeps
+
+  def test_initialize()
+    assert_raise(B::BeepsError) {B::FileIn.new 'nofile.wav'}
+  end
+
+end# TestFileIn

data/test/test_processor.rb

@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+
+
+require_relative 'helper'
+
+
+class TestProcessor < Test::Unit::TestCase
+
+  B = Beeps
+
+  def processor()
+    B::Gain.new
+  end
+
+  def test_initialize()
+    assert_raise(Beeps::BeepsError) {B::Processor.new}
+  end
+
+  def test_input()
+    p = processor
+    assert_nil p.input
+
+    p.input = B::Oscillator.new
+    assert_equal B::Oscillator, p.input.class
+
+    p.input nil
+    assert_nil p.input
+  end
+
+  def test_shift_right()
+    osc   = B::Oscillator.new
+    gain1 = B::Gain.new
+    gain2 = B::Gain.new
+    assert_equal gain2, (osc >> gain1 >> gain2)
+    assert_equal nil,   osc.input
+    assert_equal osc,   gain1.input
+    assert_equal gain1, gain2.input
+  end
+
+  def test_shift_left()
+    osc   = B::Oscillator.new
+    gain1 = B::Gain.new
+    gain2 = B::Gain.new
+    assert_equal osc, (gain2 << gain1 << osc)
+    assert_equal nil,   osc.input
+    assert_equal osc,   gain1.input
+    assert_equal gain1, gain2.input
+  end
+
+end# TestProcessor

data/test/test_sound.rb

@@ -6,21 +6,97 @@ require_relative 'helper'
 
 class TestSound < Test::Unit::TestCase
 
-  def s()
-    Beeps::Sound.new Beeps::SineWave.new, 0.1
+  B = Beeps
+
+  PATH = 'test.wav'
+
+  def sound(seconds = 0.1, processor: B::Oscillator.new, **kwargs, &block)
+    B::Sound.new processor >> B::Gain.new(gain: 0), seconds, **kwargs, &block
+  end
+
+  def teardown()
+    B::SoundPlayer.stop_all
+    File.delete PATH if File.exist?(PATH)
+  end
+
+  def test_initialize()
+    assert_in_epsilon 1, sound.gain
+    assert_false         sound.loop
+
+    assert_true sound(loop: true).loop
+    assert_true sound {loop true}.loop
   end
 
   def test_play()
-    assert_nothing_raised {s.play}
+    assert_nothing_raised {sound.play}
+
+    assert_true sound.play(loop: true).loop
+    assert_true sound.play {loop true}.loop
+  end
+
+  def test_save()
+    assert_false          File.exist?(PATH)
+    assert_nothing_raised {sound.save PATH}
+    assert_true           File.exist?(PATH)
+    assert_nothing_raised {B::Sound.load PATH}
   end
 
-  def test_beep()
-    assert_nothing_raised {Beeps.be}
-    assert_nothing_raised {Beeps.bee}
-    assert_nothing_raised {Beeps.beep}
-    assert_nothing_raised {Beeps.beeep}
-    assert_nothing_raised {Beeps.beeeep}
-    assert_nothing_raised {Beeps.beeeeep}
+  def test_sample_rate()
+    assert_in_epsilon 44100, sound                    .sample_rate
+    assert_in_epsilon 48000, sound(sample_rate: 48000).sample_rate
+    assert_in_epsilon 96000, sound(sample_rate: 96000).sample_rate
+  end
+
+  def test_nchannels()
+    assert_equal 1, sound              .nchannels
+    assert_equal 2, sound(nchannels: 2).nchannels
+  end
+
+  def test_seconds()
+    assert_in_epsilon 0.2,  sound(0.2).seconds
+    assert_in_epsilon (-1), sound(0)  .seconds
+    assert_in_epsilon (-1), sound(-1) .seconds
+    assert_in_epsilon (-1), sound(-2) .seconds
+  end
+
+  def test_gain()
+    s = sound
+    assert_in_epsilon 1,   s     .gain
+    assert_in_epsilon 1,   s.play.gain
+
+    s.gain = 0.1
+    assert_in_epsilon 0.1, s     .gain
+    assert_in_epsilon 0.1, s.play.gain
+
+    s.gain 0.2
+    assert_in_epsilon 0.2, s     .gain
+    assert_in_epsilon 0.2, s.play.gain
+  end
+
+  def test_loop()
+    s = sound
+    assert_false s     .loop
+    assert_false s.play.loop
+
+    s.loop = true
+    assert_true  s     .loop
+    assert_true  s.play.loop
+
+    s.loop false
+    assert_false s     .loop
+    assert_false s.play.loop
+  end
+
+  def test_load()
+    assert_nothing_raised {
+      sound(0.1, nchannels: 2, sample_rate: 96000).save PATH
+    }
+
+    s = B::Sound.load PATH
+    assert_in_epsilon 96000, s.sample_rate
+    assert_equal      2,     s.nchannels
+    assert_in_epsilon 0.1,   s.seconds
+    assert_nothing_raised {s.play}
   end
 
-end# TestBeeps
+end# TestSound

data/test/test_sound_player.rb

@@ -0,0 +1,134 @@
+# -*- coding: utf-8 -*-
+
+
+require_relative 'helper'
+
+
+class TestSoundPlayer < Test::Unit::TestCase
+
+  B = Beeps
+
+  PATH = 'test.wav'
+
+  def sound(seconds = 0.1, processor: B::Oscillator.new, **kwargs)
+    B::Sound.new processor >> B::Gain.new(gain: 0), seconds, **kwargs
+  end
+
+  def stream_sound(**kwargs)
+    sound 0, processor: B::FileIn.new(PATH), **kwargs
+  end
+
+  def setup()
+    sound.save PATH
+  end
+
+  def teardown()
+    B::SoundPlayer.stop_all
+    File.delete PATH if File.exist?(PATH)
+  end
+
+  def test_initialize()
+    assert_in_epsilon 1, sound.play.gain
+    assert_false         sound.play.loop
+  end
+
+  def test_pause()
+    p = sound.play
+    assert_equal [true,  false, false], [p.playing?, p.paused?, p.stopped?]
+    p.pause
+    assert_equal [false, true,  false], [p.playing?, p.paused?, p.stopped?]
+
+    p = stream_sound.play
+    assert_equal [true,  false, false], [p.playing?, p.paused?, p.stopped?]
+    p.pause
+    assert_equal [false, true,  false], [p.playing?, p.paused?, p.stopped?]
+  end
+
+  def test_stop()
+    p = sound.play
+    assert_equal [true,  false, false], [p.playing?, p.paused?, p.stopped?]
+    p.stop
+    assert_equal [false, false, true],  [p.playing?, p.paused?, p.stopped?]
+
+    p = stream_sound.play
+    assert_equal [true,  false, false], [p.playing?, p.paused?, p.stopped?]
+    p.stop
+    assert_equal [false, false, true],  [p.playing?, p.paused?, p.stopped?]
+  end
+
+  def test_play_end_then_stop()
+    s   = sound
+    sec = s.seconds
+
+    p = s.play
+    assert_equal [true,  false, false], [p.playing?, p.paused?, p.stopped?]
+    sleep sec * 2
+    assert_equal [false, false, true],  [p.playing?, p.paused?, p.stopped?]
+
+    s = stream_sound
+    p = s.play
+    assert_equal [true,  false, false], [p.playing?, p.paused?, p.stopped?]
+    sleep sec * 2
+    assert_equal [false, false, true],  [p.playing?, p.paused?, p.stopped?]
+  end
+
+  def test_play_after_pause()
+    p = sound.play
+    p.pause
+    assert_equal [false, true,  false], [p.playing?, p.paused?, p.stopped?]
+    p.play
+    assert_equal [true,  false, false], [p.playing?, p.paused?, p.stopped?]
+
+    p = stream_sound.play
+    p.pause
+    assert_equal [false, true,  false], [p.playing?, p.paused?, p.stopped?]
+    p.play
+    assert_equal [true,  false, false], [p.playing?, p.paused?, p.stopped?]
+  end
+
+  def test_stop_after_pause()
+    p = sound.play
+    p.pause
+    assert_equal [false, true,  false], [p.playing?, p.paused?, p.stopped?]
+    p.stop
+    assert_equal [false, false, true],  [p.playing?, p.paused?, p.stopped?]
+
+    p = stream_sound.play
+    p.pause
+    assert_equal [false, true,  false], [p.playing?, p.paused?, p.stopped?]
+    p.stop
+    assert_equal [false, false, true],  [p.playing?, p.paused?, p.stopped?]
+  end
+
+  def test_gain()
+    p = sound.play
+    assert_in_epsilon 1,   p.gain
+
+    p.gain = 0.1
+    assert_in_epsilon 0.1, p.gain
+
+    p.gain 0.2
+    assert_in_epsilon 0.2, p.gain
+  end
+
+  def test_loop()
+    p = sound.play
+    assert_false p.loop
+
+    p.loop = true
+    assert_true  p.loop
+
+    p.loop false
+    assert_false p.loop
+  end
+
+  def test_stop_all()
+    s = sound
+    players = 10.times.map {s.play}
+    assert_true players.all? {|p| p.playing?}
+
+    B::SoundPlayer.stop_all
+    assert_true players.all? {|p| p.stopped?}
+  end
+
+end# TestSoundPlayer

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beeps
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 0.1.34
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-01 00:00:00.000000000 Z
+date: 2023-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.32
+        version: 0.1.33
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.32
+        version: 0.1.33
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.32
+        version: 0.1.33
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.32
+        version: 0.1.33
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,25 +72,35 @@ executables: []
 extensions:
 - Rakefile
 extra_rdoc_files:
+- ".doc/ext/beeps/adsr.cpp"
+- ".doc/ext/beeps/analyser.cpp"
 - ".doc/ext/beeps/beeps.cpp"
 - ".doc/ext/beeps/exception.cpp"
 - ".doc/ext/beeps/file_in.cpp"
+- ".doc/ext/beeps/gain.cpp"
+- ".doc/ext/beeps/mic_in.cpp"
 - ".doc/ext/beeps/native.cpp"
+- ".doc/ext/beeps/oscillator.cpp"
+- ".doc/ext/beeps/pitch_shift.cpp"
 - ".doc/ext/beeps/processor.cpp"
-- ".doc/ext/beeps/sawtooth_wave.cpp"
-- ".doc/ext/beeps/sine_wave.cpp"
 - ".doc/ext/beeps/sound.cpp"
-- ".doc/ext/beeps/square_wave.cpp"
+- ".doc/ext/beeps/sound_player.cpp"
+- ".doc/ext/beeps/time_stretch.cpp"
 files:
+- ".doc/ext/beeps/adsr.cpp"
+- ".doc/ext/beeps/analyser.cpp"
 - ".doc/ext/beeps/beeps.cpp"
 - ".doc/ext/beeps/exception.cpp"
 - ".doc/ext/beeps/file_in.cpp"
+- ".doc/ext/beeps/gain.cpp"
+- ".doc/ext/beeps/mic_in.cpp"
 - ".doc/ext/beeps/native.cpp"
+- ".doc/ext/beeps/oscillator.cpp"
+- ".doc/ext/beeps/pitch_shift.cpp"
 - ".doc/ext/beeps/processor.cpp"
-- ".doc/ext/beeps/sawtooth_wave.cpp"
-- ".doc/ext/beeps/sine_wave.cpp"
 - ".doc/ext/beeps/sound.cpp"
-- ".doc/ext/beeps/square_wave.cpp"
+- ".doc/ext/beeps/sound_player.cpp"
+- ".doc/ext/beeps/time_stretch.cpp"
 - ".github/workflows/release-gem.yml"
 - ".github/workflows/tag.yml"
 - ".github/workflows/test.yml"
@@ -100,27 +110,36 @@ files:
 - Rakefile
 - VERSION
 - beeps.gemspec
+- ext/beeps/adsr.cpp
+- ext/beeps/analyser.cpp
 - ext/beeps/beeps.cpp
 - ext/beeps/defs.h
 - ext/beeps/exception.cpp
 - ext/beeps/extconf.rb
 - ext/beeps/file_in.cpp
+- ext/beeps/gain.cpp
+- ext/beeps/mic_in.cpp
 - ext/beeps/native.cpp
+- ext/beeps/oscillator.cpp
+- ext/beeps/pitch_shift.cpp
 - ext/beeps/processor.cpp
-- ext/beeps/sawtooth_wave.cpp
-- ext/beeps/sine_wave.cpp
 - ext/beeps/sound.cpp
-- ext/beeps/square_wave.cpp
+- ext/beeps/sound_player.cpp
+- ext/beeps/time_stretch.cpp
 - include/beeps.h
 - include/beeps/beeps.h
 - include/beeps/debug.h
 - include/beeps/defs.h
 - include/beeps/exception.h
+- include/beeps/filter.h
+- include/beeps/generator.h
 - include/beeps/processor.h
 - include/beeps/ruby.h
 - include/beeps/ruby/beeps.h
 - include/beeps/ruby/defs.h
 - include/beeps/ruby/exception.h
+- include/beeps/ruby/filter.h
+- include/beeps/ruby/generator.h
 - include/beeps/ruby/processor.h
 - include/beeps/ruby/sound.h
 - include/beeps/signals.h
@@ -132,18 +151,33 @@ files:
 - lib/beeps/extension.rb
 - lib/beeps/processor.rb
 - lib/beeps/sound.rb
+- src/adsr.cpp
+- src/analyser.cpp
 - src/beeps.cpp
 - src/exception.cpp
+- src/file_in.cpp
+- src/gain.cpp
+- src/mic_in.cpp
+- src/mic_in.h
 - src/openal.cpp
 - src/openal.h
+- src/oscillator.cpp
+- src/osx/signals.mm
+- src/pitch_shift.cpp
 - src/processor.cpp
+- src/processor.h
 - src/signals.cpp
 - src/signals.h
 - src/sound.cpp
 - src/sound.h
+- src/time_stretch.cpp
 - test/helper.rb
 - test/test_beeps.rb
+- test/test_beeps_init.rb
+- test/test_file_in.rb
+- test/test_processor.rb
 - test/test_sound.rb
+- test/test_sound_player.rb
 homepage: https://github.com/xord/beeps
 licenses: []
 metadata: {}
@@ -162,11 +196,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Plays beep sound.
 test_files:
 - test/helper.rb
 - test/test_beeps.rb
+- test/test_beeps_init.rb
+- test/test_file_in.rb
+- test/test_processor.rb
 - test/test_sound.rb
+- test/test_sound_player.rb