beeps 0.2.1 → 0.3.1

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/ext/beeps/sound.cpp

@@ -4,7 +4,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_FROM_TO(Beeps::Sound)
+RUCY_DEFINE_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Sound)
 
 #define THIS  to<Beeps::Sound*>(self)
 

data/ext/beeps/sound_player.cpp

@@ -4,7 +4,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_FROM_TO(Beeps::SoundPlayer)
+RUCY_DEFINE_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::SoundPlayer)
 
 #define THIS  to<Beeps::SoundPlayer*>(self)
 

data/ext/beeps/time_stretch.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::TimeStretch)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::TimeStretch)
 
 #define THIS  to<Beeps::TimeStretch*>(self)
 

data/include/beeps/defs.h

@@ -8,6 +8,13 @@
 #include <xot/string.h>
 
 
+#if defined(WIN32) && defined(GCC) && defined(BEEPS)
+	#define BEEPS_EXPORT __declspec(dllexport)
+#else
+	#define BEEPS_EXPORT
+#endif
+
+
 namespace 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/beeps.h

@@ -12,7 +12,7 @@ namespace Beeps
 {
 
 
-	Rucy::Module beeps_module ();
+	BEEPS_EXPORT Rucy::Module beeps_module ();
 	// module Beeps
 
 

data/include/beeps/ruby/exception.h

@@ -12,10 +12,10 @@ namespace Beeps
 {
 
 
-	Rucy::Class beeps_error_class ();
+	BEEPS_EXPORT Rucy::Class beeps_error_class ();
 	// class Beeps::BeepsError
 
-	Rucy::Class openal_error_class ();
+	BEEPS_EXPORT Rucy::Class openal_error_class ();
 	// class Beeps::OpenALError
 
 

data/include/beeps/ruby/filter.h

@@ -9,28 +9,34 @@
 #include <beeps/filter.h>
 
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Beeps::TimeStretch)
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Gain)
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Beeps::PitchShift)
+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
 {
 
 
-	Rucy::Class gain_class ();
+	BEEPS_EXPORT Rucy::Class gain_class ();
 	// class Beeps::Gain
 
-	Rucy::Class adsr_class ();
-	// class Beeps::ADSR
+	BEEPS_EXPORT Rucy::Class envelope_class ();
+	// class Beeps::Envelope
 
-	Rucy::Class time_stretch_class ();
+	BEEPS_EXPORT Rucy::Class time_stretch_class ();
 	// class Beeps::TimeStretch
 
-	Rucy::Class pitch_shift_class ();
+	BEEPS_EXPORT Rucy::Class pitch_shift_class ();
 	// class Beeps::PitchShift
 
-	Rucy::Class analyser_class ();
+	BEEPS_EXPORT Rucy::Class analyser_class ();
 	// class Beeps::Analyser
 
 
@@ -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

@@ -9,22 +9,29 @@
 #include <beeps/generator.h>
 
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Beeps::Oscillator)
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Oscillator)
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Beeps::FileIn)
+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
 {
 
 
-	Rucy::Class oscillator_class ();
+	BEEPS_EXPORT Rucy::Class oscillator_class ();
 	// class Beeps::Oscillator
 
-	Rucy::Class file_in_class ();
+	BEEPS_EXPORT Rucy::Class sequencer_class ();
+	// class Beeps::Sequencer
+
+	BEEPS_EXPORT Rucy::Class file_in_class ();
 	// class Beeps::FileIn
 
-	Rucy::Class mic_in_class ();
+	BEEPS_EXPORT Rucy::Class mic_in_class ();
 	// class Beeps::MicIn
 
 
@@ -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/include/beeps/ruby/processor.h

@@ -9,14 +9,14 @@
 #include <beeps/processor.h>
 
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Beeps::Processor)
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Processor)
 
 
 namespace Beeps
 {
 
 
-	Rucy::Class processor_class ();
+	BEEPS_EXPORT Rucy::Class processor_class ();
 	// class Beeps::Processor
 
 

data/include/beeps/ruby/sound.h

@@ -9,19 +9,19 @@
 #include <beeps/sound.h>
 
 
-RUCY_DECLARE_VALUE_FROM_TO(Beeps::SoundPlayer)
+RUCY_DECLARE_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::SoundPlayer)
 
-RUCY_DECLARE_VALUE_FROM_TO(Beeps::Sound)
+RUCY_DECLARE_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Sound)
 
 
 namespace Beeps
 {
 
 
-	Rucy::Class sound_player_class ();
+	BEEPS_EXPORT Rucy::Class sound_player_class ();
 	// class Beeps::SoundPlayer
 
-	Rucy::Class sound_class ();
+	BEEPS_EXPORT Rucy::Class sound_class ();
 	// class Beeps::Sound
 
 

data/lib/beeps/extension.rb

@@ -25,6 +25,10 @@ module Beeps
       root_dir 'lib'
     end
 
+    def ext_dir()
+      root_dir 'ext'
+    end
+
   end# Extension
 
 

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

data/src/beeps.cpp

@@ -1,5 +1,5 @@
 // -*- objc -*-
-#include "beeps/beeps.h"
+#include "beeps.h"
 
 
 #include "Stk.h"
@@ -16,6 +16,7 @@ namespace Beeps
 	void
 	init ()
 	{
+		Beeps_init();
 		OpenAL_init();
 
 		stk::Stk::setSampleRate(44100);
@@ -28,6 +29,7 @@ namespace Beeps
 		SoundPlayer_clear_streams();
 
 		OpenAL_fin();
+		Beeps_fin();
 	}
 
 	void

data/src/beeps.h

@@ -0,0 +1,22 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __BEEPS_SRC_BEEPS_H__
+#define __BEEPS_SRC_BEEPS_H__
+
+
+#include "beeps/beeps.h"
+
+
+namespace Beeps
+{
+
+
+	void Beeps_init ();
+
+	void Beeps_fin ();
+
+
+}// Beeps
+
+
+#endif//EOH

data/src/{adsr.cpp → envelope.cpp}

@@ -3,6 +3,7 @@
 
 #include <assert.h>
 #include <ADSR.h>
+#include "beeps/debug.h"
 #include "signals.h"
 
 
@@ -10,7 +11,7 @@ namespace Beeps
 {
 
 
-	struct ADSR::Data
+	struct Envelope::Data
 	{
 
 		stk::ADSR adsr;
@@ -29,21 +30,21 @@ namespace Beeps
 			adsr.setReleaseTime( release_time == 0 ? 0.01 : release_time);
 		}
 
-	};// ADSR::Data
+	};// Envelope::Data
 
 
-	ADSR::ADSR (Processor* input)
+	Envelope::Envelope (Processor* input)
 	:	Super(input)
 	{
 		self->update_envelope();
 	}
 
-	ADSR::~ADSR ()
+	Envelope::~Envelope ()
 	{
 	}
 
 	void
-	ADSR::note_on (float delay)
+	Envelope::note_on (float delay)
 	{
 		if (delay < 0)
 			argument_error(__FILE__, __LINE__);
@@ -58,7 +59,7 @@ namespace Beeps
 	}
 
 	void
-	ADSR::note_off (float delay)
+	Envelope::note_off (float delay)
 	{
 		if (delay < 0)
 			argument_error(__FILE__, __LINE__);
@@ -73,7 +74,7 @@ namespace Beeps
 	}
 
 	void
-	ADSR::set_attack_time (float time)
+	Envelope::set_attack_time (float time)
 	{
 		if (time < 0)
 			argument_error(__FILE__, __LINE__);
@@ -85,13 +86,13 @@ namespace Beeps
 	}
 
 	float
-	ADSR::attack_time () const
+	Envelope::attack_time () const
 	{
 		return self->attack_time;
 	}
 
 	void
-	ADSR::set_decay_time (float time)
+	Envelope::set_decay_time (float time)
 	{
 		if (time < 0)
 			argument_error(__FILE__, __LINE__);
@@ -103,13 +104,13 @@ namespace Beeps
 	}
 
 	float
-	ADSR::decay_time () const
+	Envelope::decay_time () const
 	{
 		return self->decay_time;
 	}
 
 	void
-	ADSR::set_sustain_level (float level)
+	Envelope::set_sustain_level (float level)
 	{
 		if (level < 0)
 			argument_error(__FILE__, __LINE__);
@@ -121,13 +122,13 @@ namespace Beeps
 	}
 
 	float
-	ADSR::sustain_level () const
+	Envelope::sustain_level () const
 	{
 		return self->sustain_level;
 	}
 
 	void
-	ADSR::set_release_time (float time)
+	Envelope::set_release_time (float time)
 	{
 		if (time < 0)
 			argument_error(__FILE__, __LINE__);
@@ -139,7 +140,7 @@ namespace Beeps
 	}
 
 	float
-	ADSR::release_time () const
+	Envelope::release_time () const
 	{
 		return self->release_time;
 	}
@@ -157,11 +158,11 @@ namespace Beeps
 	}
 
 	static void
-	process_envelope_signals (ADSR* adsr, Signals* signals)
+	process_envelope_signals (Envelope* envelope, Signals* signals)
 	{
-		assert(adsr && signals && signals->nchannels() == 1);
+		assert(envelope && signals && signals->nchannels() == 1);
 
-		ADSR::Data* self = adsr->self.get();
+		Envelope::Data* self = envelope->self.get();
 
 		Frames* frames = Signals_get_frames(signals);
 		assert(frames);
@@ -214,7 +215,7 @@ namespace Beeps
 	}
 
 	void
-	ADSR::filter (Context* context, Signals* signals, uint* offset)
+	Envelope::filter (Context* context, Signals* signals, uint* offset)
 	{
 		Super::filter(context, signals, offset);
 
@@ -228,10 +229,10 @@ namespace Beeps
 			Signals_resize(&self->adsr_signals, signals->nsamples(), 0);
 
 		process_envelope_signals(this, &self->adsr_signals);
-		Signals_apply(signals, self->adsr_signals);
+		Signals_multiply(signals, self->adsr_signals);
 	}
 
-	ADSR::operator bool () const
+	Envelope::operator bool () const
 	{
 		if (!Super::operator bool()) return false;
 		return

data/src/openal.cpp

@@ -42,7 +42,9 @@ namespace Beeps
 	void
 	OpenAL_init ()
 	{
-		if (global::device || global::context)
+		if (global::device)
+			beeps_error(__FILE__, __LINE__, "already initialized.");
+		if (global::context)
 			beeps_error(__FILE__, __LINE__, "already initialized.");
 
 		global::device = alcOpenDevice(NULL);