beeps 0.1.32 → 0.1.33

data/include/beeps/processor.h

@@ -4,6 +4,7 @@
 #define __BEEPS_PROCESSOR_H__
 
 
+#include <xot/ref.h>
 #include <xot/pimpl.h>
 #include <beeps/defs.h>
 
@@ -15,118 +16,86 @@ namespace Beeps
 	class Signals;
 
 
-	class Processor
+	class Processor : public Xot::RefCountable<>
 	{
 
-		public:
-
-			virtual ~Processor ();
-
-			virtual void process (Signals* signals);
-
-			virtual operator bool () const;
-
-			virtual bool operator ! () const;
-
-		protected:
-
-			Processor ();
-
-	};// Processor
-
-
-	class SineWave : public Processor
-	{
-
-		typedef Processor Super;
+		typedef Processor This;
 
 		public:
 
-			SineWave ();
+			class Context {};
 
-			virtual ~SineWave ();
+			typedef Xot::Ref<This> Ref;
 
-			virtual void set_frequency (float frequency);
+			virtual ~Processor ();
 
-			virtual float    frequency () const;
+			virtual void reset ();
 
-			virtual void process (Signals* signals);
+			virtual void         set_input (Processor* input);
 
-			struct Data;
+			virtual       Processor* input ();
 
-			Xot::PSharedImpl<Data> self;
-
-	};// SineWave
+			virtual const Processor* input () const;
 
+			virtual operator bool () const;
 
-	class SquareWave : public Processor
-	{
+			virtual bool operator ! () const;
 
-		typedef Processor Super;
+			struct Data;
 
-		public:
+			Xot::PImpl<Data> self;
 
-			SquareWave ();
+		protected:
 
-			virtual ~SquareWave ();
+			Processor (bool generator = false);
 
-			virtual void set_frequency (float frequency);
+			virtual void process (Context* context, Signals* signals, uint* offset) final;
 
-			virtual float    frequency () const;
+			virtual void generate (Context* context, Signals* signals, uint* offset);
 
-			virtual void process (Signals* signals);
+			virtual void filter (Context* context, Signals* signals, uint* offset);
 
-			struct Data;
+			virtual void set_updated ();
 
-			Xot::PSharedImpl<Data> self;
+			friend class ProcessorContext;
 
-	};// SquareWave
+	};// Processor
 
 
-	class SawtoothWave : public Processor
+	class Generator : public Processor
 	{
 
 		typedef Processor Super;
 
-		public:
-
-			SawtoothWave ();
-
-			virtual ~SawtoothWave ();
-
-			virtual void set_frequency (float frequency);
+		protected:
 
-			virtual float    frequency () const;
+			Generator ();
 
-			virtual void process (Signals* signals);
+		private:
 
-			struct Data;
+			void filter (
+				Context* context, Signals* signals, uint* offset) override final;
 
-			Xot::PSharedImpl<Data> self;
+	};// Generator
 
-	};// SawtoothWave
 
-
-	class FileIn : public Processor
+	class Filter : public Processor
 	{
 
 		typedef Processor Super;
 
-		public:
-
-			FileIn (const char* path = NULL);
+		protected:
 
-			virtual ~FileIn ();
+			Filter (Processor* input = NULL);
 
-			virtual void process (Signals* signals);
+			void set_buffering_seconds (float seconds);
 
-			virtual operator bool () const;
-
-			struct Data;
+		private:
 
-			Xot::PSharedImpl<Data> self;
+			void generate (
+				Context* context, Signals* signals, uint* offset) override final;
 
-	};// FileIn
+	};// Filter
 
 
 }// Beeps

data/include/beeps/ruby/filter.h

@@ -0,0 +1,78 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __BEEPS_RUBY_FILTER_H__
+#define __BEEPS_RUBY_FILTER_H__
+
+
+#include <rucy/class.h>
+#include <rucy/extension.h>
+#include <beeps/filter.h>
+
+
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Beeps::TimeStretch)
+
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Beeps::PitchShift)
+
+
+namespace Beeps
+{
+
+
+	Rucy::Class gain_class ();
+	// class Beeps::Gain
+
+	Rucy::Class adsr_class ();
+	// class Beeps::ADSR
+
+	Rucy::Class time_stretch_class ();
+	// class Beeps::TimeStretch
+
+	Rucy::Class pitch_shift_class ();
+	// class Beeps::PitchShift
+
+	Rucy::Class analyser_class ();
+	// class Beeps::Analyser
+
+
+}// Beeps
+
+
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Beeps::Gain> ()
+	{
+		return Beeps::gain_class();
+	}
+
+	template <> inline Class
+	get_ruby_class<Beeps::ADSR> ()
+	{
+		return Beeps::adsr_class();
+	}
+
+	template <> inline Class
+	get_ruby_class<Beeps::TimeStretch> ()
+	{
+		return Beeps::time_stretch_class();
+	}
+
+	template <> inline Class
+	get_ruby_class<Beeps::PitchShift> ()
+	{
+		return Beeps::pitch_shift_class();
+	}
+
+	template <> inline Class
+	get_ruby_class<Beeps::Analyser> ()
+	{
+		return Beeps::analyser_class();
+	}
+
+
+}// Rucy
+
+
+#endif//EOH

data/include/beeps/ruby/generator.h

@@ -0,0 +1,60 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __BEEPS_RUBY_GENERATOR_H__
+#define __BEEPS_RUBY_GENERATOR_H__
+
+
+#include <rucy/class.h>
+#include <rucy/extension.h>
+#include <beeps/generator.h>
+
+
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Beeps::Oscillator)
+
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Beeps::FileIn)
+
+
+namespace Beeps
+{
+
+
+	Rucy::Class oscillator_class ();
+	// class Beeps::Oscillator
+
+	Rucy::Class file_in_class ();
+	// class Beeps::FileIn
+
+	Rucy::Class mic_in_class ();
+	// class Beeps::MicIn
+
+
+}// Beeps
+
+
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Beeps::Oscillator> ()
+	{
+		return Beeps::oscillator_class();
+	}
+
+	template <> inline Class
+	get_ruby_class<Beeps::FileIn> ()
+	{
+		return Beeps::file_in_class();
+	}
+
+	template <> inline Class
+	get_ruby_class<Beeps::MicIn> ()
+	{
+		return Beeps::mic_in_class();
+	}
+
+
+}// Rucy
+
+
+#endif//EOH

data/include/beeps/ruby/processor.h

@@ -9,6 +9,9 @@
 #include <beeps/processor.h>
 
 
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Beeps::Processor)
+
+
 namespace Beeps
 {
 
@@ -16,33 +19,14 @@ namespace Beeps
 	Rucy::Class processor_class ();
 	// class Beeps::Processor
 
-	Rucy::Class sine_wave_class ();
-	// class Beeps::SineWave
-
-	Rucy::Class square_wave_class ();
-	// class Beeps::SineWave
-
-	Rucy::Class sawtooth_wave_class ();
-	// class Beeps::SawtoothWave
 
-	Rucy::Class file_in_class ();
-	// class Beeps::FileIn
+	template <typename T>
+	class RubyProcessor : public Rucy::ClassWrapper<T> {};
 
 
 }// Beeps
 
 
-RUCY_DECLARE_VALUE_FROM_TO(Beeps::Processor)
-
-RUCY_DECLARE_VALUE_FROM_TO(Beeps::SineWave)
-
-RUCY_DECLARE_VALUE_FROM_TO(Beeps::SquareWave)
-
-RUCY_DECLARE_VALUE_FROM_TO(Beeps::SawtoothWave)
-
-RUCY_DECLARE_VALUE_FROM_TO(Beeps::FileIn)
-
-
 namespace Rucy
 {
 
@@ -53,30 +37,6 @@ namespace Rucy
 		return Beeps::processor_class();
 	}
 
-	template <> inline Class
-	get_ruby_class<Beeps::SineWave> ()
-	{
-		return Beeps::sine_wave_class();
-	}
-
-	template <> inline Class
-	get_ruby_class<Beeps::SquareWave> ()
-	{
-		return Beeps::square_wave_class();
-	}
-
-	template <> inline Class
-	get_ruby_class<Beeps::SawtoothWave> ()
-	{
-		return Beeps::sawtooth_wave_class();
-	}
-
-	template <> inline Class
-	get_ruby_class<Beeps::FileIn> ()
-	{
-		return Beeps::file_in_class();
-	}
-
 
 }// Rucy
 

data/include/beeps/ruby/sound.h

@@ -9,10 +9,18 @@
 #include <beeps/sound.h>
 
 
+RUCY_DECLARE_VALUE_FROM_TO(Beeps::SoundPlayer)
+
+RUCY_DECLARE_VALUE_FROM_TO(Beeps::Sound)
+
+
 namespace Beeps
 {
 
 
+	Rucy::Class sound_player_class ();
+	// class Beeps::SoundPlayer
+
 	Rucy::Class sound_class ();
 	// class Beeps::Sound
 
@@ -20,13 +28,16 @@ namespace Beeps
 }// Beeps
 
 
-RUCY_DECLARE_VALUE_FROM_TO(Beeps::Sound)
-
-
 namespace Rucy
 {
 
 
+	template <> inline Class
+	get_ruby_class<Beeps::SoundPlayer> ()
+	{
+		return Beeps::sound_player_class();
+	}
+
 	template <> inline Class
 	get_ruby_class<Beeps::Sound> ()
 	{

data/include/beeps/signals.h

@@ -17,17 +17,23 @@ namespace Beeps
 
 		public:
 
-			Signals (float seconds = 1, uint channels = 1);
+			Signals ();
 
 			~Signals ();
 
 			Signals dup () const;
 
-			float seconds () const;
+			double sample_rate () const;
 
-			uint samples () const;
+			uint nchannels () const;
 
-			uint channels () const;
+			uint nsamples () const;
+
+			uint capacity () const;
+
+			bool empty () const;
+
+			const double* samples () const;
 
 			operator bool () const;
 

data/include/beeps/sound.h

@@ -15,6 +15,48 @@ namespace Beeps
 	class Processor;
 
 
+	class SoundPlayer
+	{
+
+		public:
+
+			SoundPlayer ();
+
+			~SoundPlayer ();
+
+			void play ();
+
+			void pause ();
+
+			void rewind ();
+
+			void stop ();
+
+			bool is_playing () const;
+
+			bool is_paused () const;
+
+			bool is_stopped () const;
+
+			void set_gain (float gain);
+
+			float    gain () const;
+
+			void set_loop (bool loop);
+
+			bool     loop () const;
+
+			operator bool () const;
+
+			bool operator ! () const;
+
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
+
+	};// SoundPlayer
+
+
 	class Sound
 	{
 
@@ -22,11 +64,29 @@ namespace Beeps
 
 			Sound ();
 
-			Sound (Processor* processor, float seconds);
+			Sound (
+				Processor* processor, float seconds,
+				uint nchannels = 1, double sample_rate = 0);
 
 			~Sound ();
 
-			void play ();
+			SoundPlayer play ();
+
+			void save (const char* path) const;
+
+			double sample_rate () const;
+
+			uint nchannels () const;
+
+			float seconds () const;
+
+			void set_gain (float gain);
+
+			float    gain () const;
+
+			void set_loop (bool loop);
+
+			bool     loop () const;
 
 			operator bool () const;
 
@@ -39,6 +99,11 @@ namespace Beeps
 	};// Sound
 
 
+	void stop_all_sound_players ();
+
+	Sound load_sound (const char* path);
+
+
 }// Beeps
 
 

data/lib/beeps/beeps.rb

@@ -35,10 +35,15 @@ module Beeps
       beep_sound(2).play
     end
 
+    def beep_processor=(processor)
+      @beep_processor = processor
+    end
+
     private
 
       def beep_sound(time)
-        Sound.new SquareWave.new, time
+        @beep_processor ||= Oscillator.new(:square)
+        Sound.new @beep_processor, time
       end
 
     self

data/lib/beeps/processor.rb

@@ -2,6 +2,7 @@
 
 
 require 'xot/setter'
+require 'xot/const_symbol_accessor'
 require 'xot/universal_accessor'
 require 'xot/block_util'
 require 'beeps/ext'
@@ -14,43 +15,122 @@ module Beeps
 
     include Xot::Setter
 
-    def initialize(options = nil, &block)
+    def initialize(**options, &block)
       super()
-      set options if options
+      set options unless options.empty?
       Xot::BlockUtil.instance_eval_or_block_call self, &block if block
     end
 
+    def >>(o)
+      o.input = self
+      o
+    end
+
+    def <<(o)
+      self.input = o
+      o
+    end
+
+    universal_accessor :input
+
   end# Processor
 
 
-  class SineWave
+  class Oscillator
+
+    const_symbol_accessor :type, **{
+      none:     NONE,
+      sine:     SINE,
+      triangle: TRIANGLE,
+      square:   SQUARE,
+      sawtooth: SAWTOOTH
+    }
+
+    def initialize(type = :sine, *args, **kwargs, &block)
+      super(*args, **kwargs, &block)
+      self.type = type
+    end
 
     alias freq= frequency=
     alias freq  frequency
 
-    universal_accessor :frequency, :freq
+    universal_accessor :type, :frequency, :freq
 
-  end# SineWave
+  end# Oscillator
 
 
-  class SquareWave
+  class FileIn
 
-    alias freq= frequency=
-    alias freq  frequency
+    def initialize(path = nil, *args, **kwargs, &block)
+      super(*args, **kwargs, &block)
+      self.path = path if path
+    end
 
-    universal_accessor :frequency, :freq
+    universal_accessor :path
 
-  end# SquareWave
+  end# FileIn
 
 
-  class SawtoothWave
+  class Gain
 
-    alias freq= frequency=
-    alias freq  frequency
+    universal_accessor :gain
+
+  end# Gain
+
+
+  class ADSR
+
+    def note_on(delay = 0)
+      note_on! delay
+    end
+
+    def note_off(delay = 0)
+      note_off! delay
+    end
+
+    universal_accessor :attack_time, :decay_time, :sustain_level, :release_time
+
+    alias  attack=  attack_time=
+    alias  attack   attack_time
+    alias   decay=   decay_time=
+    alias   decay    decay_time
+    alias sustain= sustain_level=
+    alias sustain  sustain_level
+    alias release= release_time=
+    alias release  release_time
+
+  end# ADSR
+
+
+  class TimeStretch
+
+    universal_accessor :scale
+
+  end# TimeStretch
+
+
+  class PitchShift
+
+    universal_accessor :shift
+
+  end# PitchShift
+
+
+  class Analyser
+
+    def each_signal(nsamples = fft_size, &block)
+      return enum_for(:each_signal, nsamples) unless block
+      each_signal!(nsamples, &block)
+    end
+
+    def each_spectrum(&block)
+      return enum_for(:each_spectrum) unless block
+      each_spectrum!(&block)
+    end
 
-    universal_accessor :frequency, :freq
+    universal_accessor :fft_size
 
-  end# SawtoothWave
+  end# Analyser
 
 
 end# Beeps