beeps 0.3.3 → 0.3.4

data/src/processor.cpp

@@ -14,7 +14,7 @@ namespace Beeps
 	struct Processor::Data
 	{
 
-		bool generator = false;
+		bool generator = false, started = false;
 
 		float buffering_seconds = 0;
 
@@ -22,11 +22,6 @@ namespace Beeps
 
 		Processor::Ref input;
 
-		bool has_generator () const
-		{
-			return generator || (input && input->self->has_generator());
-		}
-
 	};// Processor::Data
 
 
@@ -57,6 +52,7 @@ namespace Beeps
 	void
 	Processor::reset ()
 	{
+		self->started = false;
 		if (self->input) self->input->reset();
 
 		set_updated();
@@ -79,6 +75,11 @@ namespace Beeps
 		return self->input;
 	}
 
+	void
+	Processor::on_start ()
+	{
+	}
+
 	const Processor*
 	Processor::input () const
 	{
@@ -87,7 +88,7 @@ namespace Beeps
 
 	Processor::operator bool () const
 	{
-		return self->has_generator();
+		return self->generator || (self->input && *self->input);
 	}
 
 	bool
@@ -99,6 +100,12 @@ namespace Beeps
 	void
 	Processor::process (Context* context, Signals* signals, uint* offset)
 	{
+		if (!self->started)
+		{
+			self->started = true;
+			on_start();
+		}
+
 		if (self->generator)
 			generate(context, signals, offset);
 		else

data/src/signals.cpp

@@ -216,6 +216,24 @@ namespace Beeps
 			return resample_frames(to, from, from_offset);
 	}
 
+	void
+	Signals_add (Signals* signals, const Signals& add)
+	{
+		if (!signals)
+			argument_error(__FILE__, __LINE__);
+		if (signals->nchannels() != add.nchannels())
+			argument_error(__FILE__, __LINE__);
+
+		Frames* sigf = Signals_get_frames(signals);
+		Frames* addf = Signals_get_frames(const_cast<Signals*>(&add));
+		Float* sigp  = &(*sigf)(0, 0);
+		Float* addp  = &(*addf)(0, 0);
+		uint nframes = std::min(sigf->nframes(), addf->nframes());
+
+		for (uint i = 0; i < nframes; ++i, ++sigp, ++addp)
+			*sigp += *addp;
+	}
+
 	void
 	Signals_multiply (Signals* signals, const Signals& multiplier)
 	{
@@ -226,16 +244,16 @@ namespace Beeps
 		if (signals->capacity() != multiplier.capacity())
 			argument_error(__FILE__, __LINE__);
 
-		Frames* sigf = Signals_get_frames(signals);
-		Frames* mulf = Signals_get_frames(const_cast<Signals*>(&multiplier));
-		uint nframes = sigf->nframes();
-		uint stride  = sigf->nchannels();
+		Frames* sigf   = Signals_get_frames(signals);
+		Frames* mulf   = Signals_get_frames(const_cast<Signals*>(&multiplier));
+		uint nchannels = sigf->nchannels();
+		uint nframes   = sigf->nframes();
 
-		for (uint ch = 0; ch < sigf->nchannels(); ++ch)
+		for (uint ch = 0; ch < nchannels; ++ch)
 		{
 			Float* sigp = &(*sigf)(0, ch);
 			Float* mulp = &(*mulf)(0, 0);
-			for (uint i = 0; i < nframes; ++i, sigp += stride, ++mulp)
+			for (uint i = 0; i < nframes; i += nchannels, sigp += nchannels, ++mulp)
 				*sigp *= *mulp;
 		}
 	}

data/src/signals.h

@@ -39,6 +39,8 @@ namespace Beeps
 
 	uint Signals_copy (Signals* to, const Signals& from, uint from_offset);
 
+	void Signals_add (     Signals* signals, const Signals& add);
+
 	void Signals_multiply (Signals* signals, const Signals& multiplier);
 
 	template <typename T>
@@ -63,7 +65,7 @@ namespace Beeps
 
 		public:
 
-			Frames (unsigned int nframes = 0, unsigned int nchannels = 0)
+			Frames (unsigned int nframes = 0, unsigned int nchannels = 1)
 			:	stk::StkFrames(nframes, nchannels)
 			{
 			}
@@ -98,6 +100,11 @@ namespace Beeps
 				bufferSize_ = saved_bufferSize_;
 			}
 
+			uint sample_rate () const
+			{
+				return dataRate();
+			}
+
 			uint nchannels () const
 			{
 				return nChannels_;

data/test/test_processor.rb

@@ -34,7 +34,7 @@ class TestProcessor < Test::Unit::TestCase
     assert_equal gain1, gain2.input
   end
 
-  def test_shift_left()
+  def _test_shift_left()
     osc   = B::Oscillator.new
     gain1 = B::Gain.new
     gain2 = B::Gain.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beeps
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-22 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
 description: Synthesize and play beep sounds.
 email: xordog@gmail.com
 executables: []
@@ -63,6 +63,7 @@ extra_rdoc_files:
 - ".doc/ext/beeps/file_in.cpp"
 - ".doc/ext/beeps/gain.cpp"
 - ".doc/ext/beeps/mic_in.cpp"
+- ".doc/ext/beeps/mixer.cpp"
 - ".doc/ext/beeps/native.cpp"
 - ".doc/ext/beeps/oscillator.cpp"
 - ".doc/ext/beeps/pitch_shift.cpp"
@@ -79,6 +80,7 @@ files:
 - ".doc/ext/beeps/file_in.cpp"
 - ".doc/ext/beeps/gain.cpp"
 - ".doc/ext/beeps/mic_in.cpp"
+- ".doc/ext/beeps/mixer.cpp"
 - ".doc/ext/beeps/native.cpp"
 - ".doc/ext/beeps/oscillator.cpp"
 - ".doc/ext/beeps/pitch_shift.cpp"
@@ -108,6 +110,7 @@ files:
 - ext/beeps/file_in.cpp
 - ext/beeps/gain.cpp
 - ext/beeps/mic_in.cpp
+- ext/beeps/mixer.cpp
 - ext/beeps/native.cpp
 - ext/beeps/oscillator.cpp
 - ext/beeps/pitch_shift.cpp
@@ -150,6 +153,7 @@ files:
 - src/gain.cpp
 - src/mic_in.cpp
 - src/mic_in.h
+- src/mixer.cpp
 - src/openal.cpp
 - src/openal.h
 - src/oscillator.cpp
@@ -178,7 +182,8 @@ files:
 homepage: https://github.com/xord/beeps
 licenses:
 - MIT
-metadata: {}
+metadata:
+  msys2_mingw_dependencies: openal
 post_install_message:
 rdoc_options: []
 require_paths: