beeps 0.1.33 → 0.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b9915b433d5e54ae45f1a6cc1fc0a922f558ed0133908c3d1bf30554fc348c3
-  data.tar.gz: 53f4a30891273bfcdd969ca408a963b6aa5c847055c3868701dc356e46a45b6e
+  metadata.gz: 4abd66d942c96bad56f00299a5243e3a0329fab261899a3b8d03446a81a8851e
+  data.tar.gz: 65b195ccb50cd33d18442f09d02efa9c9f07e4c51664ac397327b17a76c0c954
 SHA512:
-  metadata.gz: 90ed2a73165ea3106af0512fd0133bc587762944c0da07d70d5d1bb1a3815df7173417e528a5e9979677c5d8ccb0a60207ca855ea3eceff5f675010cd87bb13a
-  data.tar.gz: e8e6f3e6a1fb38ba2a45bae0aaa2a549097d726a6ae0f5ea2ba768351a354144f9d67a1f9f84ac2b3ff17451cbdb3e9a9209dfcd1f986b31ee850aae5b693b2e
+  metadata.gz: 684012ab4651e9bf0653e004c0911b98e54cd917dfcfb644df7891e9a9ee9c53f904f7c98fc30cdecdc709813e21165c34d88c5f8a874549128b3b990a60d5a7
+  data.tar.gz: '08b3f641dbc010ae70a23a47f35b84957ecda237ea5bd8629bee8b6dcdd0198cbc1d0de752cb7ec3a2a39e0975635cc80492e635f35c0566e9d3a6999a2688a7'

data/.doc/ext/beeps/sound.cpp

@@ -36,15 +36,6 @@ VALUE play(VALUE self)
 	return value(THIS->play());
 }
 
-static
-VALUE save(VALUE self, VALUE path)
-{
-	CHECK;
-
-	THIS->save(path.c_str());
-	return self;
-}
-
 static
 VALUE get_sample_rate(VALUE self)
 {
@@ -103,6 +94,15 @@ VALUE get_loop(VALUE self)
 	return value(THIS->loop());
 }
 
+static
+VALUE save(VALUE self, VALUE path)
+{
+	CHECK;
+
+	THIS->save(path.c_str());
+	return self;
+}
+
 static
 VALUE load(VALUE self, VALUE path)
 {
@@ -121,7 +121,6 @@ Init_beeps_sound ()
 	rb_define_alloc_func(cSound, alloc);
 	rb_define_private_method(cSound, "setup", RUBY_METHOD_FUNC(setup), 4);
 	cSound.define_private_method("play!", play);
-	rb_define_method(cSound, "save", RUBY_METHOD_FUNC(save), 1);
 	rb_define_method(cSound, "sample_rate", RUBY_METHOD_FUNC(get_sample_rate), 0);
 	rb_define_method(cSound, "nchannels", RUBY_METHOD_FUNC(get_nchannels), 0);
 	rb_define_method(cSound, "seconds", RUBY_METHOD_FUNC(get_seconds), 0);
@@ -129,6 +128,7 @@ Init_beeps_sound ()
 	rb_define_method(cSound, "gain", RUBY_METHOD_FUNC(get_gain), 0);
 	rb_define_method(cSound, "loop=", RUBY_METHOD_FUNC(set_loop), 1);
 	rb_define_method(cSound, "loop", RUBY_METHOD_FUNC(get_loop), 0);
+	rb_define_method(cSound, "save", RUBY_METHOD_FUNC(save), 1);
 	rb_define_singleton_method(cSound, "load", RUBY_METHOD_FUNC(load), 1);
 }
 

data/.github/workflows/utils.rb

@@ -20,8 +20,9 @@ def setup_dependencies(build: true, only: nil)
 
   exts.each do |ext|
     gem   = RENAMES[ext.to_sym].then {|s| s || ext}
-    clone = "git clone --depth 1 https://github.com/xord/#{ext}.git ../#{ext}"
     ver   = gemspec[/add_runtime_dependency.*['"]#{gem}['"].*['"]\s*~>\s*([\d\.]+)\s*['"]/, 1]
+    opts  = '-c advice.detachedHead=false --depth 1'
+    clone = "git clone #{opts} https://github.com/xord/#{ext}.git ../#{ext}"
 
     # 'rake subtree:push' pushes all subrepos, so cloning by new tag
     # often fails before tagging each new tag

data/ChangeLog.md

@@ -1,6 +1,17 @@
 # beeps ChangeLog
 
 
+## [v0.1.35] - 2023-04-30
+
+- Place the save() method next to load()
+
+
+## [v0.1.34] - 2023-04-25
+
+- Clear mic streams on exit
+- Fix compile errors on assert lines
+
+
 ## [v0.1.33] - 2023-04-22
 
 - Stream playback is now supported.

data/VERSION

@@ -1 +1 @@
-0.1.33
+0.1.35

data/beeps.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.7.0'
 
-  s.add_runtime_dependency 'xot',  '~> 0.1.33'
-  s.add_runtime_dependency 'rucy', '~> 0.1.33'
+  s.add_runtime_dependency 'xot',  '~> 0.1.34'
+  s.add_runtime_dependency 'rucy', '~> 0.1.34'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

data/ext/beeps/sound.cpp

@@ -39,16 +39,6 @@ RUCY_DEF0(play)
 }
 RUCY_END
 
-static
-RUCY_DEF1(save, path)
-{
-	CHECK;
-
-	THIS->save(path.c_str());
-	return self;
-}
-RUCY_END
-
 static
 RUCY_DEF0(get_sample_rate)
 {
@@ -114,6 +104,16 @@ RUCY_DEF0(get_loop)
 }
 RUCY_END
 
+static
+RUCY_DEF1(save, path)
+{
+	CHECK;
+
+	THIS->save(path.c_str());
+	return self;
+}
+RUCY_END
+
 static
 RUCY_DEF1(load, path)
 {
@@ -133,7 +133,6 @@ Init_beeps_sound ()
 	cSound.define_alloc_func(alloc);
 	cSound.define_private_method("setup", setup);
 	cSound.define_private_method("play!", play);
-	cSound.define_method("save", save);
 	cSound.define_method("sample_rate", get_sample_rate);
 	cSound.define_method("nchannels",   get_nchannels);
 	cSound.define_method("seconds",     get_seconds);
@@ -141,6 +140,7 @@ Init_beeps_sound ()
 	cSound.define_method("gain",  get_gain);
 	cSound.define_method("loop=", set_loop);
 	cSound.define_method("loop",  get_loop);
+	cSound.define_method("save", save);
 	cSound.define_singleton_method("load", load);
 }
 

data/include/beeps/sound.h

@@ -72,8 +72,6 @@ namespace Beeps
 
 			SoundPlayer play ();
 
-			void save (const char* path) const;
-
 			double sample_rate () const;
 
 			uint nchannels () const;
@@ -88,6 +86,8 @@ namespace Beeps
 
 			bool     loop () const;
 
+			void save (const char* path) const;
+
 			operator bool () const;
 
 			bool operator ! () const;

data/src/adsr.cpp

@@ -150,7 +150,7 @@ namespace Beeps
 		size_t len        = length_sec >= 0
 			?	length_sec * sample_rate
 			:	frames->nframes() - start;
-		assert(0 < len && (start + len) < frames->nsamples());
+		assert(0 < len && (start + len) < frames->nframes());
 
 		return frames->slice(start, len);
 	}

data/src/analyser.cpp

@@ -217,7 +217,7 @@ namespace Beeps
 		uint from_nsamples = from.nsamples();
 		uint from_start    = from_nsamples > to_cap ? from_nsamples - to_cap : 0;
 		uint nsamples      = from_nsamples - from_start;
-		assert(to_nsamples + nsamples <= to_capacity);
+		assert(to_nsamples + nsamples <= to_cap);
 
 		for (uint ch = 0; ch < tof->nchannels(); ++ch)
 		{

data/src/beeps.cpp

@@ -24,6 +24,9 @@ namespace Beeps
 	void
 	fin ()
 	{
+		MicIn_clear_streams();
+		SoundPlayer_clear_streams();
+
 		OpenAL_fin();
 	}
 

data/src/mic_in.cpp

@@ -81,7 +81,7 @@ namespace Beeps
 
 		void get_signals (Signals* signals, uint* gen_offset)
 		{
-			assert(signals && signals->empty() && generate_offset);
+			assert(signals && signals->empty() && gen_offset);
 
 			if (!is_valid()) return;
 
@@ -190,10 +190,19 @@ namespace Beeps
 	void
 	MicIn_process_streams ()
 	{
-		for (Mic& mic : global::mics)
+		for (auto& mic : global::mics)
 			mic.buffer_samples();
 	}
 
+	void
+	MicIn_clear_streams ()
+	{
+		for (auto& mic : global::mics)
+			mic.stop();
+
+		global::mics.clear();
+	}
+
 
 	MicIn::MicIn (uint nchannels, double sample_rate)
 	{

data/src/mic_in.h

@@ -13,6 +13,8 @@ namespace Beeps
 
 	void MicIn_process_streams ();
 
+	void MicIn_clear_streams ();
+
 
 }// Beeps
 

data/src/openal.cpp

@@ -23,8 +23,6 @@ namespace Beeps
 	static void
 	cleanup ()
 	{
-		SoundPlayer_clear_all();
-
 		alcMakeContextCurrent(NULL);
 
 		if (global::context)

data/src/processor.cpp

@@ -244,7 +244,7 @@ namespace Beeps
 	Signals
 	ProcessorContext::process_signals (Processor* processor)
 	{
-		assert(result && processor);
+		assert(processor);
 
 		Signals_clear(&signals);
 		process(processor, &signals, &offset);

data/src/sound.cpp

@@ -530,7 +530,7 @@ namespace Beeps
 	}
 
 	void
-	SoundPlayer_clear_all ()
+	SoundPlayer_clear_streams ()
 	{
 		for (auto& player : global::players)
 			player.self->clear();
@@ -649,11 +649,6 @@ namespace Beeps
 			not_implemented_error(__FILE__, __LINE__);
 		}
 
-		virtual void save (const char* path) const
-		{
-			not_implemented_error(__FILE__, __LINE__);
-		}
-
 		virtual double sample_rate () const
 		{
 			return 0;
@@ -669,6 +664,11 @@ namespace Beeps
 			return 0;
 		}
 
+		virtual void save (const char* path) const
+		{
+			not_implemented_error(__FILE__, __LINE__);
+		}
+
 		virtual bool is_valid () const
 		{
 			return false;
@@ -706,14 +706,6 @@ namespace Beeps
 			player->self->attach_signals(signals);
 		}
 
-		void save (const char* path) const override
-		{
-			if (!signals)
-				invalid_state_error(__FILE__, __LINE__);
-
-			Signals_save(signals, path);
-		}
-
 		double sample_rate () const override
 		{
 			return signals ? signals.sample_rate() : Super::sample_rate();
@@ -729,6 +721,14 @@ namespace Beeps
 			return signals ? Signals_get_seconds(signals) : Super::seconds();
 		}
 
+		void save (const char* path) const override
+		{
+			if (!signals)
+				invalid_state_error(__FILE__, __LINE__);
+
+			Signals_save(signals, path);
+		}
+
 		bool is_valid () const override
 		{
 			return signals;
@@ -840,12 +840,6 @@ namespace Beeps
 		return player;
 	}
 
-	void
-	Sound::save (const char* path) const
-	{
-		self->save(path);
-	}
-
 	double
 	Sound::sample_rate () const
 	{
@@ -891,6 +885,12 @@ namespace Beeps
 		return self->loop;
 	}
 
+	void
+	Sound::save (const char* path) const
+	{
+		self->save(path);
+	}
+
 	Sound::operator bool () const
 	{
 		return self->is_valid();

data/src/sound.h

@@ -13,7 +13,7 @@ namespace Beeps
 
 	void SoundPlayer_process_streams ();
 
-	void SoundPlayer_clear_all ();
+	void SoundPlayer_clear_streams ();
 
 
 }// Beeps

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beeps
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.35
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-21 00:00:00.000000000 Z
+date: 2023-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.34
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.34
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.34
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.34
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement