beeps 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99cc2d38469ff5c4a36bbca67ab0501a47e0aacac212f0f76771e961bb7a6ac7
-  data.tar.gz: 406ecb1ebe19efdb536de07efd3723f34eeba93cb89a82767501e94ef08320e1
+  metadata.gz: fb86426316eb60913fcb725b8ee212785e3fde7f75bfb58a682e7a4a8468c20d
+  data.tar.gz: 91ed66b1ac199397817a1129432818f809b59e10b1bbf4a3e24ebd1fb2706ff3
 SHA512:
-  metadata.gz: b3de02786df9756536f43cb41fe595e812394f6b0ecd8e2843489e394f53ed9892048138d3a9804fd1c1f44f19e15801af7180644915dfde6b7677f9c4dadc40
-  data.tar.gz: 65a636d6922a1dea98e2ea4f26139fe47a696343bb81b561c38d81f3680cefff8597c9d29e791c82026cf786e738ecf6dcf54340cb30812f6e2ed845c1be33f3
+  metadata.gz: e33ed0d5cd549533810d6ed7525f66a9bf0504d4e65c6ee2f90da399d437ecc6016d0844d6d85c049bb4d7cf20ddb06c7d38a3ab2e49fd7668de8e225fe89e6e
+  data.tar.gz: 805747561bbb762333b571f3b5694cd10fec190085df0bfd81fd2295406f77c8e5fe50eda51a2fd3378014f93c276d1fc37a5a70d0c179a719bd4c2552dd13bd

data/.github/workflows/release-gem.yml

@@ -15,7 +15,7 @@ jobs:
           ruby-version: 3.2
 
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: setup gems
         run: bundle install

data/.github/workflows/tag.yml

@@ -15,7 +15,7 @@ jobs:
           ruby-version: 3.2
 
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ secrets.PAT }}

data/.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
           ruby-version: 3.2
 
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: setup gems
         run: bundle install
@@ -24,5 +24,11 @@ jobs:
       - name: setup dependencies
         run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
+      - name: lib
+        run: bundle exec rake lib
+
+      - name: ext
+        run: bundle exec rake ext
+
       - name: test
         run: bundle exec rake test

data/ChangeLog.md

@@ -1,6 +1,16 @@
 # beeps ChangeLog
 
 
+## [v0.2.1] - 2024-07-05
+
+- Do not delete OpenAL objects after calling OpenAL_fin()
+- Do not redefine fin!() methods, they are no longer needed
+- Skip 'test_play_end_then_stop' on GitHub Actions
+- Update workflows for test
+- Update to actions/checkout@v4
+- Fix 'github_actions?'
+
+
 ## [v0.2] - 2024-03-14
 
 - Change the super class for exception class from RuntimeError to StandardError

data/Gemfile.lock

@@ -9,7 +9,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-21
-  x86_64-darwin-20
+  arm64-darwin-22
 
 DEPENDENCIES
   rake

data/VERSION

@@ -1 +1 @@
-0.2
+0.2.1

data/beeps.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_runtime_dependency 'xot',  '~> 0.2'
-  s.add_runtime_dependency 'rucy', '~> 0.2'
+  s.add_runtime_dependency 'xot',  '~> 0.2.1'
+  s.add_runtime_dependency 'rucy', '~> 0.2.1'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/include/beeps/debug.h

@@ -5,7 +5,6 @@
 
 
 #include <xot/debug.h>
-#include <beeps/defs.h>
 
 
 namespace Beeps

data/include/beeps/ruby.h

@@ -4,11 +4,13 @@
 #define __BEEPS_RUBY_H__
 
 
-#include <beeps/ruby/beeps.h>
 #include <beeps/ruby/defs.h>
+#include <beeps/ruby/beeps.h>
 #include <beeps/ruby/exception.h>
 
 #include <beeps/ruby/processor.h>
+#include <beeps/ruby/generator.h>
+#include <beeps/ruby/filter.h>
 #include <beeps/ruby/sound.h>
 
 

data/include/beeps.h

@@ -11,6 +11,8 @@
 
 #include <beeps/signals.h>
 #include <beeps/processor.h>
+#include <beeps/generator.h>
+#include <beeps/filter.h>
 #include <beeps/sound.h>
 
 

data/src/openal.cpp

@@ -70,6 +70,12 @@ namespace Beeps
 		cleanup();
 	}
 
+	void*
+	OpenAL_get_context ()
+	{
+		return global::context;
+	}
+
 	ALCenum
 	OpenAL_get_error ()
 	{

data/src/openal.h

@@ -23,6 +23,8 @@ namespace Beeps
 
 	void OpenAL_fin ();
 
+	void* OpenAL_get_context ();
+
 	ALCenum OpenAL_get_error();
 
 	bool OpenAL_no_error();

data/src/signals.cpp

@@ -24,21 +24,6 @@ namespace Beeps
 	};// Signals::Data
 
 
-	Frames*
-	Signals_get_frames (Signals* signals)
-	{
-		if (!signals)
-			argument_error(__FILE__, __LINE__);
-
-		return signals->self->frames.get();
-	}
-
-	const Frames*
-	Signals_get_frames (const Signals* signals)
-	{
-		return Signals_get_frames(const_cast<Signals*>(signals));
-	}
-
 	Signals
 	Signals_create (uint capacity, uint nchannels, double sample_rate)
 	{
@@ -67,8 +52,10 @@ namespace Beeps
 		frames->setDataRate(sample_rate);
 
 		for (uint channel = 0; channel < nchannels; ++channel)
+		{
 			for (uint sample = 0; sample < nsamples; ++sample)
 				(*frames)(sample, channel) = channels[channel][sample];
+		}
 
 		Signals s;
 		s.self->frames.reset(frames);
@@ -296,6 +283,21 @@ namespace Beeps
 		return (float) (signals.nsamples() / signals.sample_rate());
 	}
 
+	Frames*
+	Signals_get_frames (Signals* signals)
+	{
+		if (!signals)
+			argument_error(__FILE__, __LINE__);
+
+		return signals->self->frames.get();
+	}
+
+	const Frames*
+	Signals_get_frames (const Signals* signals)
+	{
+		return Signals_get_frames(const_cast<Signals*>(signals));
+	}
+
 	static void
 	make_audio_buffer (
 		AudioFile<float>::AudioBuffer* buffer, const Signals& signals)

data/src/signals.h

@@ -24,10 +24,6 @@ namespace Beeps
 	template <typename T> class SignalSamples;
 
 
-	      Frames* Signals_get_frames (      Signals* signals);
-
-	const Frames* Signals_get_frames (const Signals* signals);
-
 	Signals Signals_create (
 		uint capacity, uint nchannels = 1, double sample_rate = 0);
 
@@ -53,6 +49,10 @@ namespace Beeps
 
 	float Signals_get_seconds (const Signals& signals);
 
+	      Frames* Signals_get_frames (      Signals* signals);
+
+	const Frames* Signals_get_frames (const Signals* signals);
+
 	void    Signals_save (const Signals& signals, const char* path);
 
 	Signals Signals_load (const char* path);
@@ -63,8 +63,8 @@ namespace Beeps
 
 		public:
 
-			Frames (unsigned int nFrames = 0, unsigned int nChannels = 0)
-			:	stk::StkFrames(nFrames, nChannels)
+			Frames (unsigned int nframes = 0, unsigned int nchannels = 0)
+			:	stk::StkFrames(nframes, nchannels)
 			{
 			}
 

data/src/sound.cpp

@@ -67,8 +67,10 @@ namespace Beeps
 			std::vector<short> buffer;
 			buffer.reserve(nsamples * nchannels);
 			for (uint sample = 0; sample < nsamples; ++sample)
+			{
 				for (uint channel = 0; channel < nchannels; ++channel)
 					buffer.push_back((*frames)(sample, channel) * SHRT_MAX);
+			}
 
 			alBufferData(
 				self->id,
@@ -94,9 +96,11 @@ namespace Beeps
 		struct Data
 		{
 
-			ALint id   = -1;
+			void* context = NULL;
+
+			ALint id      = -1;
 
-			bool owner = false;
+			bool owner    = false;
 
 			~Data ()
 			{
@@ -111,26 +115,28 @@ namespace Beeps
 				alGenBuffers(1, &id_);
 				OpenAL_check_error(__FILE__, __LINE__);
 
-				id    = id_;
-				owner = true;
+				context = OpenAL_get_context();
+				id      = id_;
+				owner   = true;
 			}
 
 			void clear ()
 			{
-				if (owner && id >= 0)
+				if (owner && is_valid())
 				{
 					ALuint id_ = id;
 					alDeleteBuffers(1, &id_);
 					OpenAL_check_error(__FILE__, __LINE__);
 				}
 
-				id    = -1;
-				owner = false;
+				context = NULL;
+				id      = -1;
+				owner   = false;
 			}
 
 			bool is_valid () const
 			{
-				return id >= 0;
+				return id >= 0 && context == OpenAL_get_context();
 			}
 
 		};// Data
@@ -145,9 +151,7 @@ namespace Beeps
 
 		void create ()
 		{
-			ALuint id_ = 0;
-			alGenSources(1, &id_);
-			if (OpenAL_no_error()) self->id = id_;
+			self->create();
 		}
 
 		void clear ()
@@ -310,7 +314,7 @@ namespace Beeps
 
 		operator bool () const
 		{
-			return self->id >= 0;
+			return self->is_valid();
 		}
 
 		bool operator ! () const
@@ -321,22 +325,41 @@ namespace Beeps
 		struct Data
 		{
 
-			ALint id = -1;
+			void* context = NULL;
+
+			ALint id      = -1;
 
 			~Data ()
 			{
 				clear();
 			}
 
+			void create ()
+			{
+				ALuint id_ = 0;
+				alGenSources(1, &id_);
+				if (!OpenAL_no_error()) return;
+
+				context = OpenAL_get_context();
+				id      = id_;
+			}
+
 			void clear ()
 			{
-				if (id < 0) return;
+				if (is_valid())
+				{
+					ALuint id_ = id;
+					alDeleteSources(1, &id_);
+					OpenAL_check_error(__FILE__, __LINE__);
+				}
 
-				ALuint id_ = id;
-				alDeleteSources(1, &id_);
-				OpenAL_check_error(__FILE__, __LINE__);
+				context = NULL;
+				id      = -1;
+			}
 
-				id = -1;
+			bool is_valid () const
+			{
+				return id >= 0 && context == OpenAL_get_context();
 			}
 
 		};// Data

data/test/helper.rb

@@ -8,8 +8,3 @@ require 'beeps'
 require 'test/unit'
 
 include Xot::Test
-
-
-unless defined?($BEEPS_NOAUTOINIT) && $BEEPS_NOAUTOINIT
-  def Beeps.fin!() end
-end

data/test/test_sound_player.rb

@@ -54,6 +54,10 @@ class TestSoundPlayer < Test::Unit::TestCase
   end
 
   def test_play_end_then_stop()
+    # FIXME: not tested because it fails due to GHA's "Null Audio Device".
+    # https://github.com/xord/beeps/actions/runs/9044146493/job/24852497305
+    return if github_actions?
+
     s   = sound
     sec = s.seconds
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beeps
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-13 00:00:00.000000000 Z
+date: 2024-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
 description: Synthesize and play beep sounds.
 email: xordog@gmail.com
 executables: []