beeps 0.1.40 → 0.1.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 958deb93498bd6162e818812483f40d24a777ca63e55e14b662d08685bc95e72
-  data.tar.gz: 44c17780aad9c76d9b69e1a52b4adf2f6b95bb62e1e62d0653b7514a66a17f20
+  metadata.gz: 3208db0b54212d8a78bae1faf4ea83e9dd866532d2348fc95ee39160df814111
+  data.tar.gz: 296f31a3dd5eb00da5e58b7e37f6d7684588e77f03bea198511506403e419cf2
 SHA512:
-  metadata.gz: 76aaff1b3aa7d871b637b79808088832d7ba161d8dd24234b2f8bc7b0171b8c2b465bb007a496c3530e512be6aed57d5fb8cc2b03460ae96203e096d0e76bf5f
-  data.tar.gz: ab615290855d8b923f8de24d1eabd3ad6ec39bde2a3834ca2131b7cd7660becdae6224bfee707b12123a0e7b66a5bf7077248f99dc1b9347dadbdc9ef0328f27
+  metadata.gz: 9f84af845319c5bee3caee397685560dce92e7cb711ecd2119cf632c2a9614cc7ddb85c11eb6df888f240866fd83847d9c603d48c7489fcf62ea9cb01c1ba96d
+  data.tar.gz: 39b3a5f1e602a4e26a563bcef1db69eebc05a1fdbfa919cc255925875108fa445d983d17212c82f08ccf706f8826c29cde9fc69580777092c65717b92857df9c

data/.doc/ext/beeps/oscillator.cpp

@@ -66,11 +66,12 @@ Init_beeps_oscillator ()
 	rb_define_method(cOscillator, "type", RUBY_METHOD_FUNC(get_type), 0);
 	rb_define_method(cOscillator, "frequency=", RUBY_METHOD_FUNC(set_frequency), 1);
 	rb_define_method(cOscillator, "frequency", RUBY_METHOD_FUNC(get_frequency), 0);
-	cOscillator.define_const("NONE",     Beeps::Oscillator::NONE);
-	cOscillator.define_const("SINE",     Beeps::Oscillator::SINE);
-	cOscillator.define_const("TRIANGLE", Beeps::Oscillator::TRIANGLE);
-	cOscillator.define_const("SQUARE",   Beeps::Oscillator::SQUARE);
-	cOscillator.define_const("SAWTOOTH", Beeps::Oscillator::SAWTOOTH);
+
+	cOscillator.define_const("TYPE_NONE", Beeps::Oscillator::TYPE_NONE);
+	cOscillator.define_const("SINE",      Beeps::Oscillator::SINE);
+	cOscillator.define_const("TRIANGLE",  Beeps::Oscillator::TRIANGLE);
+	cOscillator.define_const("SQUARE",    Beeps::Oscillator::SQUARE);
+	cOscillator.define_const("SAWTOOTH",  Beeps::Oscillator::SAWTOOTH);
 }
 
 

data/.doc/ext/beeps/sound_player.cpp

@@ -54,27 +54,11 @@ VALUE stop(VALUE self)
 }
 
 static
-VALUE is_playing(VALUE self)
+VALUE get_state(VALUE self)
 {
 	CHECK;
 
-	return value(THIS->is_playing());
-}
-
-static
-VALUE is_paused(VALUE self)
-{
-	CHECK;
-
-	return value(THIS->is_paused());
-}
-
-static
-VALUE is_stopped(VALUE self)
-{
-	CHECK;
-
-	return value(THIS->is_stopped());
+	return value(THIS->state());
 }
 
 static
@@ -131,14 +115,17 @@ Init_beeps_sound_player ()
 	rb_define_method(cSoundPlayer, "pause", RUBY_METHOD_FUNC(pause), 0);
 	rb_define_method(cSoundPlayer, "rewind", RUBY_METHOD_FUNC(rewind), 0);
 	rb_define_method(cSoundPlayer, "stop", RUBY_METHOD_FUNC(stop), 0);
-	cSoundPlayer.define_method("playing?", is_playing);
-	cSoundPlayer.define_method("paused?",  is_paused);
-	cSoundPlayer.define_method("stopped?", is_stopped);
+	rb_define_method(cSoundPlayer, "state", RUBY_METHOD_FUNC(get_state), 0);
 	rb_define_method(cSoundPlayer, "gain=", RUBY_METHOD_FUNC(set_gain), 1);
 	rb_define_method(cSoundPlayer, "gain", RUBY_METHOD_FUNC(get_gain), 0);
 	rb_define_method(cSoundPlayer, "loop=", RUBY_METHOD_FUNC(set_loop), 1);
 	rb_define_method(cSoundPlayer, "loop", RUBY_METHOD_FUNC(get_loop), 0);
 	rb_define_singleton_method(cSoundPlayer, "stop_all", RUBY_METHOD_FUNC(stop_all), 0);
+
+	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);
 }
 
 

data/ChangeLog.md

@@ -1,6 +1,13 @@
 # beeps ChangeLog
 
 
+## [v0.1.41] - 2023-06-27
+
+- Add SoundPlayer#state()
+- Delete SoundPlayer#is_playing(), is_paused(), and is_stopped()
+- NONE -> TYPE_NONE
+
+
 ## [v0.1.40] - 2023-05-29
 
 - Update dependencies

data/VERSION

@@ -1 +1 @@
-0.1.40
+0.1.41

data/ext/beeps/oscillator.cpp

@@ -71,11 +71,12 @@ Init_beeps_oscillator ()
 	cOscillator.define_method("type",  get_type);
 	cOscillator.define_method("frequency=", set_frequency);
 	cOscillator.define_method("frequency",  get_frequency);
-	cOscillator.define_const("NONE",     Beeps::Oscillator::NONE);
-	cOscillator.define_const("SINE",     Beeps::Oscillator::SINE);
-	cOscillator.define_const("TRIANGLE", Beeps::Oscillator::TRIANGLE);
-	cOscillator.define_const("SQUARE",   Beeps::Oscillator::SQUARE);
-	cOscillator.define_const("SAWTOOTH", Beeps::Oscillator::SAWTOOTH);
+
+	cOscillator.define_const("TYPE_NONE", Beeps::Oscillator::TYPE_NONE);
+	cOscillator.define_const("SINE",      Beeps::Oscillator::SINE);
+	cOscillator.define_const("TRIANGLE",  Beeps::Oscillator::TRIANGLE);
+	cOscillator.define_const("SQUARE",    Beeps::Oscillator::SQUARE);
+	cOscillator.define_const("SAWTOOTH",  Beeps::Oscillator::SAWTOOTH);
 }
 
 

data/ext/beeps/sound_player.cpp

@@ -59,29 +59,11 @@ RUCY_DEF0(stop)
 RUCY_END
 
 static
-RUCY_DEF0(is_playing)
+RUCY_DEF0(get_state)
 {
 	CHECK;
 
-	return value(THIS->is_playing());
-}
-RUCY_END
-
-static
-RUCY_DEF0(is_paused)
-{
-	CHECK;
-
-	return value(THIS->is_paused());
-}
-RUCY_END
-
-static
-RUCY_DEF0(is_stopped)
-{
-	CHECK;
-
-	return value(THIS->is_stopped());
+	return value(THIS->state());
 }
 RUCY_END
 
@@ -144,14 +126,17 @@ Init_beeps_sound_player ()
 	cSoundPlayer.define_method("pause",  pause);
 	cSoundPlayer.define_method("rewind", rewind);
 	cSoundPlayer.define_method("stop",   stop);
-	cSoundPlayer.define_method("playing?", is_playing);
-	cSoundPlayer.define_method("paused?",  is_paused);
-	cSoundPlayer.define_method("stopped?", is_stopped);
+	cSoundPlayer.define_method("state",    get_state);
 	cSoundPlayer.define_method("gain=", set_gain);
 	cSoundPlayer.define_method("gain",  get_gain);
 	cSoundPlayer.define_method("loop=", set_loop);
 	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);
 }
 
 

data/include/beeps/generator.h

@@ -18,7 +18,7 @@ namespace Beeps
 
 		public:
 
-			enum Type {NONE = 0, SINE, TRIANGLE, SQUARE, SAWTOOTH};
+			enum Type {TYPE_NONE = 0, SINE, TRIANGLE, SQUARE, SAWTOOTH};
 
 			Oscillator (Type type = SINE);
 

data/include/beeps/sound.h

@@ -20,6 +20,19 @@ namespace Beeps
 
 		public:
 
+			enum State
+			{
+
+				STATE_UNKNOWN = 0,
+
+				PLAYING,
+
+				PAUSED,
+
+				STOPPED
+
+			};// State
+
 			SoundPlayer ();
 
 			~SoundPlayer ();
@@ -32,11 +45,7 @@ namespace Beeps
 
 			void stop ();
 
-			bool is_playing () const;
-
-			bool is_paused () const;
-
-			bool is_stopped () const;
+			State state () const;
 
 			void set_gain (float gain);
 

data/lib/beeps/processor.rb

@@ -36,7 +36,7 @@ module Beeps
   class Oscillator
 
     const_symbol_accessor :type, **{
-      none:     NONE,
+      none:     TYPE_NONE,
       sine:     SINE,
       triangle: TRIANGLE,
       square:   SQUARE,

data/lib/beeps/sound.rb

@@ -1,4 +1,5 @@
 require 'xot/setter'
+require 'xot/const_symbol_accessor'
 require 'xot/universal_accessor'
 require 'xot/block_util'
 require 'beeps/ext'
@@ -35,6 +36,25 @@ module Beeps
 
     include Xot::Setter
 
+    const_symbol_reader :state, **{
+      unknown: STATE_UNKNOWN,
+      playing: PLAYING,
+      paused:  PAUSED,
+      stopped: STOPPED
+    }
+
+    def playing?()
+      state == :playing
+    end
+
+    def paused?()
+      state == :paused
+    end
+
+    def stopped?()
+      state == :stopped
+    end
+
     universal_accessor :gain, :loop
 
   end# SoundPlayer

data/src/oscillator.cpp

@@ -15,7 +15,7 @@ namespace Beeps
 	struct Oscillator::Data
 	{
 
-		Type type       = NONE;
+		Type type       = TYPE_NONE;
 
 		float frequency = 440;
 
@@ -137,7 +137,7 @@ namespace Beeps
 	{
 		if (!Super::operator bool()) return false;
 		return
-			self->type != NONE && self->frequency > 0 &&
+			self->type != TYPE_NONE && self->frequency > 0 &&
 			(self->sine || self->square || self->saw);
 	}
 

data/src/sound.cpp

@@ -249,37 +249,21 @@ namespace Beeps
 			}
 		}
 
-		bool is_playing () const
+		SoundPlayer::State state () const
 		{
-			if (!*this) return false;
-
-			ALint state = 0;
-			alGetSourcei(self->id, AL_SOURCE_STATE, &state);
-			OpenAL_check_error(__FILE__, __LINE__);
-
-			return state == AL_PLAYING;
-		}
-
-		bool is_paused () const
-		{
-			if (!*this) return false;
-
-			ALint state = 0;
-			alGetSourcei(self->id, AL_SOURCE_STATE, &state);
-			OpenAL_check_error(__FILE__, __LINE__);
-
-			return state == AL_PAUSED;
-		}
-
-		bool is_stopped () const
-		{
-			if (!*this) return true;
+			if (!*this) return SoundPlayer::STATE_UNKNOWN;
 
 			ALint state = 0;
 			alGetSourcei(self->id, AL_SOURCE_STATE, &state);
 			OpenAL_check_error(__FILE__, __LINE__);
 
-			return state == AL_STOPPED;
+			switch (state)
+			{
+				case AL_PLAYING: return SoundPlayer::PLAYING;
+				case AL_PAUSED:  return SoundPlayer::PAUSED;
+				case AL_STOPPED: return SoundPlayer::STOPPED;
+				default:         return SoundPlayer::STATE_UNKNOWN;
+			}
 		}
 
 		void set_gain (float gain)
@@ -433,7 +417,7 @@ namespace Beeps
 					return;
 
 				source.queue(buffer);
-				if (source.is_stopped()) source.play();
+				if (source.state() == STOPPED) source.play();
 			}
 		}
 
@@ -476,10 +460,10 @@ namespace Beeps
 	{
 		auto it = std::remove_if(
 			global::players.begin(), global::players.end(),
-			[](auto& player) {return !player || player.is_stopped();});
-
-		for (auto jt = it; jt != global::players.end(); ++jt)
-			jt->self->clear();
+			[](auto& player)
+			{
+				return !player || player.state() == SoundPlayer::STOPPED;
+			});
 
 		global::players.erase(it, global::players.end());
 	}
@@ -488,7 +472,6 @@ namespace Beeps
 	get_next_player ()
 	{
 		SoundPlayer player = create_player();
-
 		if (player)
 			LOG("new player");
 
@@ -496,7 +479,7 @@ namespace Beeps
 		{
 			for (auto& p : global::players)
 			{
-				if (p && p.is_stopped())
+				if (p && p.state() == SoundPlayer::STOPPED)
 				{
 					player = reuse_player(&p);
 					LOG("reuse stopped player");
@@ -578,24 +561,13 @@ namespace Beeps
 		self->source.stop();
 	}
 
-	bool
-	SoundPlayer::is_playing () const
-	{
-		return
-			self->source.is_playing() ||
-			(self->is_streaming() && self->source.is_stopped());
-	}
-
-	bool
-	SoundPlayer::is_paused () const
-	{
-		return self->source.is_paused();
-	}
-
-	bool
-	SoundPlayer::is_stopped () const
+	SoundPlayer::State
+	SoundPlayer::state () const
 	{
-		return self->source.is_stopped() && !self->is_streaming();
+		State s = self->source.state();
+		if (s == STOPPED && self->is_streaming())
+			return PLAYING;
+		return s;
 	}
 
 	void
@@ -833,7 +805,7 @@ namespace Beeps
 #if 0
 		std::string ox = "";
 		for (auto& player : global::players)
-			ox += player.is_playing() ? 'o' : 'x';
+			ox += player.state() == SoundPlayer::PLAYING ? 'o' : 'x';
 		LOG("%d players. (%s)", global::players.size(), ox.c_str());
 #endif
 

data/test/test_sound_player.rb

@@ -31,26 +31,26 @@ class TestSoundPlayer < Test::Unit::TestCase
 
   def test_pause()
     p = sound.play
-    assert_equal [true,  false, false], [p.playing?, p.paused?, p.stopped?]
+    assert_equal :playing, p.state
     p.pause
-    assert_equal [false, true,  false], [p.playing?, p.paused?, p.stopped?]
+    assert_equal :paused,  p.state
 
     p = stream_sound.play
-    assert_equal [true,  false, false], [p.playing?, p.paused?, p.stopped?]
+    assert_equal :playing, p.state
     p.pause
-    assert_equal [false, true,  false], [p.playing?, p.paused?, p.stopped?]
+    assert_equal :paused,  p.state
   end
 
   def test_stop()
     p = sound.play
-    assert_equal [true,  false, false], [p.playing?, p.paused?, p.stopped?]
+    assert_equal :playing, p.state
     p.stop
-    assert_equal [false, false, true],  [p.playing?, p.paused?, p.stopped?]
+    assert_equal :stopped, p.state
 
     p = stream_sound.play
-    assert_equal [true,  false, false], [p.playing?, p.paused?, p.stopped?]
+    assert_equal :playing, p.state
     p.stop
-    assert_equal [false, false, true],  [p.playing?, p.paused?, p.stopped?]
+    assert_equal :stopped, p.state
   end
 
   def test_play_end_then_stop()
@@ -58,42 +58,68 @@ class TestSoundPlayer < Test::Unit::TestCase
     sec = s.seconds
 
     p = s.play
-    assert_equal [true,  false, false], [p.playing?, p.paused?, p.stopped?]
+    assert_equal :playing, p.state
     sleep sec * 2
-    assert_equal [false, false, true],  [p.playing?, p.paused?, p.stopped?]
+    assert_equal :stopped, p.state
 
     s = stream_sound
     p = s.play
-    assert_equal [true,  false, false], [p.playing?, p.paused?, p.stopped?]
+    assert_equal :playing, p.state
     sleep sec * 2
-    assert_equal [false, false, true],  [p.playing?, p.paused?, p.stopped?]
+    assert_equal :stopped, p.state
   end
 
   def test_play_after_pause()
     p = sound.play
     p.pause
-    assert_equal [false, true,  false], [p.playing?, p.paused?, p.stopped?]
+    assert_equal :paused,  p.state
     p.play
-    assert_equal [true,  false, false], [p.playing?, p.paused?, p.stopped?]
+    assert_equal :playing, p.state
 
     p = stream_sound.play
     p.pause
-    assert_equal [false, true,  false], [p.playing?, p.paused?, p.stopped?]
+    assert_equal :paused,  p.state
     p.play
-    assert_equal [true,  false, false], [p.playing?, p.paused?, p.stopped?]
+    assert_equal :playing, p.state
   end
 
   def test_stop_after_pause()
     p = sound.play
     p.pause
+    assert_equal :paused,  p.state
+    p.stop
+    assert_equal :stopped, p.state
+
+    p = stream_sound.play
+    p.pause
+    assert_equal :paused,  p.state
+    p.stop
+    assert_equal :stopped, p.state
+  end
+
+  def test_state()
+    p = sound.play
+    assert_equal :playing, p.state
+    assert_equal [true,  false, false], [p.playing?, p.paused?, p.stopped?]
+
+    p.pause
+    assert_equal :paused,  p.state
     assert_equal [false, true,  false], [p.playing?, p.paused?, p.stopped?]
+
     p.stop
+    assert_equal :stopped, p.state
     assert_equal [false, false, true],  [p.playing?, p.paused?, p.stopped?]
 
     p = stream_sound.play
+    assert_equal :playing, p.state
+    assert_equal [true,  false, false], [p.playing?, p.paused?, p.stopped?]
+
     p.pause
+    assert_equal :paused,  p.state
     assert_equal [false, true,  false], [p.playing?, p.paused?, p.stopped?]
+
     p.stop
+    assert_equal :stopped, p.state
     assert_equal [false, false, true],  [p.playing?, p.paused?, p.stopped?]
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beeps
 version: !ruby/object:Gem::Version
-  version: 0.1.40
+  version: 0.1.41
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-11 00:00:00.000000000 Z
+date: 2023-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot