beeps 0.1.12 → 0.1.13

data/include/beeps/signals.h

@@ -8,9 +8,6 @@
 #include <beeps/defs.h>
 
 
-namespace stk {class StkFrames;};
-
-
 namespace Beeps
 {
 
@@ -24,7 +21,7 @@ namespace Beeps
 
 			~Signals ();
 
-			Signals copy () const;
+			Signals dup () const;
 
 			float seconds () const;
 
@@ -32,17 +29,13 @@ namespace Beeps
 
 			uint channels () const;
 
-			      stk::StkFrames* frames ();
-
-			const stk::StkFrames* frames () const;
-
 			operator bool () const;
 
 			bool operator ! () const;
 
 			struct Data;
 
-			Xot::PImpl<Data, true> self;
+			Xot::PSharedImpl<Data> self;
 
 	};// Signals
 

data/include/beeps/sound.h

@@ -5,6 +5,7 @@
 
 
 #include <xot/pimpl.h>
+#include <beeps/defs.h>
 
 
 namespace Beeps
@@ -33,7 +34,7 @@ namespace Beeps
 
 			struct Data;
 
-			Xot::PImpl<Data, true> self;
+			Xot::PSharedImpl<Data> self;
 
 	};// Sound
 

data/lib/beeps/module.rb

@@ -6,6 +6,8 @@ module Beeps
 
   module Module
 
+    module_function
+
     def name ()
       super.split('::')[-2]
     end
@@ -15,10 +17,10 @@ module Beeps
     end
 
     def root_dir (path = '')
-      File.expand_path "../../../#{path}", __FILE__
+      File.expand_path "../../#{path}", __dir__
     end
 
-    def include_dir ()
+    def inc_dir ()
       root_dir 'include'
     end
 
@@ -26,23 +28,6 @@ module Beeps
       root_dir 'lib'
     end
 
-    def task_dir ()
-      root_dir 'task'
-    end
-
-    def load_tasks (*names)
-      if names.empty?
-        Dir["#{task_dir}/**/*.rake"].each {|path| load path}
-      else
-        names.each do |name|
-          path = "#{task_dir}/#{name}.rake"
-          load path if File.exist? path
-        end
-      end
-    end
-
-    extend self
-
   end# Module
 
 

data/lib/beeps/processor.rb

@@ -2,6 +2,7 @@
 
 
 require 'xot/setter'
+require 'xot/universal_accessor'
 require 'xot/block_util'
 require 'beeps/ext'
 
@@ -9,50 +10,45 @@ require 'beeps/ext'
 module Beeps
 
 
-  class SineWave
+  class Processor
 
     include Xot::Setter
 
-    alias freq= frequency=
-    alias freq  frequency
-
-    def initialize (opts = {}, &block)
+    def initialize (options = nil, &block)
       super()
-      set opts
+      set options if options
       Xot::BlockUtil.instance_eval_or_block_call self, &block if block
     end
 
+  end# Processor
+
+
+  class SineWave
+
+    alias freq= frequency=
+    alias freq  frequency
+
+    universal_accessor :frequency, :freq
+
   end# SineWave
 
 
   class SquareWave
 
-    include Xot::Setter
-
     alias freq= frequency=
     alias freq  frequency
 
-    def initialize (opts = {}, &block)
-      super()
-      set opts
-      Xot::BlockUtil.instance_eval_or_block_call self, &block if block
-    end
+    universal_accessor :frequency, :freq
 
   end# SquareWave
 
 
   class SawtoothWave
 
-    include Xot::Setter
-
     alias freq= frequency=
     alias freq  frequency
 
-    def initialize (opts = {}, &block)
-      super()
-      set opts
-      Xot::BlockUtil.instance_eval_or_block_call self, &block if block
-    end
+    universal_accessor :frequency, :freq
 
   end# SawtoothWave
 

data/src/beeps.cpp

@@ -2,90 +2,29 @@
 #include "beeps/beeps.h"
 
 
-#include <stdlib.h>
 #include "Stk.h"
-#include "beeps/openal.h"
 #include "beeps/exception.h"
+#include "openal.h"
 
 
 namespace Beeps
 {
 
 
-	namespace global
-	{
-
-		static ALCdevice* device   = NULL;
-
-		static ALCcontext* context = NULL;
-
-	}// global
-
-
-	namespace g = global;
-
-
-	static void
-	cleanup ()
-	{
-		void cleanup_sources ();
-		cleanup_sources();
-
-		alcMakeContextCurrent(NULL);
-
-		if (g::context)
-		{
-			alcDestroyContext(g::context);
-			g::context = NULL;
-		}
-
-		if (g::device)
-		{
-			alcCloseDevice(g::device);
-			g::device = NULL;
-		}
-	}
-
 	void
 	init ()
 	{
-		if (g::device || g::context)
-			beeps_error(__FILE__, __LINE__, "Beeps::init(): already initialized.");
+		OpenAL_init();
 
 		stk::Stk::setSampleRate(44100);
-
-		g::device = alcOpenDevice(NULL);
-		if (!g::device) goto FAILED;
-
-		g::context = alcCreateContext(g::device, NULL);
-		if (!g::context) goto FAILED;
-
-		if (!alcMakeContextCurrent(g::context))
-			goto FAILED;
-
-		return;
-
-	FAILED:
-		cleanup();
-		openal_error(__FILE__, __LINE__, "failed to setup OpenAL.");
 	}
 
 	void
 	fin ()
 	{
-		if (!g::context)
-			beeps_error(__FILE__, __LINE__, "Beeps::fin(): not initialized.");
-
-		cleanup();
-	}
-
-	ALCdevice*
-	get_device ()
-	{
-		return g::device;
+		OpenAL_fin();
 	}
 
-
 	uint
 	sampling_rate ()
 	{

data/src/exception.cpp

@@ -1,9 +1,6 @@
 #include "beeps/exception.h"
 
 
-#include <xot/string.h>
-
-
 namespace Beeps
 {
 

data/src/openal.cpp

@@ -1,221 +1,110 @@
-#include "beeps/openal.h"
-
-
-#include <vector>
-#include <xot/debug.h>
-#include "beeps/defs.h"
-#include "beeps/sound.h"
-#include "beeps/exception.h"
 #include "openal.h"
 
 
-#if 0
-#define LOG(...) doutln(__VA_ARGS__)
-#else
-#define LOG(...)
-#endif
+#include "beeps/exception.h"
+#include "beeps/debug.h"
+#include "sound.h"
 
 
 namespace Beeps
 {
 
 
-	ALCdevice* get_device ();
-
-
-	ALCenum
-	get_error ()
-	{
-		return alcGetError(get_device());
-	}
-
-	bool
-	no_error ()
+	namespace global
 	{
-		return get_error() == ALC_NO_ERROR;
-	}
 
-	bool
-	is_error (ALCenum err)
-	{
-		return get_error() == err;
-	}
-
-	static String
-	get_error_name (ALenum error)
-	{
-		switch (error)
-		{
-			case ALC_NO_ERROR:        return "ALC_NO_ERROR";
-			case ALC_INVALID_DEVICE:  return "ALC_INVALID_DEVICE";
-			case ALC_INVALID_CONTEXT: return "ALC_INVALID_CONTEXT";
-			case ALC_INVALID_ENUM:    return "ALC_INVALID_ENUM";
-			case ALC_OUT_OF_MEMORY:   return "ALC_OUT_OF_MEMORY";
-		}
-		return "UNKNOWN ERROR";
-	}
+		static ALCdevice* device   = NULL;
 
-	void
-	check_error (const char* file, int line)
-	{
-		ALCenum e = get_error();
-		if (e != ALC_NO_ERROR)
-			openal_error(file, line, "OpenAL error %s", get_error_name(e).c_str());
-	}
+		static ALCcontext* context = NULL;
 
-	void
-	clear_error ()
-	{
-		get_error();
-	}
+	}// global
 
 
-	struct SoundSource
+	static void
+	cleanup ()
 	{
+		Sound_cleanup_sources();
 
-		typedef SoundSource This;
-
-		typedef boost::shared_ptr<This> Ptr;
-
-		ALint id;
+		alcMakeContextCurrent(NULL);
 
-		static Ptr create ()
+		if (global::context)
 		{
-			ALuint id_;
-			alGenSources(1, &id_);
-			if (!no_error()) return Ptr();
-
-			This* p = new This;
-			p->id = id_;
-			return Ptr(p);
+			alcDestroyContext(global::context);
+			global::context = NULL;
 		}
 
-		SoundSource ()
-		:	id(-1)
+		if (global::device)
 		{
+			alcCloseDevice(global::device);
+			global::device = NULL;
 		}
+	}
 
-		~SoundSource ()
-		{
-			if (!*this) return;
-
-			ALuint id_ = id;
-			alDeleteSources(1, &id_);
-			check_error(__FILE__, __LINE__);
-		}
-
-		void play (const Sound& sound)
-		{
-			if (!sound)
-				argument_error(__FILE__, __LINE__);
-
-			if (!*this)
-				invalid_state_error(__FILE__, __LINE__);
-
-			alSourcei(id, AL_BUFFER, get_sound_buffer_id(sound));
-			alSourcePlay(id);
-			check_error(__FILE__, __LINE__);
-		}
-
-		void stop ()
-		{
-			if (!*this)
-				invalid_state_error(__FILE__, __LINE__);
-
-			alSourceStop(id);
-			check_error(__FILE__, __LINE__);
-		}
+	void
+	OpenAL_init ()
+	{
+		if (global::device || global::context)
+			beeps_error(__FILE__, __LINE__, "already initialized.");
 
-		bool is_playing () const
-		{
-			if (!*this) return false;
+		global::device = alcOpenDevice(NULL);
+		if (!global::device) goto FAILED;
 
-			ALint state = 0;
-			alGetSourcei(id, AL_SOURCE_STATE, &state);
-			check_error(__FILE__, __LINE__);
+		global::context = alcCreateContext(global::device, NULL);
+		if (!global::context) goto FAILED;
 
-			return state == AL_PLAYING;
-		}
+		if (!alcMakeContextCurrent(global::context))
+			goto FAILED;
 
-		operator bool () const
-		{
-			return id >= 0;
-		}
+		return;
 
-		bool operator ! () const
-		{
-			return !operator bool();
-		}
-
-	};// SoundSource
+	FAILED:
+		cleanup();
+		openal_error(__FILE__, __LINE__, "failed to initialize OpenAL.");
+	}
 
+	void
+	OpenAL_fin ()
+	{
+		if (!global::context)
+			beeps_error(__FILE__, __LINE__, "not initialized.");
 
-	typedef std::vector<SoundSource::Ptr> SoundSourceList;
+		cleanup();
+	}
 
-	static SoundSourceList sources;
+	ALCenum
+	OpenAL_get_error ()
+	{
+		assert(global::device);
 
+		return alcGetError(global::device);
+	}
 
-	void
-	cleanup_sources ()
+	bool
+	OpenAL_no_error ()
 	{
-		sources.clear();
+		return OpenAL_get_error() == ALC_NO_ERROR;
 	}
 
-	static SoundSource*
-	next_source ()
+	static String
+	get_error_name (ALenum error)
 	{
-		SoundSource::Ptr source;
-		for (SoundSourceList::iterator it = sources.begin(); it != sources.end(); ++it)
-		{
-			const SoundSource::Ptr& p = *it;
-			if (p && *p && !p->is_playing())
-			{
-				source = p;
-				sources.erase(it);
-				LOG("reuse source");
-				break;
-			}
-		}
-
-		if (!source)
-		{
-			source = SoundSource::create();
-			LOG("new source");
-		}
-
-		if (!source)
+		switch (error)
 		{
-			source = *sources.begin();
-			if (source) source->stop();
-			sources.erase(sources.begin());
-			LOG("stop and reuse oldest source");
+			case ALC_NO_ERROR:        return "ALC_NO_ERROR";
+			case ALC_INVALID_DEVICE:  return "ALC_INVALID_DEVICE";
+			case ALC_INVALID_CONTEXT: return "ALC_INVALID_CONTEXT";
+			case ALC_INVALID_ENUM:    return "ALC_INVALID_ENUM";
+			case ALC_OUT_OF_MEMORY:   return "ALC_OUT_OF_MEMORY";
+			default:                  return "UNKNOWN ERROR";
 		}
-
-		if (!source)
-			return NULL;
-
-		sources.push_back(source);
-		return source.get();
 	}
 
 	void
-	play_sound (const Sound& sound)
+	OpenAL_check_error (const char* file, int line)
 	{
-		if (!sound)
-			argument_error(__FILE__, __LINE__);
-
-		SoundSource* source = next_source();
-		if (!source || !*source)
-			invalid_state_error(__FILE__, __LINE__);
-
-		source->play(sound);
-
-#if 0
-		std::string ox = "";
-		for (size_t i = 0; i < sources.size(); ++i)
-			ox += sources[i]->is_playing() ? 'o' : 'x';
-		LOG("playing with %d sources. (%s)", sources.size(), ox.c_str());
-#endif
+		ALCenum e = OpenAL_get_error();
+		if (e != ALC_NO_ERROR)
+			openal_error(file, line, "OpenAL error %s", get_error_name(e).c_str());
 	}