beeps 0.4.0 → 0.5.1

data/ext/beeps/sound.cpp

@@ -8,7 +8,7 @@ RUCY_DEFINE_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Sound)
 
 #define THIS  to<Beeps::Sound*>(self)
 
-#define CHECK RUCY_CHECK_OBJ(Beeps::Sound, self)
+#define CHECK RUCY_CHECK_PTR(Beeps::Sound, self)
 
 
 static
@@ -48,20 +48,20 @@ RUCY_DEF0(play)
 RUCY_END
 
 static
-RUCY_DEF0(get_sample_rate)
+RUCY_DEF0(get_nchannels)
 {
 	CHECK;
 
-	return value(THIS->sample_rate());
+	return value(THIS->nchannels());
 }
 RUCY_END
 
 static
-RUCY_DEF0(get_nchannels)
+RUCY_DEF0(get_sample_rate)
 {
 	CHECK;
 
-	return value(THIS->nchannels());
+	return value(THIS->sample_rate());
 }
 RUCY_END
 
@@ -142,8 +142,8 @@ Init_beeps_sound ()
 	cSound.define_private_method("initialize!",     initialize);
 	cSound.define_private_method("initialize_copy", initialize_copy);
 	cSound.define_private_method("play!", play);
-	cSound.define_method("sample_rate", get_sample_rate);
 	cSound.define_method("nchannels",   get_nchannels);
+	cSound.define_method("sample_rate", get_sample_rate);
 	cSound.define_method("seconds",     get_seconds);
 	cSound.define_method("gain=", set_gain);
 	cSound.define_method("gain",  get_gain);

data/ext/beeps/sound_player.cpp

@@ -9,7 +9,7 @@ RUCY_DEFINE_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::SoundPlayer)
 
 #define THIS  to<Beeps::SoundPlayer*>(self)
 
-#define CHECK RUCY_CHECK_OBJ(Beeps::SoundPlayer, self)
+#define CHECK RUCY_CHECK_PTR(Beeps::SoundPlayer, self)
 
 
 static
@@ -205,10 +205,10 @@ Init_beeps_sound_player ()
 	cSoundPlayer.define_method("loop",  get_loop);
 	cSoundPlayer.define_singleton_method("stop_all", stop_all);
 
-	cSoundPlayer.define_const("STATE_UNKNOWN", Beeps::SoundPlayer::STATE_UNKNOWN);
-	cSoundPlayer.define_const("PLAYING",       Beeps::SoundPlayer::PLAYING);
-	cSoundPlayer.define_const("PAUSED",        Beeps::SoundPlayer::PAUSED);
-	cSoundPlayer.define_const("STOPPED",       Beeps::SoundPlayer::STOPPED);
+	cSoundPlayer.define_const("STATE_NONE", Beeps::SoundPlayer::STATE_NONE);
+	cSoundPlayer.define_const("PLAYING",    Beeps::SoundPlayer::PLAYING);
+	cSoundPlayer.define_const("PAUSED",     Beeps::SoundPlayer::PAUSED);
+	cSoundPlayer.define_const("STOPPED",    Beeps::SoundPlayer::STOPPED);
 }
 
 

data/ext/beeps/text_in.cpp

@@ -9,7 +9,7 @@ RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::TextIn)
 
 #define THIS  to<Beeps::TextIn*>(self)
 
-#define CHECK RUCY_CHECK_OBJ(Beeps::TextIn, self)
+#define CHECK RUCY_CHECK_PTR(Beeps::TextIn, self)
 
 
 static

data/ext/beeps/time_stretch.cpp

@@ -9,7 +9,7 @@ RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::TimeStretch)
 
 #define THIS  to<Beeps::TimeStretch*>(self)
 
-#define CHECK RUCY_CHECK_OBJ(Beeps::TimeStretch, self)
+#define CHECK RUCY_CHECK_PTR(Beeps::TimeStretch, self)
 
 
 static

data/ext/beeps/value.cpp

@@ -9,7 +9,7 @@ RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Value)
 
 #define THIS  to<Beeps::Value*>(self)
 
-#define CHECK RUCY_CHECK_OBJ(Beeps::Value, self)
+#define CHECK RUCY_CHECK_PTR(Beeps::Value, self)
 
 
 static

data/include/beeps/signals.h

@@ -37,10 +37,10 @@ namespace Beeps
 
 			uint append (const Signals& source, uint source_offset = 0);
 
-			double sample_rate () const;
-
 			uint nchannels () const;
 
+			double sample_rate () const;
+
 			uint nsamples () const;
 
 			uint capacity () const;

data/include/beeps/sound.h

@@ -23,7 +23,7 @@ namespace Beeps
 			enum State
 			{
 
-				STATE_UNKNOWN = 0,
+				STATE_NONE = 0,
 
 				PLAYING,
 
@@ -95,10 +95,10 @@ namespace Beeps
 
 			SoundPlayer play ();
 
-			double sample_rate () const;
-
 			uint nchannels () const;
 
+			double sample_rate () const;
+
 			float seconds () const;
 
 			void set_gain (float gain);

data/lib/beeps/beeps.rb

@@ -38,10 +38,10 @@ module Beeps
 
     private
 
-      def beep_sound(time)
-        @beep_processor ||= Oscillator.new(:square)
-        Sound.new @beep_processor, time
-      end
+    def beep_sound(time)
+      @beep_processor ||= Oscillator.new(:square)
+      Sound.new @beep_processor, time
+    end
 
     self
 

data/lib/beeps/sound.rb

@@ -37,7 +37,7 @@ module Beeps
     include Xot::Setter
 
     const_symbol_reader :state, **{
-      unknown: STATE_UNKNOWN,
+      none:    STATE_NONE,
       playing: PLAYING,
       paused:  PAUSED,
       stopped: STOPPED

data/src/mic_in.cpp

@@ -6,6 +6,7 @@
 #include <vector>
 #include <memory>
 #include <algorithm>
+#include <xot/util.h>
 #include "beeps/beeps.h"
 #include "beeps/exception.h"
 #include "openal.h"
@@ -28,7 +29,7 @@ namespace Beeps
 				invalid_state_error(__FILE__, __LINE__);
 
 			alcCaptureStart(self->device);
-			OpenAL_check_error(__FILE__, __LINE__);
+			OpenAL_check_error(self->device, __FILE__, __LINE__);
 
 			self->started = true;
 		}
@@ -41,7 +42,7 @@ namespace Beeps
 				invalid_state_error(__FILE__, __LINE__);
 
 			alcCaptureStop(self->device);
-			OpenAL_check_error(__FILE__, __LINE__);
+			OpenAL_check_error(self->device, __FILE__, __LINE__);
 
 			self->started = false;
 		}
@@ -59,18 +60,18 @@ namespace Beeps
 			ALint nsamples = 0;
 			alcGetIntegerv(
 				self->device, ALC_CAPTURE_SAMPLES, sizeof(nsamples), &nsamples);
-			OpenAL_check_error(__FILE__, __LINE__);
+			OpenAL_check_error(self->device, __FILE__, __LINE__);
 			if (nsamples <= 0) return;
 
 			auto& buffer = self->buffer;
 			if (buffer.size() < (size_t) nsamples) buffer.resize(nsamples);
 
-			alcCaptureSamples(self->device, (ALCvoid*) &buffer[0], nsamples);
-			OpenAL_check_error(__FILE__, __LINE__);
+			alcCaptureSamples(self->device, (ALCvoid*) buffer.data(), nsamples);
+			OpenAL_check_error(self->device, __FILE__, __LINE__);
 
 			auto& samples = self->samples;
 			samples.reserve(samples.size() + nsamples);
-			samples.insert(samples.end(), &buffer[0], &buffer[0] + nsamples);
+			samples.insert(samples.end(), buffer.data(), buffer.data() + nsamples);
 
 			if (samples.size() > samples_size_max())
 			{
@@ -114,7 +115,7 @@ namespace Beeps
 
 		bool is_valid () const
 		{
-			return self->sample_rate > 0 && self->nchannels > 0 && self->device;
+			return self->nchannels > 0 && self->sample_rate > 0 && self->device;
 		}
 
 		struct Data
@@ -134,12 +135,12 @@ namespace Beeps
 
 			~Data ()
 			{
-				clear();
+				Xot::call_and_log_errors([&]() {clear();});
 			}
 
 			void create ()
 			{
-				assert(sample_rate > 0 && nchannels > 0);
+				assert(nchannels > 0 && sample_rate > 0);
 
 				if (device) return;
 

data/src/openal.cpp

@@ -2,6 +2,7 @@
 
 
 #include <assert.h>
+#include <algorithm>
 #include "beeps/exception.h"
 #include "beeps/debug.h"
 #include "sound.h"
@@ -14,9 +15,11 @@ namespace Beeps
 	namespace global
 	{
 
-		static ALCdevice* device   = NULL;
+		static ALCdevice* device        = NULL;
 
-		static ALCcontext* context = NULL;
+		static ALCcontext* context      = NULL;
+
+		static uint max_playing_sources = 0;
 
 	}// global
 
@@ -39,6 +42,21 @@ namespace Beeps
 		}
 	}
 
+	static uint
+	get_max_playing_sources ()
+	{
+#if defined(OSX) || defined(IOS)
+		typedef ALint (*GetMaxBusses) ();
+
+		auto get_max_busses =
+			(GetMaxBusses) alcGetProcAddress(NULL, "alcMacOSXGetMixerMaxiumumBusses");
+		if (get_max_busses)
+			return (uint) std::max(get_max_busses(), 0);
+#endif
+
+		return 0;
+	}
+
 	void
 	OpenAL_init ()
 	{
@@ -56,6 +74,7 @@ namespace Beeps
 		if (!alcMakeContextCurrent(global::context))
 			goto FAILED;
 
+		global::max_playing_sources = get_max_playing_sources();
 		return;
 
 	FAILED:
@@ -78,22 +97,43 @@ namespace Beeps
 		return global::context;
 	}
 
-	ALCenum
+	uint
+	OpenAL_get_max_playing_sources ()
+	{
+		return global::max_playing_sources;
+	}
+
+	ALenum
 	OpenAL_get_error ()
 	{
-		assert(global::device);
+		assert(global::context);
 
-		return alcGetError(global::device);
+		return alGetError();
 	}
 
 	bool
 	OpenAL_no_error ()
 	{
-		return OpenAL_get_error() == ALC_NO_ERROR;
+		return OpenAL_get_error() == AL_NO_ERROR;
 	}
 
 	static String
 	get_error_name (ALenum error)
+	{
+		switch (error)
+		{
+			case AL_NO_ERROR:          return "AL_NO_ERROR";
+			case AL_INVALID_NAME:      return "AL_INVALID_NAME";
+			case AL_INVALID_ENUM:      return "AL_INVALID_ENUM";
+			case AL_INVALID_VALUE:     return "AL_INVALID_VALUE";
+			case AL_INVALID_OPERATION: return "AL_INVALID_OPERATION";
+			case AL_OUT_OF_MEMORY:     return "AL_OUT_OF_MEMORY";
+			default:                   return "UNKNOWN ERROR";
+		}
+	}
+
+	static String
+	get_device_error_name (ALCenum error)
 	{
 		switch (error)
 		{
@@ -110,9 +150,27 @@ namespace Beeps
 	void
 	OpenAL_check_error (const char* file, int line)
 	{
-		ALCenum e = OpenAL_get_error();
+		ALenum e = OpenAL_get_error();
+		if (e != AL_NO_ERROR)
+		{
+			openal_error(
+				file, line, "OpenAL error %s (0x%x)",
+				get_error_name(e).c_str(), (uint) e);
+		}
+	}
+
+	void
+	OpenAL_check_error (ALCdevice* device, const char* file, int line)
+	{
+		assert(device);
+
+		ALCenum e = alcGetError(device);
 		if (e != ALC_NO_ERROR)
-			openal_error(file, line, "OpenAL error %s", get_error_name(e).c_str());
+		{
+			openal_error(
+				file, line, "OpenAL error %s (0x%x)",
+				get_device_error_name(e).c_str(), (uint) e);
+		}
 	}
 
 

data/src/openal.h

@@ -25,12 +25,16 @@ namespace Beeps
 
 	void* OpenAL_get_context ();
 
-	ALCenum OpenAL_get_error();
+	uint OpenAL_get_max_playing_sources ();
+
+	ALenum OpenAL_get_error();
 
 	bool OpenAL_no_error();
 
 	void OpenAL_check_error(const char* file, int line);
 
+	void OpenAL_check_error(ALCdevice* device, const char* file, int line);
+
 
 }// Beeps
 

data/src/oscillator.cpp

@@ -289,7 +289,7 @@ namespace Beeps
 		for (size_t i = 0; i < size; ++i)
 			samples[i] = fun(i / (float) size);
 
-		return new WaveformOsc(&samples[0], samples.size());
+		return new WaveformOsc(samples.data(), samples.size());
 	}
 
 	static void

data/src/signals.cpp

@@ -623,18 +623,18 @@ namespace Beeps
 		return t;
 	}
 
-	double
-	Signals::sample_rate () const
-	{
-		return self->frames ? self->frames->dataRate() : Beeps::sample_rate();
-	}
-
 	uint
 	Signals::nchannels () const
 	{
 		return self->frames ? self->frames->channels() : 0;
 	}
 
+	double
+	Signals::sample_rate () const
+	{
+		return self->frames ? self->frames->dataRate() : Beeps::sample_rate();
+	}
+
 	uint
 	Signals::nsamples () const
 	{