beeps 0.3.6 → 0.3.7

data/include/beeps/filter.h

@@ -27,13 +27,15 @@ namespace Beeps
 
 			virtual float    gain () const;
 
-			virtual void filter (
-				Context* context, Signals* signals, uint* offset) override;
-
 			struct Data;
 
 			Xot::PImpl<Data> self;
 
+		protected:
+
+			virtual void filter (
+				Context* context, Signals* signals, uint* offset) override;
+
 	};// Gain
 
 
@@ -66,15 +68,17 @@ namespace Beeps
 
 			virtual const_iterator end () const;
 
-			virtual void filter (
-				Context* context, Signals* signals, uint* offset) override;
-
 			virtual operator bool () const override;
 
 			struct Data;
 
 			Xot::PImpl<Data> self;
 
+		protected:
+
+			virtual void filter (
+				Context* context, Signals* signals, uint* offset) override;
+
 	};// Mixer
 
 
@@ -109,16 +113,107 @@ namespace Beeps
 
 			virtual float    release_time () const;
 
+			virtual operator bool () const override;
+
+			struct Data;
+
+			Xot::PImpl<Data> self;
+
+		protected:
+
 			virtual void filter (
 				Context* context, Signals* signals, uint* offset) override;
 
-			virtual operator bool () const override;
+	};// Envelope
+
+
+	class LowPass : public Filter
+	{
+
+		typedef Filter Super;
+
+		public:
+
+			LowPass (Processor* input = NULL);
+
+			virtual ~LowPass ();
+
+			virtual void set_cutoff_frequency  (float frequency);
+
+			virtual float    cutoff_frequency () const;
 
 			struct Data;
 
 			Xot::PImpl<Data> self;
 
-	};// Envelope
+		protected:
+
+			virtual void filter (
+				Context* context, Signals* signals, uint* offset) override;
+
+	};// LowPass
+
+
+	class HighPass : public Filter
+	{
+
+		typedef Filter Super;
+
+		public:
+
+			HighPass (Processor* input = NULL);
+
+			virtual ~HighPass ();
+
+			virtual void set_cutoff_frequency  (float frequency);
+
+			virtual float    cutoff_frequency () const;
+
+			struct Data;
+
+			Xot::PImpl<Data> self;
+
+		protected:
+
+			virtual void filter (
+				Context* context, Signals* signals, uint* offset) override;
+
+	};// HighPass
+
+
+	class Reverb : public Filter
+	{
+
+		typedef Filter Super;
+
+		public:
+
+			Reverb (Processor* input = NULL);
+
+			virtual ~Reverb ();
+
+			virtual void set_mix (float mix);
+
+			virtual float    mix () const;
+
+			virtual void set_room_size (float frequency);
+
+			virtual float    room_size () const;
+
+			virtual void set_damping (float damping);
+
+			virtual float    damping () const;
+
+			struct Data;
+
+			Xot::PImpl<Data> self;
+
+		protected:
+
+			virtual void filter (
+				Context* context, Signals* signals, uint* offset) override;
+
+	};// Reverb
 
 
 	class TimeStretch : public Filter
@@ -138,15 +233,17 @@ namespace Beeps
 
 			virtual float    scale () const;
 
-			virtual void filter (
-				Context* context, Signals* signals, uint* offset) override;
-
 			virtual operator bool () const override;
 
 			struct Data;
 
 			Xot::PImpl<Data> self;
 
+		protected:
+
+			virtual void filter (
+				Context* context, Signals* signals, uint* offset) override;
+
 	};// TimeStretch
 
 
@@ -167,15 +264,17 @@ namespace Beeps
 
 			virtual float    shift () const;
 
-			virtual void filter (
-				Context* context, Signals* signals, uint* offset) override;
-
 			virtual operator bool () const override;
 
 			struct Data;
 
 			Xot::PImpl<Data> self;
 
+		protected:
+
+			virtual void filter (
+				Context* context, Signals* signals, uint* offset) override;
+
 	};// PitchShift
 
 
@@ -202,15 +301,17 @@ namespace Beeps
 
 			virtual const Spectrum& spectrum () const;
 
-			virtual void filter (
-				Context* context, Signals* signals, uint* offset) override;
-
 			virtual operator bool () const override;
 
 			struct Data;
 
 			Xot::PImpl<Data> self;
 
+		protected:
+
+			virtual void filter (
+				Context* context, Signals* signals, uint* offset) override;
+
 	};// Analyser
 
 

data/include/beeps/generator.h

@@ -25,7 +25,7 @@ namespace Beeps
 
 			Oscillator (Type type = SINE);
 
-			Oscillator (float* samples, size_t size);
+			Oscillator (const Sample* samples, size_t size);
 
 			virtual ~Oscillator ();
 
@@ -35,22 +35,41 @@ namespace Beeps
 
 			virtual Type     type () const;
 
-			virtual void     set_samples (float* samples, size_t size);
+			virtual void      set_samples (const Sample* samples, size_t size);
 
-			virtual const float* samples () const;
+			virtual const Sample* samples () const;
 
-			virtual size_t      nsamples () const;
+			virtual size_t       nsamples () const;
 
-			virtual void set_frequency (float frequency);
+			virtual void set_frequency (float      frequency);
+
+			virtual void set_frequency (Processor* frequency);
 
 			virtual float    frequency () const;
 
-			virtual void set_phase (float phase);
+			virtual void set_phase (float      phase);
+
+			virtual void set_phase (Processor* phase);
 
 			virtual float    phase () const;
 
-			virtual void generate (
-				Context* context, Signals* signals, uint* offset) override;
+			virtual void set_gain (float      gain);
+
+			virtual void set_gain (Processor* gain);
+
+			virtual float    gain () const;
+
+			virtual void set_offset (float      offset);
+
+			virtual void set_offset (Processor* offset);
+
+			virtual float    offset () const;
+
+			virtual void set_duty (float      duty);
+
+			virtual void set_duty (Processor* duty);
+
+			virtual float    duty () const;
 
 			virtual operator bool () const override;
 
@@ -58,6 +77,14 @@ namespace Beeps
 
 			Xot::PImpl<Data> self;
 
+		protected:
+
+			virtual void generate (
+				Context* context, Signals* signals, uint* offset) override;
+
+			virtual int max_segment_size_for_process (
+				double sample_rate, uint nsamples) const override;
+
 	};// Oscillator
 
 
@@ -80,15 +107,17 @@ namespace Beeps
 
 			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;
 
+		protected:
+
+			virtual void generate (
+				Context* context, Signals* signals, uint* offset) override;
+
 	};// Sequencer
 
 
@@ -117,15 +146,17 @@ namespace Beeps
 
 			virtual float seconds () const;
 
-			virtual void generate (
-				Context* context, Signals* signals, uint* offset) override;
-
 			virtual operator bool () const override;
 
 			struct Data;
 
 			Xot::PImpl<Data> self;
 
+		protected:
+
+			virtual void generate (
+				Context* context, Signals* signals, uint* offset) override;
+
 	};// FileIn
 
 
@@ -148,15 +179,17 @@ namespace Beeps
 
 			virtual uint nchannels () const;
 
-			virtual void generate (
-				Context* context, Signals* signals, uint* offset) override;
-
 			virtual operator bool () const override;
 
 			struct Data;
 
 			Xot::PImpl<Data> self;
 
+		protected:
+
+			virtual void generate (
+				Context* context, Signals* signals, uint* offset) override;
+
 	};// MicIn
 
 

data/include/beeps/processor.h

@@ -4,18 +4,17 @@
 #define __BEEPS_PROCESSOR_H__
 
 
+#include <map>
 #include <xot/ref.h>
 #include <xot/pimpl.h>
 #include <beeps/defs.h>
+#include <beeps/signals.h>
 
 
 namespace Beeps
 {
 
 
-	class Signals;
-
-
 	class Processor : public Xot::RefCountable<>
 	{
 
@@ -25,7 +24,9 @@ namespace Beeps
 
 			class Context {};
 
-			typedef Xot::Ref<This> Ref;
+			typedef Xot::Ref<This>     Ref;
+
+			typedef std::map<uint, Ref> Map;
 
 			virtual ~Processor ();
 
@@ -51,11 +52,22 @@ namespace Beeps
 
 			Processor (bool generator = false);
 
-			virtual void process (Context* context, Signals* signals, uint* offset) final;
+			virtual void process  (Context* context, Signals* signals, uint* offset) final;
 
 			virtual void generate (Context* context, Signals* signals, uint* offset);
 
-			virtual void filter (Context* context, Signals* signals, uint* offset);
+			virtual void filter   (Context* context, Signals* signals, uint* offset);
+
+			virtual int  max_segment_size_for_process (
+				double sample_rate, uint nsamples) const;
+
+			virtual uint get_segment_size (double sample_rate, uint nsamples) const;
+
+			virtual void   set_sub_input (uint index, Processor* input);
+
+			virtual Processor* sub_input (uint index) const;
+
+			virtual void clear_sub_input_unless_processing (uint index);
 
 			virtual void set_updated ();
 
@@ -100,6 +112,11 @@ namespace Beeps
 	};// Filter
 
 
+	Signals get_signals (
+		Processor* processor, float seconds,
+		uint nchannels = 1, double sample_rate = 0);
+
+
 }// Beeps
 
 

data/include/beeps/ruby/filter.h

@@ -15,6 +15,12 @@ RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Mixer)
 
 RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Envelope)
 
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps:: LowPass)
+
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::HighPass)
+
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Reverb)
+
 RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::TimeStretch)
 
 RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::PitchShift)
@@ -35,6 +41,15 @@ namespace Beeps
 	BEEPS_EXPORT Rucy::Class envelope_class ();
 	// class Beeps::Envelope
 
+	BEEPS_EXPORT Rucy::Class  low_pass_class ();
+	// class Beeps:: LowPass
+
+	BEEPS_EXPORT Rucy::Class high_pass_class ();
+	// class Beeps::HighPass
+
+	BEEPS_EXPORT Rucy::Class reverb_class ();
+	// class Beeps::Reverb
+
 	BEEPS_EXPORT Rucy::Class time_stretch_class ();
 	// class Beeps::TimeStretch
 
@@ -70,6 +85,24 @@ namespace Rucy
 		return Beeps::envelope_class();
 	}
 
+	template <> inline Class
+	get_ruby_class<Beeps::LowPass> ()
+	{
+		return Beeps::low_pass_class();
+	}
+
+	template <> inline Class
+	get_ruby_class<Beeps::HighPass> ()
+	{
+		return Beeps::high_pass_class();
+	}
+
+	template <> inline Class
+	get_ruby_class<Beeps::Reverb> ()
+	{
+		return Beeps::reverb_class();
+	}
+
 	template <> inline Class
 	get_ruby_class<Beeps::TimeStretch> ()
 	{

data/include/beeps/ruby/signals.h

@@ -0,0 +1,40 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __BEEPS_RUBY_SIGNALS_H__
+#define __BEEPS_RUBY_SIGNALS_H__
+
+
+#include <rucy/class.h>
+#include <rucy/extension.h>
+#include <beeps/signals.h>
+
+
+RUCY_DECLARE_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Signals)
+
+
+namespace Beeps
+{
+
+
+	BEEPS_EXPORT Rucy::Class signals_class ();
+	// class Beeps::Signals
+
+
+}// Beeps
+
+
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Beeps::Signals> ()
+	{
+		return Beeps::signals_class();
+	}
+
+
+}// Rucy
+
+
+#endif//EOH

data/include/beeps/signals.h

@@ -33,7 +33,7 @@ namespace Beeps
 
 			bool empty () const;
 
-			const double* samples () const;
+			const Sample* samples () const;
 
 			operator bool () const;
 

data/lib/beeps/processor.rb

@@ -38,6 +38,10 @@ module Beeps
     #  self
     #end
 
+    def self.get_signals(processor, seconds: 1, nchannels: 1, sample_rate: 0)
+      get_signals! processor, seconds, nchannels, sample_rate
+    end
+
   end# Processor
 
 
@@ -64,7 +68,7 @@ module Beeps
       end
     end
 
-    universal_accessor :type, :frequency, :phase
+    universal_accessor :type, :frequency, :phase, :gain, :offset, :duty
 
     alias freq= frequency=
     alias freq  frequency
@@ -119,6 +123,8 @@ module Beeps
 
     alias each each_input
 
+    alias inputs to_a
+
   end# Mixer
 
 
@@ -158,6 +164,45 @@ module Beeps
   end# Envelope
 
 
+  class LowPass
+
+    def initialize(cutoff = nil, **kwargs, &block)
+      super(**kwargs, &block)
+
+      self.cutoff = cutoff if cutoff
+    end
+
+    universal_accessor :cutoff_frequency
+
+    alias cutoff= cutoff_frequency=
+    alias cutoff  cutoff_frequency
+
+  end# LowPass
+
+
+  class HighPass
+
+    def initialize(cutoff = nil, **kwargs, &block)
+      super(**kwargs, &block)
+
+      self.cutoff = cutoff if cutoff
+    end
+
+    universal_accessor :cutoff_frequency
+
+    alias cutoff= cutoff_frequency=
+    alias cutoff  cutoff_frequency
+
+  end# HighPass
+
+
+  class Reverb
+
+    universal_accessor :mix, :room_size, :damping
+
+  end# Reverb
+
+
   class TimeStretch
 
     universal_accessor :scale

data/lib/beeps/signals.rb

@@ -0,0 +1,19 @@
+require 'beeps/ext'
+
+
+module Beeps
+
+
+  class Signals
+
+    include Enumerable
+
+    def each(channel: nil, &block)
+      return enum_for(:each, channel: channel) unless block
+      each! channel, &block
+    end
+
+  end# Signals
+
+
+end# Beeps

data/lib/beeps.rb

@@ -2,5 +2,6 @@ require 'beeps/autoinit'
 require 'beeps/extension'
 
 require 'beeps/beeps'
+require 'beeps/signals'
 require 'beeps/processor'
 require 'beeps/sound'