beeps 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99cc2d38469ff5c4a36bbca67ab0501a47e0aacac212f0f76771e961bb7a6ac7
-  data.tar.gz: 406ecb1ebe19efdb536de07efd3723f34eeba93cb89a82767501e94ef08320e1
+  metadata.gz: c4df684684e65c0ee091bb8054a55e57cee8e8d9b932382defa62229027cedb7
+  data.tar.gz: 6c59120efd1f32823ef0d1982f243106f38ea4543a568739e9739811ee1e3d4c
 SHA512:
-  metadata.gz: b3de02786df9756536f43cb41fe595e812394f6b0ecd8e2843489e394f53ed9892048138d3a9804fd1c1f44f19e15801af7180644915dfde6b7677f9c4dadc40
-  data.tar.gz: 65a636d6922a1dea98e2ea4f26139fe47a696343bb81b561c38d81f3680cefff8597c9d29e791c82026cf786e738ecf6dcf54340cb30812f6e2ed845c1be33f3
+  metadata.gz: db163aa74ddac2978422aa52b3bef3e157295aa93f46a79e8e32b88c0b0752f337cd6bc1636e53dae751ddaac554c86b4daa72ad57f038ddf3586078253bb669
+  data.tar.gz: 9997be8c7be61a021087d05b3e17aa695a07d3a70e9fed9bd61b3b82d66cda81c2e5279a74ef0100771281480d1ada8b9b52d6a936375f1a361fe6aa3d97d5bf

data/.doc/ext/beeps/adsr.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::ADSR)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::ADSR)
 
 #define THIS  to<Beeps::ADSR*>(self)
 

data/.doc/ext/beeps/analyser.cpp

@@ -6,7 +6,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::Analyser)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Analyser)
 
 #define THIS  to<Beeps::Analyser*>(self)
 

data/.doc/ext/beeps/file_in.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::FileIn)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::FileIn)
 
 #define THIS  to<Beeps::FileIn*>(self)
 

data/.doc/ext/beeps/gain.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::Gain)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Gain)
 
 #define THIS  to<Beeps::Gain*>(self)
 

data/.doc/ext/beeps/mic_in.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::MicIn)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::MicIn)
 
 #define THIS  to<Beeps::MicIn*>(self)
 

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

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::Oscillator)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Oscillator)
 
 #define THIS  to<Beeps::Oscillator*>(self)
 

data/.doc/ext/beeps/pitch_shift.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::PitchShift)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::PitchShift)
 
 #define THIS  to<Beeps::PitchShift*>(self)
 

data/.doc/ext/beeps/processor.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::Processor)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Processor)
 
 #define THIS  to<Beeps::Processor*>(self)
 

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

@@ -4,7 +4,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_FROM_TO(Beeps::Sound)
+RUCY_DEFINE_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Sound)
 
 #define THIS  to<Beeps::Sound*>(self)
 

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

@@ -4,7 +4,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_FROM_TO(Beeps::SoundPlayer)
+RUCY_DEFINE_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::SoundPlayer)
 
 #define THIS  to<Beeps::SoundPlayer*>(self)
 

data/.doc/ext/beeps/time_stretch.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::TimeStretch)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::TimeStretch)
 
 #define THIS  to<Beeps::TimeStretch*>(self)
 

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
@@ -24,7 +24,7 @@ jobs:
         run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
       - name: test
-        run: bundle exec rake quiet test
+        run: bundle exec rake quiet packages test
 
       - name: create gem
         id: gem

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,14 @@ jobs:
       - name: setup dependencies
         run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
+      - name: packages
+        run: bundle exec rake packages
+
+      - 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,21 @@
 # beeps ChangeLog
 
 
+## [v0.3] - 2024-07-06
+
+- Support Windows
+
+
+## [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/Rakefile

@@ -15,6 +15,8 @@ require 'beeps/extension'
 EXTENSIONS  = [Xot, Rucy, Beeps]
 TESTS_ALONE = ['test/test_beeps_init.rb']
 
+install_packages win32: %w[MINGW_PACKAGE_PREFIX-openal]
+
 use_external_library 'https://github.com/thestk/stk',
   tag:      '4.6.2',
   incdirs:  'include',
@@ -47,6 +49,6 @@ default_tasks :ext
 use_bundler
 build_native_library
 build_ruby_extension
-test_ruby_extension
+test_ruby_extension unless github_actions? && win32?
 generate_documents
 build_ruby_gem

data/VERSION

@@ -1 +1 @@
-0.2
+0.3

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.3'
+  s.add_runtime_dependency 'rucy', '~> 0.3'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/ext/beeps/adsr.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::ADSR)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::ADSR)
 
 #define THIS  to<Beeps::ADSR*>(self)
 

data/ext/beeps/analyser.cpp

@@ -6,7 +6,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::Analyser)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Analyser)
 
 #define THIS  to<Beeps::Analyser*>(self)
 

data/ext/beeps/defs.h

@@ -9,6 +9,8 @@
 #include "beeps/ruby/defs.h"
 
 
+using namespace Xot::Types;
+
 using namespace Rucy;
 
 

data/ext/beeps/extconf.rb

@@ -11,9 +11,17 @@ require 'beeps/extension'
 
 Xot::ExtConf.new Xot, Rucy, Beeps do
   setup do
-    headers    << 'ruby.h' << 'OpenAL/al.h' << 'OpenAL/alc.h'
-    frameworks << 'OpenAL' << 'AVFoundation' if osx?
-    $LDFLAGS   << ' -Wl,--out-implib=native.dll.a' if cygwin?
+    headers << 'ruby.h'
+
+    if win32?
+      headers    << 'AL/al.h'     << 'AL/alc.h'
+      libs       << 'openal' << 'ole32' << 'mf' << 'mfplat' << 'mfreadwrite' << 'mfuuid'
+    elsif osx?
+      headers    << 'OpenAL/al.h' << 'OpenAL/alc.h'
+      frameworks << 'OpenAL'      << 'AVFoundation'
+    end
+
+    $LDFLAGS << ' -Wl,--out-implib=native.dll.a' if mingw? || cygwin?
   end
 
   create_makefile 'beeps/native'

data/ext/beeps/file_in.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::FileIn)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::FileIn)
 
 #define THIS  to<Beeps::FileIn*>(self)
 

data/ext/beeps/gain.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::Gain)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Gain)
 
 #define THIS  to<Beeps::Gain*>(self)
 

data/ext/beeps/mic_in.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::MicIn)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::MicIn)
 
 #define THIS  to<Beeps::MicIn*>(self)
 

data/ext/beeps/oscillator.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::Oscillator)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Oscillator)
 
 #define THIS  to<Beeps::Oscillator*>(self)
 

data/ext/beeps/pitch_shift.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::PitchShift)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::PitchShift)
 
 #define THIS  to<Beeps::PitchShift*>(self)
 

data/ext/beeps/processor.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::Processor)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Processor)
 
 #define THIS  to<Beeps::Processor*>(self)
 

data/ext/beeps/sound.cpp

@@ -4,7 +4,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_FROM_TO(Beeps::Sound)
+RUCY_DEFINE_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Sound)
 
 #define THIS  to<Beeps::Sound*>(self)
 

data/ext/beeps/sound_player.cpp

@@ -4,7 +4,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_FROM_TO(Beeps::SoundPlayer)
+RUCY_DEFINE_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::SoundPlayer)
 
 #define THIS  to<Beeps::SoundPlayer*>(self)
 

data/ext/beeps/time_stretch.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Beeps::TimeStretch)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::TimeStretch)
 
 #define THIS  to<Beeps::TimeStretch*>(self)
 

data/include/beeps/debug.h

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

data/include/beeps/defs.h

@@ -8,6 +8,13 @@
 #include <xot/string.h>
 
 
+#if defined(WIN32) && defined(GCC) && defined(BEEPS)
+	#define BEEPS_EXPORT __declspec(dllexport)
+#else
+	#define BEEPS_EXPORT
+#endif
+
+
 namespace Beeps
 {
 

data/include/beeps/ruby/beeps.h

@@ -12,7 +12,7 @@ namespace Beeps
 {
 
 
-	Rucy::Module beeps_module ();
+	BEEPS_EXPORT Rucy::Module beeps_module ();
 	// module Beeps
 
 

data/include/beeps/ruby/exception.h

@@ -12,10 +12,10 @@ namespace Beeps
 {
 
 
-	Rucy::Class beeps_error_class ();
+	BEEPS_EXPORT Rucy::Class beeps_error_class ();
 	// class Beeps::BeepsError
 
-	Rucy::Class openal_error_class ();
+	BEEPS_EXPORT Rucy::Class openal_error_class ();
 	// class Beeps::OpenALError
 
 

data/include/beeps/ruby/filter.h

@@ -9,28 +9,28 @@
 #include <beeps/filter.h>
 
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Beeps::TimeStretch)
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::TimeStretch)
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Beeps::PitchShift)
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::PitchShift)
 
 
 namespace Beeps
 {
 
 
-	Rucy::Class gain_class ();
+	BEEPS_EXPORT Rucy::Class gain_class ();
 	// class Beeps::Gain
 
-	Rucy::Class adsr_class ();
+	BEEPS_EXPORT Rucy::Class adsr_class ();
 	// class Beeps::ADSR
 
-	Rucy::Class time_stretch_class ();
+	BEEPS_EXPORT Rucy::Class time_stretch_class ();
 	// class Beeps::TimeStretch
 
-	Rucy::Class pitch_shift_class ();
+	BEEPS_EXPORT Rucy::Class pitch_shift_class ();
 	// class Beeps::PitchShift
 
-	Rucy::Class analyser_class ();
+	BEEPS_EXPORT Rucy::Class analyser_class ();
 	// class Beeps::Analyser
 
 

data/include/beeps/ruby/generator.h

@@ -9,22 +9,22 @@
 #include <beeps/generator.h>
 
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Beeps::Oscillator)
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Oscillator)
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Beeps::FileIn)
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::FileIn)
 
 
 namespace Beeps
 {
 
 
-	Rucy::Class oscillator_class ();
+	BEEPS_EXPORT Rucy::Class oscillator_class ();
 	// class Beeps::Oscillator
 
-	Rucy::Class file_in_class ();
+	BEEPS_EXPORT Rucy::Class file_in_class ();
 	// class Beeps::FileIn
 
-	Rucy::Class mic_in_class ();
+	BEEPS_EXPORT Rucy::Class mic_in_class ();
 	// class Beeps::MicIn
 
 

data/include/beeps/ruby/processor.h

@@ -9,14 +9,14 @@
 #include <beeps/processor.h>
 
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Beeps::Processor)
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Processor)
 
 
 namespace Beeps
 {
 
 
-	Rucy::Class processor_class ();
+	BEEPS_EXPORT Rucy::Class processor_class ();
 	// class Beeps::Processor
 
 

data/include/beeps/ruby/sound.h

@@ -9,19 +9,19 @@
 #include <beeps/sound.h>
 
 
-RUCY_DECLARE_VALUE_FROM_TO(Beeps::SoundPlayer)
+RUCY_DECLARE_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::SoundPlayer)
 
-RUCY_DECLARE_VALUE_FROM_TO(Beeps::Sound)
+RUCY_DECLARE_VALUE_FROM_TO(BEEPS_EXPORT, Beeps::Sound)
 
 
 namespace Beeps
 {
 
 
-	Rucy::Class sound_player_class ();
+	BEEPS_EXPORT Rucy::Class sound_player_class ();
 	// class Beeps::SoundPlayer
 
-	Rucy::Class sound_class ();
+	BEEPS_EXPORT Rucy::Class sound_class ();
 	// class Beeps::Sound
 
 

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/lib/beeps/extension.rb

@@ -25,6 +25,10 @@ module Beeps
       root_dir 'lib'
     end
 
+    def ext_dir()
+      root_dir 'ext'
+    end
+
   end# Extension
 
 

data/src/beeps.cpp

@@ -1,5 +1,5 @@
 // -*- objc -*-
-#include "beeps/beeps.h"
+#include "beeps.h"
 
 
 #include "Stk.h"
@@ -16,6 +16,7 @@ namespace Beeps
 	void
 	init ()
 	{
+		Beeps_init();
 		OpenAL_init();
 
 		stk::Stk::setSampleRate(44100);
@@ -28,6 +29,7 @@ namespace Beeps
 		SoundPlayer_clear_streams();
 
 		OpenAL_fin();
+		Beeps_fin();
 	}
 
 	void

data/src/beeps.h

@@ -0,0 +1,22 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __BEEPS_SRC_BEEPS_H__
+#define __BEEPS_SRC_BEEPS_H__
+
+
+#include "beeps/beeps.h"
+
+
+namespace Beeps
+{
+
+
+	void Beeps_init ();
+
+	void Beeps_fin ();
+
+
+}// Beeps
+
+
+#endif//EOH

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();