beeps 0.1.12 → 0.1.13

data/src/openal.h

@@ -4,19 +4,30 @@
 #define __BEEPS_SRC_OPENAL_H__
 
 
-#include <beeps/openal.h>
+#if defined(OSX) || defined(IOS)
+	#include <OpenAL/al.h>
+	#include <OpenAL/alc.h>
+#else
+	#include <AL/al.h>
+	#include <AL/alc.h>
+#endif
+
+#include <beeps/defs.h>
 
 
 namespace Beeps
 {
 
 
-	class Sound;
+	void OpenAL_init ();
+
+	void OpenAL_fin ();
 
+	ALCenum OpenAL_get_error();
 
-	void play_sound (const Sound& sound);
+	bool OpenAL_no_error();
 
-	ALuint get_sound_buffer_id (const Sound& sound);
+	void OpenAL_check_error(const char* file, int line);
 
 
 }// Beeps

data/src/processor.cpp

@@ -5,8 +5,8 @@
 #include "BlitSaw.h"
 #include "BlitSquare.h"
 #include "FileWvIn.h"
-#include "beeps/signals.h"
 #include "beeps/exception.h"
+#include "signals.h"
 
 
 namespace Beeps
@@ -80,7 +80,7 @@ namespace Beeps
 	{
 		Super::process(signals);
 
-		self->oscillator.tick(*signals->frames());
+		self->oscillator.tick(*Signals_get_frames(signals));
 	}
 
 
@@ -121,7 +121,7 @@ namespace Beeps
 	{
 		Super::process(signals);
 
-		self->oscillator.tick(*signals->frames());
+		self->oscillator.tick(*Signals_get_frames(signals));
 	}
 
 
@@ -162,7 +162,7 @@ namespace Beeps
 	{
 		Super::process(signals);
 
-		self->oscillator.tick(*signals->frames());
+		self->oscillator.tick(*Signals_get_frames(signals));
 	}
 
 
@@ -189,7 +189,7 @@ namespace Beeps
 	{
 		Super::process(signals);
 
-		self->input.tick(*signals->frames());
+		self->input.tick(*Signals_get_frames(signals));
 	}
 
 	FileIn::operator bool () const

data/src/signals.cpp

@@ -1,8 +1,7 @@
-#include "beeps/signals.h"
+#include "signals.h"
 
 
-#include <boost/scoped_ptr.hpp>
-#include "Stk.h"
+#include <memory>
 #include "beeps/beeps.h"
 #include "beeps/exception.h"
 
@@ -14,11 +13,27 @@ namespace Beeps
 	struct Signals::Data
 	{
 
-		boost::scoped_ptr<stk::StkFrames> frames;
+		std::unique_ptr<stk::StkFrames> frames;
 
 	};// Signals::Data
 
 
+	stk::StkFrames*
+	Signals_get_frames (Signals* signals)
+	{
+		if (!signals)
+			argument_error(__FILE__, __LINE__);
+
+		return signals->self->frames.get();
+	}
+
+	const stk::StkFrames*
+	Signals_get_frames (const Signals* signals)
+	{
+		return Signals_get_frames(const_cast<Signals*>(signals));
+	}
+
+
 	Signals::Signals (float seconds, uint channels)
 	{
 		if (seconds <= 0 || channels <= 0)
@@ -32,7 +47,7 @@ namespace Beeps
 	}
 
 	Signals
-	Signals::copy () const
+	Signals::dup () const
 	{
 		Signals t;
 		if (self->frames)
@@ -61,22 +76,9 @@ namespace Beeps
 		return p ? p->frames->channels() : 0;
 	}
 
-	stk::StkFrames*
-	Signals::frames ()
-	{
-		Data* p = self.get();
-		return p ? p->frames.get() : NULL;
-	}
-
-	const stk::StkFrames*
-	Signals::frames () const
-	{
-		return const_cast<Signals*>(this)->frames();
-	}
-
 	Signals::operator bool () const
 	{
-		const stk::StkFrames* f = frames();
+		const stk::StkFrames* f = Signals_get_frames(this);
 		return f && f->frames() > 0 && f->channels() > 0;
 	}
 

data/src/signals.h

@@ -0,0 +1,23 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __BEEPS_SRC_SIGNALS_H__
+#define __BEEPS_SRC_SIGNALS_H__
+
+
+#include <Stk.h>
+#include <beeps/signals.h>
+
+
+namespace Beeps
+{
+
+
+	      stk::StkFrames* Signals_get_frames (      Signals* signals);
+
+	const stk::StkFrames* Signals_get_frames (const Signals* signals);
+
+
+}// Beeps
+
+
+#endif//EOH

data/src/sound.cpp

@@ -3,17 +3,162 @@
 
 #include <limits.h>
 #include "Stk.h"
-#include "beeps/openal.h"
-#include "beeps/signals.h"
 #include "beeps/processor.h"
 #include "beeps/exception.h"
 #include "openal.h"
+#include "signals.h"
+
+
+#if 0
+#define LOG(...) doutln(__VA_ARGS__)
+#else
+#define LOG(...)
+#endif
 
 
 namespace Beeps
 {
 
 
+	static ALuint get_buffer_id (const Sound& sound);
+
+
+	struct SoundSource
+	{
+
+		typedef SoundSource This;
+
+		typedef std::shared_ptr<This> Ptr;
+
+		ALint id;
+
+		static Ptr create ()
+		{
+			ALuint id_;
+			alGenSources(1, &id_);
+			if (!OpenAL_no_error()) return Ptr();
+
+			return Ptr(new This(id_));
+		}
+
+		~SoundSource ()
+		{
+			if (!*this) return;
+
+			ALuint id_ = id;
+			alDeleteSources(1, &id_);
+			OpenAL_check_error(__FILE__, __LINE__);
+		}
+
+		void play (const Sound& sound)
+		{
+			assert(sound);
+
+			if (!*this)
+				invalid_state_error(__FILE__, __LINE__);
+
+			alSourcei(id, AL_BUFFER, get_buffer_id(sound));
+			alSourcePlay(id);
+			OpenAL_check_error(__FILE__, __LINE__);
+		}
+
+		void stop ()
+		{
+			if (!*this)
+				invalid_state_error(__FILE__, __LINE__);
+
+			alSourceStop(id);
+			OpenAL_check_error(__FILE__, __LINE__);
+		}
+
+		bool is_playing () const
+		{
+			if (!*this) return false;
+
+			ALint state = 0;
+			alGetSourcei(id, AL_SOURCE_STATE, &state);
+			OpenAL_check_error(__FILE__, __LINE__);
+
+			return state == AL_PLAYING;
+		}
+
+		operator bool () const
+		{
+			return id >= 0;
+		}
+
+		bool operator ! () const
+		{
+			return !operator bool();
+		}
+
+		private:
+
+			SoundSource (ALint id = -1)
+			:	id(id)
+			{
+			}
+
+	};// SoundSource
+
+
+	typedef std::vector<SoundSource::Ptr> SoundSourceList;
+
+
+	namespace global
+	{
+
+		static SoundSourceList sources;
+
+	}// global
+
+
+	void
+	Sound_cleanup_sources ()
+	{
+		global::sources.clear();
+	}
+
+	static SoundSource*
+	get_next_source ()
+	{
+		SoundSource::Ptr source;
+
+		auto end = global::sources.end();
+		for (auto it = global::sources.begin(); it != end; ++it)
+		{
+			const SoundSource::Ptr& p = *it;
+			if (p && *p && !p->is_playing())
+			{
+				source = p;
+				global::sources.erase(it);
+				LOG("reuse source");
+				break;
+			}
+		}
+
+		if (!source)
+		{
+			source = SoundSource::create();
+			LOG("new source");
+		}
+
+		if (!source)
+		{
+			source = *global::sources.begin();
+			if (source) source->stop();
+			global::sources.erase(global::sources.begin());
+			LOG("stop and reuse oldest source");
+		}
+
+		if (!source)
+			return NULL;
+
+		global::sources.push_back(source);
+		return source.get();
+	}
+
+
 	struct Sound::Data
 	{
 
@@ -35,7 +180,7 @@ namespace Beeps
 
 			ALuint id_ = 0;
 			alGenBuffers(1, &id_);
-			check_error(__FILE__, __LINE__);
+			OpenAL_check_error(__FILE__, __LINE__);
 
 			id = id_;
 		}
@@ -46,7 +191,7 @@ namespace Beeps
 			{
 				ALuint id_ = id;
 				alDeleteBuffers(1, &id_);
-				check_error(__FILE__, __LINE__);
+				OpenAL_check_error(__FILE__, __LINE__);
 			}
 
 			id = -1;
@@ -60,6 +205,13 @@ namespace Beeps
 	};// Sound::Data
 
 
+	ALuint
+	get_buffer_id (const Sound& sound)
+	{
+		return sound.self->id;
+	}
+
+
 	Sound::Sound ()
 	{
 	}
@@ -74,7 +226,7 @@ namespace Beeps
 		Signals signals(seconds, 1);
 		processor->process(&signals);
 
-		stk::StkFrames* frames = signals.frames();
+		stk::StkFrames* frames = Signals_get_frames(&signals);
 		if (!frames)
 			return;
 
@@ -90,7 +242,7 @@ namespace Beeps
 		alBufferData(
 			self->id, AL_FORMAT_MONO16, &buffer[0], sizeof(short) * size,
 			frames->dataRate());
-		check_error(__FILE__, __LINE__);
+		OpenAL_check_error(__FILE__, __LINE__);
 	}
 
 	Sound::~Sound ()
@@ -100,7 +252,21 @@ namespace Beeps
 	void
 	Sound::play ()
 	{
-		play_sound(*this);
+		if (!*this)
+			invalid_state_error(__FILE__, __LINE__);
+
+		SoundSource* source = get_next_source();
+		if (!source || !*source)
+			invalid_state_error(__FILE__, __LINE__);
+
+		source->play(*this);
+
+#if 0
+		std::string ox = "";
+		for (size_t i = 0; i < global::sources.size(); ++i)
+			ox += global::sources[i]->is_playing() ? 'o' : 'x';
+		LOG("playing with %d sources. (%s)", global::sources.size(), ox.c_str());
+#endif
 	}
 
 	Sound::operator bool () const
@@ -115,11 +281,4 @@ namespace Beeps
 	}
 
 
-	ALuint
-	get_sound_buffer_id (const Sound& sound)
-	{
-		return sound.self->id;
-	}
-
-
 }// Beeps

data/src/sound.h

@@ -0,0 +1,17 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __BEEPS_SRC_SOUND_H__
+#define __BEEPS_SRC_SOUND_H__
+
+
+namespace Beeps
+{
+
+
+	void Sound_cleanup_sources ();
+
+
+}// Beeps
+
+
+#endif//EOH

metadata

@@ -1,77 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: beeps
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
-- snori
+- xordog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2019-11-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: xot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: gemcutter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 description: Synthesize and play beep sounds.
-email: snori@xord.org
+email: xordog@gmail.com
 executables: []
 extensions:
 - Rakefile
 extra_rdoc_files:
+- ".doc/ext/beeps/sawtooth_wave.cpp"
+- ".doc/ext/beeps/processor.cpp"
+- ".doc/ext/beeps/square_wave.cpp"
+- ".doc/ext/beeps/file_in.cpp"
+- ".doc/ext/beeps/native.cpp"
+- ".doc/ext/beeps/sine_wave.cpp"
+- ".doc/ext/beeps/sound.cpp"
+- ".doc/ext/beeps/beeps.cpp"
+files:
 - ".doc/ext/beeps/beeps.cpp"
 - ".doc/ext/beeps/file_in.cpp"
 - ".doc/ext/beeps/native.cpp"
@@ -80,7 +61,6 @@ extra_rdoc_files:
 - ".doc/ext/beeps/sine_wave.cpp"
 - ".doc/ext/beeps/sound.cpp"
 - ".doc/ext/beeps/square_wave.cpp"
-files:
 - README.md
 - Rakefile
 - VERSION
@@ -97,9 +77,9 @@ files:
 - ext/beeps/square_wave.cpp
 - include/beeps.h
 - include/beeps/beeps.h
+- include/beeps/debug.h
 - include/beeps/defs.h
 - include/beeps/exception.h
-- include/beeps/openal.h
 - include/beeps/processor.h
 - include/beeps/ruby.h
 - include/beeps/ruby/beeps.h
@@ -120,34 +100,12 @@ files:
 - src/openal.h
 - src/processor.cpp
 - src/signals.cpp
+- src/signals.h
 - src/sound.cpp
-- src/stk/include/Blit.h
-- src/stk/include/BlitSaw.h
-- src/stk/include/BlitSquare.h
-- src/stk/include/FileRead.h
-- src/stk/include/FileWvIn.h
-- src/stk/include/Generator.h
-- src/stk/include/SineWave.h
-- src/stk/include/Stk.h
-- src/stk/include/WvIn.h
-- src/stk/src/Blit.cpp
-- src/stk/src/BlitSaw.cpp
-- src/stk/src/BlitSquare.cpp
-- src/stk/src/FileRead.cpp
-- src/stk/src/FileWvIn.cpp
-- src/stk/src/SineWave.cpp
-- src/stk/src/Stk.cpp
+- src/sound.h
 - test/helper.rb
 - test/test_beeps.rb
 - test/test_sound.rb
-- ".doc/ext/beeps/beeps.cpp"
-- ".doc/ext/beeps/file_in.cpp"
-- ".doc/ext/beeps/native.cpp"
-- ".doc/ext/beeps/processor.cpp"
-- ".doc/ext/beeps/sawtooth_wave.cpp"
-- ".doc/ext/beeps/sine_wave.cpp"
-- ".doc/ext/beeps/sound.cpp"
-- ".doc/ext/beeps/square_wave.cpp"
 homepage: https://github.com/xord/beeps
 licenses: []
 metadata: {}
@@ -157,17 +115,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 1.9.0
+      version: '2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Plays beep sound.