beeps 0.3 → 0.3.1

data/src/sequencer.cpp

@@ -0,0 +1,160 @@
+#include "beeps/generator.h"
+
+
+#include <list>
+#include <algorithm>
+#include "beeps/exception.h"
+#include "beeps/debug.h"
+#include "processor.h"
+#include "signals.h"
+
+
+namespace Beeps
+{
+
+
+	struct Sequencer::Data
+	{
+
+		struct Note
+		{
+
+			Processor::Ref processor;
+
+			float offset, duration;
+
+			Note (Processor* processor, float offset, float duration)
+			:	processor(processor), offset(offset), duration(duration)
+			{
+			}
+
+		};// Note
+
+		std::list<Note> notes;
+
+		float time_scale = 1;
+
+		uint sec2nsample (const Signals& signals, float sec) const
+		{
+			return sec * signals.sample_rate() / time_scale;
+		}
+
+	};// Sequencer::Data
+
+
+	Sequencer::Sequencer ()
+	{
+	}
+
+	Sequencer::~Sequencer ()
+	{
+	}
+
+	void
+	Sequencer::add (Processor* processor, float offset, float duration)
+	{
+		auto& notes = self->notes;
+		for (auto it = notes.begin(), end = notes.end(); it != end; ++it)
+		{
+			if (offset < it->offset)
+			{
+				notes.emplace(it, processor, offset, duration);
+				return;
+			}
+		}
+		notes.emplace_back(processor, offset, duration);
+	}
+
+	void
+	Sequencer::remove (Processor* processor, float offset)
+	{
+		auto it =
+			std::find_if(self->notes.begin(), self->notes.end(), [&](auto& note)
+			{
+				return note.processor == processor && note.offset == offset;
+			});
+		if (it == self->notes.end()) return;
+
+		self->notes.erase(it);
+	}
+
+	void
+	Sequencer::set_time_scale (float time_scale)
+	{
+		if (time_scale <= 0)
+			argument_error(__FILE__, __LINE__, "time_scale must be greater than 0");
+
+		self->time_scale = time_scale;
+	}
+
+	float
+	Sequencer::time_scale () const
+	{
+		return self->time_scale;
+	}
+
+	static void
+	mix (Signals* mixed, const Signals& source, uint source_offset)
+	{
+		Frames* mixf = Signals_get_frames(mixed);
+		Frames* srcf = Signals_get_frames(const_cast<Signals*>(&source));
+		Float* mixp  = &(*mixf)(source_offset, 0);
+		Float* srcp  = &(*srcf)(0, 0);
+		uint size    = source.nsamples() * source.nchannels();
+		for (uint i = 0; i < size; ++i, ++mixp, ++srcp)
+			*mixp += *srcp;
+	}
+
+	void
+	Sequencer::generate (Context* pcontext, Signals* psignals, uint* offset)
+	{
+		Super::generate(pcontext, psignals, offset);
+
+		auto& context = *Processor_get_context(pcontext);
+		auto& signals = *psignals;
+		Signals_resize(&signals, signals.capacity(), 0);
+
+		uint generate_begin  = *offset;
+		uint generate_end    = *offset + signals.capacity();
+		Signals note_signals = Signals_create(
+			signals.capacity(), signals.nchannels(), signals.sample_rate());
+
+		uint nsamples = 0;
+		for (auto& note : self->notes)
+		{
+			uint note_begin = self->sec2nsample(signals, note.offset);
+			uint note_end   = self->sec2nsample(signals, note.offset + note.duration);
+			if (note_end <= generate_begin) continue;
+			if (generate_end <= note_begin)
+			{
+				nsamples = generate_end - generate_begin;
+				break;
+			}
+
+			uint begin = std::max(generate_begin, note_begin);
+			uint end   = std::min(generate_end,   note_end);
+			assert(begin != end);
+
+			uint note_offset = begin - note_begin;
+			Signals_clear(&note_signals, end - begin);
+			context.process(note.processor.get(), &note_signals, &note_offset);
+
+			uint mix_offset  = begin - generate_begin;
+			mix(&signals, note_signals, mix_offset);
+
+			if (mix_offset + note_signals.nsamples() > nsamples)
+				nsamples = mix_offset + note_signals.nsamples();
+		}
+
+		Signals_set_nsamples(&signals, nsamples);
+		*offset += nsamples;
+	}
+
+	Sequencer::operator bool () const
+	{
+		if (!Super::operator bool()) return false;
+		return self->time_scale > 0;
+	}
+
+
+}// Beeps

data/src/signals.cpp

@@ -27,7 +27,9 @@ namespace Beeps
 	Signals
 	Signals_create (uint capacity, uint nchannels, double sample_rate)
 	{
-		if (capacity <= 0 || nchannels <= 0)
+		if (capacity <= 0)
+			argument_error(__FILE__, __LINE__);
+		if (nchannels <= 0)
 			argument_error(__FILE__, __LINE__);
 
 		if (sample_rate <= 0) sample_rate = Beeps::sample_rate();
@@ -43,7 +45,11 @@ namespace Beeps
 		const float* const* channels,
 		uint nsamples, uint nchannels, double sample_rate)
 	{
-		if (!channels || nsamples <= 0 || nchannels <= 0)
+		if (!channels)
+			argument_error(__FILE__, __LINE__);
+		if (nsamples <= 0)
+			argument_error(__FILE__, __LINE__);
+		if (nchannels <= 0)
 			argument_error(__FILE__, __LINE__);
 
 		if (sample_rate <= 0) sample_rate = Beeps::sample_rate();
@@ -64,19 +70,32 @@ namespace Beeps
 	}
 
 	void
-	Signals_resize (Signals* signals, uint capacity)
+	Signals_clear (Signals* signals)
 	{
-		if (!signals || !*signals || capacity <= 0)
+		if (!signals)
+			argument_error(__FILE__, __LINE__);
+
+		signals->self->nsamples = 0;
+	}
+
+	void
+	Signals_clear (Signals* signals, uint capacity)
+	{
+		if (!signals)
+			argument_error(__FILE__, __LINE__);
+		if (!*signals)
+			argument_error(__FILE__, __LINE__);
+		if (capacity <= 0)
 			argument_error(__FILE__, __LINE__);
 
-		signals->self->frames->resize(capacity, signals->nchannels());
 		Signals_clear(signals);
+		signals->self->frames->resize(capacity, signals->nchannels());
 	}
 
 	void
 	Signals_resize (Signals* signals, uint nsamples, Float value)
 	{
-		Signals_resize(signals, nsamples);
+		Signals_clear(signals, nsamples);
 
 		Frames* frames = Signals_get_frames(signals);
 		assert(frames);
@@ -89,15 +108,6 @@ namespace Beeps
 		Signals_set_nsamples(signals, nsamples);
 	}
 
-	void
-	Signals_clear (Signals* signals)
-	{
-		if (!signals)
-			argument_error(__FILE__, __LINE__);
-
-		signals->self->nsamples = 0;
-	}
-
 	static uint
 	copy_frames (Signals* to, const Signals& from, uint from_offset)
 	{
@@ -191,7 +201,11 @@ namespace Beeps
 	uint
 	Signals_copy (Signals* to, const Signals& from, uint from_offset)
 	{
-		if (!to || !*to || !from)
+		if (!to)
+			argument_error(__FILE__, __LINE__);
+		if (!*to)
+			argument_error(__FILE__, __LINE__);
+		if (!from)
 			argument_error(__FILE__, __LINE__);
 
 		Signals_clear(to);
@@ -203,23 +217,24 @@ namespace Beeps
 	}
 
 	void
-	Signals_apply (Signals* signals, const Signals& multiplier)
+	Signals_multiply (Signals* signals, const Signals& multiplier)
 	{
-		if (!signals || multiplier.nchannels() != 1)
+		if (!signals)
+			argument_error(__FILE__, __LINE__);
+		if (multiplier.nchannels() != 1)
 			argument_error(__FILE__, __LINE__);
-
 		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();
 
 		for (uint ch = 0; ch < sigf->nchannels(); ++ch)
 		{
-			Float* sigp  = &(*sigf)(0, ch);
-			Float* mulp  = &(*mulf)(0, 0);
-			uint nframes = sigf->nframes();
-			uint stride  = sigf->nchannels();
+			Float* sigp = &(*sigf)(0, ch);
+			Float* mulp = &(*mulf)(0, 0);
 			for (uint i = 0; i < nframes; ++i, sigp += stride, ++mulp)
 				*sigp *= *mulp;
 		}
@@ -231,13 +246,14 @@ namespace Beeps
 	{
 		uint nsamples = nsamples_ < 0 ? samples.nsamples() : (uint) nsamples_;
 
-		if (
-			!signals || !*signals ||
-			signals->nchannels() != samples.nchannels() ||
-			signals->capacity() < nsamples)
-		{
+		if (!signals)
+			argument_error(__FILE__, __LINE__);
+		if (!*signals)
+			argument_error(__FILE__, __LINE__);
+		if (signals->nchannels() != samples.nchannels())
+			argument_error(__FILE__, __LINE__);
+		if (signals->capacity() < nsamples)
 			argument_error(__FILE__, __LINE__);
-		}
 
 		Frames* f = Signals_get_frames(signals);
 		assert(f);

data/src/signals.h

@@ -31,15 +31,15 @@ namespace Beeps
 		const float* const* channels,
 		uint nsamples, uint nchannels, double sample_rate = 0);
 
-	void Signals_resize (Signals* signals, uint capacity);
+	void Signals_clear (Signals* signals);
 
-	void Signals_resize (Signals* signals, uint nsamples, Float value);
+	void Signals_clear (Signals* signals, uint capacity);
 
-	void Signals_clear (Signals* signals);
+	void Signals_resize (Signals* signals, uint nsamples, Float value);
 
 	uint Signals_copy (Signals* to, const Signals& from, uint from_offset);
 
-	void Signals_apply (Signals* signals, const Signals& multiplier);
+	void Signals_multiply (Signals* signals, const Signals& multiplier);
 
 	template <typename T>
 	void Signals_write_samples (

data/src/sound.cpp

@@ -9,6 +9,7 @@
 #include "beeps/beeps.h"
 #include "beeps/exception.h"
 #include "beeps/generator.h"
+#include "beeps/debug.h"
 #include "openal.h"
 #include "processor.h"
 #include "signals.h"
@@ -29,19 +30,19 @@ namespace Beeps
 	{
 
 		SoundBuffer (bool create = false)
+		:	self(new Data(create))
 		{
-			if (create) self->create();
 		}
 
 		SoundBuffer (const Signals& signals)
+		:	self(new Data(true))
 		{
-			self->create();
 			write(signals);
 		}
 
 		SoundBuffer (ALint id)
+		:	self(new Data(id))
 		{
-			self->id = id;
 		}
 
 		void clear ()
@@ -59,7 +60,8 @@ namespace Beeps
 			double sample_rate = signals.sample_rate();
 			uint nchannels     = signals.nchannels();
 			uint nsamples      = signals.nsamples();
-			assert(sample_rate > 0 && nchannels > 0 && nsamples > 0);
+			assert(sample_rate > 0 && nchannels > 0);
+			if (nsamples <= 0) return 0;
 
 			const Frames* frames = Signals_get_frames(&signals);
 			assert(frames);
@@ -93,7 +95,7 @@ namespace Beeps
 			return !operator bool();
 		}
 
-		struct Data
+		struct Data : public Xot::NonCopyable
 		{
 
 			void* context = NULL;
@@ -102,14 +104,9 @@ namespace Beeps
 
 			bool owner    = false;
 
-			~Data ()
+			Data (bool create)
 			{
-				clear();
-			}
-
-			void create ()
-			{
-				clear();
+				if (!create) return;
 
 				ALuint id_ = 0;
 				alGenBuffers(1, &id_);
@@ -120,6 +117,16 @@ namespace Beeps
 				owner   = true;
 			}
 
+			Data (ALint id)
+			:	context(OpenAL_get_context()), id(id)
+			{
+			}
+
+			~Data ()
+			{
+				clear();
+			}
+
 			void clear ()
 			{
 				if (owner && is_valid())
@@ -378,7 +385,7 @@ namespace Beeps
 
 		Processor::Ref processor;
 
-		std::unique_ptr<ProcessorContext> processor_context;
+		std::unique_ptr<StreamContext> stream_context;
 
 		void clear ()
 		{
@@ -403,8 +410,8 @@ namespace Beeps
 			assert(processor && *processor && nchannels > 0 && sample_rate > 0);
 
 			this->processor = processor;
-			processor_context.reset(
-				new ProcessorContext(sample_rate / 10, nchannels, sample_rate));
+			stream_context.reset(
+				new StreamContext(sample_rate / 10, nchannels, sample_rate));
 
 			for (int i = 0; i < 2; ++i)
 			{
@@ -418,13 +425,11 @@ namespace Beeps
 
 		bool process_stream (SoundBuffer* buffer)
 		{
-			assert(buffer && processor && processor_context);
-
-			Signals signals = processor_context->process_signals(processor);
-			if (!signals) return false;
+			assert(buffer && processor && stream_context);
 
-			if (processor_context->is_finished())
-				processor_context.reset();
+			Signals signals = stream_context->process_next(processor);
+			if (stream_context->is_finished())
+				stream_context.reset();
 
 			return buffer->write(signals) > 0;
 		}
@@ -447,7 +452,7 @@ namespace Beeps
 
 		bool is_streaming () const
 		{
-			return processor && processor_context && *processor_context;
+			return processor && stream_context;
 		}
 
 	};// SoundPlayer::Data
@@ -687,12 +692,8 @@ namespace Beeps
 				processor && *processor &&
 				seconds > 0 && nchannels > 0 && sample_rate > 0);
 
-			ProcessorContext context(seconds * sample_rate, nchannels, sample_rate);
-			Signals signals = context.process_signals(processor);
-			if (!signals)
-				beeps_error(__FILE__, __LINE__, "failed to process signals");
-
-			this->signals = signals;
+			StreamContext context(seconds * sample_rate, nchannels, sample_rate);
+			this->signals = context.process_next(processor);
 		}
 
 		void attach_to (SoundPlayer* player) override
@@ -798,7 +799,9 @@ namespace Beeps
 	{
 		Processor::Ref ref = processor;
 
-		if (!processor || !*processor)
+		if (!processor)
+			argument_error(__FILE__, __LINE__);
+		if (!*processor)
 			argument_error(__FILE__, __LINE__);
 
 		if (sample_rate <= 0) sample_rate = Beeps::sample_rate();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beeps
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-05 00:00:00.000000000 Z
+date: 2025-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,37 +16,37 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.1
 description: Synthesize and play beep sounds.
 email: xordog@gmail.com
 executables: []
 extensions:
 - Rakefile
 extra_rdoc_files:
-- ".doc/ext/beeps/adsr.cpp"
 - ".doc/ext/beeps/analyser.cpp"
 - ".doc/ext/beeps/beeps.cpp"
+- ".doc/ext/beeps/envelope.cpp"
 - ".doc/ext/beeps/exception.cpp"
 - ".doc/ext/beeps/file_in.cpp"
 - ".doc/ext/beeps/gain.cpp"
@@ -55,13 +55,14 @@ extra_rdoc_files:
 - ".doc/ext/beeps/oscillator.cpp"
 - ".doc/ext/beeps/pitch_shift.cpp"
 - ".doc/ext/beeps/processor.cpp"
+- ".doc/ext/beeps/sequencer.cpp"
 - ".doc/ext/beeps/sound.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/envelope.cpp"
 - ".doc/ext/beeps/exception.cpp"
 - ".doc/ext/beeps/file_in.cpp"
 - ".doc/ext/beeps/gain.cpp"
@@ -70,6 +71,7 @@ files:
 - ".doc/ext/beeps/oscillator.cpp"
 - ".doc/ext/beeps/pitch_shift.cpp"
 - ".doc/ext/beeps/processor.cpp"
+- ".doc/ext/beeps/sequencer.cpp"
 - ".doc/ext/beeps/sound.cpp"
 - ".doc/ext/beeps/sound_player.cpp"
 - ".doc/ext/beeps/time_stretch.cpp"
@@ -80,14 +82,15 @@ files:
 - ChangeLog.md
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - VERSION
 - beeps.gemspec
-- ext/beeps/adsr.cpp
 - ext/beeps/analyser.cpp
 - ext/beeps/beeps.cpp
 - ext/beeps/defs.h
+- ext/beeps/envelope.cpp
 - ext/beeps/exception.cpp
 - ext/beeps/extconf.rb
 - ext/beeps/file_in.cpp
@@ -97,6 +100,7 @@ files:
 - ext/beeps/oscillator.cpp
 - ext/beeps/pitch_shift.cpp
 - ext/beeps/processor.cpp
+- ext/beeps/sequencer.cpp
 - ext/beeps/sound.cpp
 - ext/beeps/sound_player.cpp
 - ext/beeps/time_stretch.cpp
@@ -125,10 +129,10 @@ files:
 - lib/beeps/extension.rb
 - lib/beeps/processor.rb
 - lib/beeps/sound.rb
-- src/adsr.cpp
 - src/analyser.cpp
 - src/beeps.cpp
 - src/beeps.h
+- src/envelope.cpp
 - src/exception.cpp
 - src/file_in.cpp
 - src/gain.cpp
@@ -142,6 +146,7 @@ files:
 - src/pitch_shift.cpp
 - src/processor.cpp
 - src/processor.h
+- src/sequencer.cpp
 - src/signals.cpp
 - src/signals.h
 - src/sound.cpp