beeps 0.3.3 → 0.3.5

data/src/oscillator.cpp

@@ -2,6 +2,8 @@
 
 
 #include <assert.h>
+#include <cmath>
+#include <vector>
 #include "SineWave.h"
 #include "Blit.h"
 #include "BlitSquare.h"
@@ -14,6 +16,42 @@ namespace Beeps
 {
 
 
+	class SineWave : public stk::SineWave
+	{
+
+		public:
+
+			void setPhase (stk::StkFloat phase)
+			{
+				time_ = std::fmod(phase, 1.f) * TABLE_SIZE;
+			}
+
+			stk::StkFloat getPhase () const
+			{
+				return time_ / TABLE_SIZE;
+			}
+
+	};// SineWave
+
+
+	class BlitSaw : public stk::BlitSaw
+	{
+
+		public:
+
+			void setPhase (stk::StkFloat phase)
+			{
+				phase_ = M_PI * phase;
+			}
+
+			stk::StkFloat getPhase () const
+			{
+				return phase_ / M_PI;
+			}
+
+	};// BlitSaw
+
+
 	class Osc
 	{
 
@@ -27,10 +65,14 @@ namespace Beeps
 
 			virtual void set_frequency (float freq) = 0;
 
+			virtual void set_phase (float phase) = 0;
+
+			virtual float    phase () const = 0;
+
 	};// Osc
 
 
-	template <typename OSC>
+	template <typename OSC, uint DROP_MSEC>
 	class StkOsc : public Osc
 	{
 
@@ -39,10 +81,18 @@ namespace Beeps
 			void reset () override
 			{
 				osc.reset();
+				drop_msec = DROP_MSEC;
 			}
 
 			void tick (Frames* frames) override
 			{
+				if (drop_msec > 0)
+				{
+					Frames f((uint) (frames->dataRate() * (drop_msec / 1000.0)));
+					osc.tick(f);
+					drop_msec = 0;
+				}
+
 				osc.tick(*frames);
 			}
 
@@ -51,21 +101,33 @@ namespace Beeps
 				osc.setFrequency(freq);
 			}
 
+			void set_phase (float phase) override
+			{
+				osc.setPhase(phase);
+			}
+
+			float phase () const override
+			{
+				return osc.getPhase();
+			}
+
 		protected:
 
 			OSC osc;
 
+			uint drop_msec = DROP_MSEC;
+
 	};// StkOsc
 
 
-	typedef StkOsc<stk::SineWave>   SineOsc;
+	typedef StkOsc<SineWave,          0> SineOsc;
 
-	typedef StkOsc<stk::BlitSquare> SquareOsc;
+	typedef StkOsc<stk::BlitSquare, 100> SquareOsc;
 
-	typedef StkOsc<stk::BlitSaw>    SawtoothOsc;
+	typedef StkOsc<BlitSaw,         200> SawtoothOsc;
 
 
-	class TriangleOsc : public StkOsc<stk::Blit>
+	class TriangleOsc : public StkOsc<stk::Blit, 0>
 	{
 
 		public:
@@ -78,6 +140,164 @@ namespace Beeps
 	};// TriangleOsc
 
 
+	class NoiseOsc : public Osc
+	{
+
+		public:
+
+			void reset () override
+			{
+				time = 0;
+			}
+
+			void tick (Frames* frames) override
+			{
+				if (0 < freq && (freq * 2) <= frames->sample_rate())
+					tick_with_freq(frames);
+				else
+					tick_without_freq(frames);
+			}
+
+			void set_frequency (float freq) override
+			{
+				this->freq = freq;
+			}
+
+			void set_phase (float phase) override
+			{
+				time = freq == 0 ? 0 : phase * (1.f / freq);
+			}
+
+			float phase () const override
+			{
+				return freq == 0 ? 0 : time / (1.f / freq);
+			}
+
+		private:
+
+			float freq  = 0;
+
+			double time = 0;
+
+			void tick_without_freq (Frames* frames)
+			{
+				uint nchannels = frames->nchannels();
+				uint nframes   = frames->nframes();
+				Float* pframe  = &(*frames)(0, 0);
+				for (uint i = 0; i < nframes; ++i, ++pframe)
+				{
+					uint ch = i % nchannels;
+					*pframe = ch == 0 ? noise() : pframe[-ch];
+				}
+			}
+
+			void tick_with_freq (Frames* frames)
+			{
+				float time_per_sample = 1.f / frames->sample_rate();
+				float time_per_freq   = 1.f / (freq * 2);
+
+				uint nchannels = frames->nchannels();
+				uint nframes   = frames->nframes();
+				Float* pframe  = &(*frames)(0, 0);
+				float value    = noise();
+				for (uint i = 0; i < nframes; ++i, ++pframe)
+				{
+					if (i % nchannels == 0)
+					{
+						*pframe = value;
+
+						time += time_per_sample;
+						while (time >= time_per_freq)
+						{
+							value = noise();
+							time -= time_per_freq;
+						}
+					}
+					else
+						*pframe = value;
+				}
+			}
+
+			double noise () const
+			{
+				return rand() / ((double) RAND_MAX + 1) * 2 - 1;
+			}
+
+	};// NoiseOsc
+
+
+	class WaveformOsc : public Osc
+	{
+
+		public:
+
+			typedef std::vector<float> Table;
+
+			WaveformOsc (float* samples, size_t nsamples, float frequency)
+			:	table(samples, samples + nsamples), freq(frequency), time(0)
+			{
+			}
+
+			void reset () override
+			{
+				time = 0;
+			}
+
+			void tick (Frames* frames) override
+			{
+				size_t size = table.size();
+				float dt    = size * freq / frames->sample_rate();
+
+				uint nchannels = frames->nchannels();
+				uint nframes   = frames->nframes();
+				Float* pframe  = &(*frames)(0, 0);
+				for (uint i = 0; i < nframes; ++i, ++pframe)
+				{
+					uint ch = i % nchannels;
+					if (ch == 0)
+					{
+						size_t index0 = (size_t) time;
+						size_t index1 = index0 == size - 1 ? 0 : index0 + 1;
+						float frac    = time - index0;
+						*pframe       = table[index0] * (1.f - frac) + table[index1] * frac;
+
+						time += dt;
+						while (time >= size) time -= size;
+					}
+					else
+						*pframe = pframe[-ch];
+				}
+			}
+
+			void set_frequency (float freq) override
+			{
+				this->freq = freq;
+			}
+
+			void set_phase (float phase) override
+			{
+				this->time = std::fmod(phase, 1.f) * table.size();
+			}
+
+			float phase () const override
+			{
+				return time / table.size();
+			}
+
+			const Table& samples () const
+			{
+				return table;
+			}
+
+		private:
+
+			Table table;
+
+			float freq, time;
+
+	};// WaveformOsc
+
+
 	struct Oscillator::Data
 	{
 
@@ -95,6 +315,11 @@ namespace Beeps
 		set_type(type);
 	}
 
+	Oscillator::Oscillator (float* samples, size_t size)
+	{
+		set_samples(samples, size);
+	}
+
 	Oscillator::~Oscillator ()
 	{
 	}
@@ -111,6 +336,8 @@ namespace Beeps
 	{
 		if (type == self->type) return;
 
+		float phase = self->osc ? self->osc->phase() : 0;
+
 		self->type = type;
 		self->osc.reset();
 
@@ -120,12 +347,15 @@ namespace Beeps
 			case TRIANGLE: self->osc.reset(new TriangleOsc()); break;
 			case SQUARE:   self->osc.reset(new SquareOsc());   break;
 			case SAWTOOTH: self->osc.reset(new SawtoothOsc()); break;
+			case NOISE:    self->osc.reset(new NoiseOsc());    break;
 			default:
 				argument_error(
 					__FILE__, __LINE__, "unknown oscilator type '%d'", self->type);
 				break;
 		}
 
+		self->osc->set_phase(phase);
+
 		set_updated();
 	}
 
@@ -135,6 +365,38 @@ namespace Beeps
 		return self->type;
 	}
 
+	void
+	Oscillator::set_samples (float* samples, size_t size)
+	{
+		float phase = self->osc ? self->osc->phase() : 0;
+
+		self->type = SAMPLES;
+		self->osc.reset(new WaveformOsc(samples, size, frequency()));
+		self->osc->set_phase(phase);
+
+		set_updated();
+	}
+
+	const float*
+	Oscillator::samples () const
+	{
+		if (self->type != SAMPLES)
+			return NULL;
+
+		auto* osc = (const WaveformOsc*) self->osc.get();
+		return &osc->samples()[0];
+	}
+
+	size_t
+	Oscillator::nsamples () const
+	{
+		if (self->type != SAMPLES)
+			return 0;
+
+		auto* osc = (WaveformOsc*) self->osc.get();
+		return osc->samples().size();
+	}
+
 	void
 	Oscillator::set_frequency (float frequency)
 	{
@@ -142,7 +404,6 @@ namespace Beeps
 			argument_error(__FILE__, __LINE__);
 
 		self->frequency = frequency;
-
 		set_updated();
 	}
 
@@ -152,6 +413,19 @@ namespace Beeps
 		return self->frequency;
 	}
 
+	void
+	Oscillator::set_phase (float phase)
+	{
+		self->osc->set_phase(phase);
+		set_updated();
+	}
+
+	float
+	Oscillator::phase () const
+	{
+		return self->osc->phase();
+	}
+
 	void
 	Oscillator::generate (Context* context, Signals* signals, uint* offset)
 	{

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)
 			{
 			}
@@ -96,6 +98,16 @@ namespace Beeps
 				nFrames_    = saved_nFrames_;
 				size_       = saved_size_;
 				bufferSize_ = saved_bufferSize_;
+
+				saved_data_       = NULL;
+				saved_nFrames_    = 0;
+				saved_size_       = 0;
+				saved_bufferSize_ = 0;
+			}
+
+			uint sample_rate () const
+			{
+				return dataRate();
 			}
 
 			uint nchannels () const

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.5
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-22 00:00:00.000000000 Z
+date: 2025-03-23 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.5
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.5
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.5
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.5
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.5
 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"
@@ -87,10 +89,12 @@ files:
 - ".doc/ext/beeps/sound.cpp"
 - ".doc/ext/beeps/sound_player.cpp"
 - ".doc/ext/beeps/time_stretch.cpp"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/release-gem.yml"
 - ".github/workflows/tag.yml"
 - ".github/workflows/test.yml"
 - ".github/workflows/utils.rb"
+- CONTRIBUTING.md
 - ChangeLog.md
 - Gemfile
 - Gemfile.lock
@@ -108,6 +112,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 +155,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 +184,8 @@ files:
 homepage: https://github.com/xord/beeps
 licenses:
 - MIT
-metadata: {}
+metadata:
+  msys2_mingw_dependencies: openal
 post_install_message:
 rdoc_options: []
 require_paths: