reflexion 0.3.8.1 → 0.3.9

data/ext/reflex/native.cpp

@@ -21,7 +21,9 @@ void Init_reflex_focus_event ();
 void Init_reflex_key_event ();
 void Init_reflex_pointer_event ();
 void Init_reflex_wheel_event ();
+void Init_reflex_midi_event ();
 void Init_reflex_note_event ();
+void Init_reflex_control_change_event ();
 void Init_reflex_capture_event ();
 void Init_reflex_timer_event ();
 void Init_reflex_contact_event ();
@@ -75,7 +77,9 @@ extern "C" void
 	Init_reflex_key_event();
 	Init_reflex_pointer_event();
 	Init_reflex_wheel_event();
+	Init_reflex_midi_event();
 	Init_reflex_note_event();
+	Init_reflex_control_change_event();
 	Init_reflex_capture_event();
 	Init_reflex_timer_event();
 	Init_reflex_contact_event();

data/ext/reflex/view.cpp

@@ -1155,6 +1155,46 @@ RUCY_DEF1(on_wheel, event)
 }
 RUCY_END
 
+static
+RUCY_DEF1(on_midi, event)
+{
+	CHECK;
+	CALL(on_midi(to<Reflex::MIDIEvent*>(event)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(on_note, event)
+{
+	CHECK;
+	CALL(on_note(to<Reflex::NoteEvent*>(event)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(on_note_on, event)
+{
+	CHECK;
+	CALL(on_note_on(to<Reflex::NoteEvent*>(event)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(on_note_off, event)
+{
+	CHECK;
+	CALL(on_note_off(to<Reflex::NoteEvent*>(event)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(on_control_change, event)
+{
+	CHECK;
+	CALL(on_control_change(to<Reflex::ControlChangeEvent*>(event)));
+}
+RUCY_END
+
 static
 RUCY_DEF1(on_capture, event)
 {
@@ -1335,9 +1375,14 @@ Init_reflex_view ()
 	cView.define_method("on_pointer_up",     on_pointer_up);
 	cView.define_method("on_pointer_move",   on_pointer_move);
 	cView.define_method("on_pointer_cancel", on_pointer_cancel);
-	cView.define_method("on_wheel",   on_wheel);
-	cView.define_method("on_capture", on_capture);
-	cView.define_method("on_timer",   on_timer);
+	cView.define_method("on_wheel",          on_wheel);
+	cView.define_method("on_midi",           on_midi);
+	cView.define_method("on_note",           on_note);
+	cView.define_method("on_note_on",        on_note_on);
+	cView.define_method("on_note_off",       on_note_off);
+	cView.define_method("on_control_change", on_control_change);
+	cView.define_method("on_capture",  on_capture);
+	cView.define_method("on_timer",    on_timer);
 	cView.define_method(        "will_contact?",     will_contact);
 	cView.define_private_method("call_contact!",       on_contact);
 	cView.define_private_method("call_contact_begin!", on_contact_begin);
@@ -1346,7 +1391,7 @@ Init_reflex_view ()
 	cView.define_const("CAPTURE_NONE",    Reflex::View::CAPTURE_NONE);
 	cView.define_const("CAPTURE_KEY",     Reflex::View::CAPTURE_KEY);
 	cView.define_const("CAPTURE_POINTER", Reflex::View::CAPTURE_POINTER);
-	cView.define_const("CAPTURE_NOTE",    Reflex::View::CAPTURE_NOTE);
+	cView.define_const("CAPTURE_MIDI",    Reflex::View::CAPTURE_MIDI);
 	cView.define_const("CAPTURE_ALL",     Reflex::View::CAPTURE_ALL);
 
 	define_selector_methods<Reflex::View>(cView);

data/ext/reflex/window.cpp

@@ -413,6 +413,14 @@ RUCY_DEF1(on_wheel, event)
 }
 RUCY_END
 
+static
+RUCY_DEF1(on_midi, event)
+{
+	CHECK;
+	CALL(on_midi(to<Reflex::MIDIEvent*>(event)));
+}
+RUCY_END
+
 static
 RUCY_DEF1(on_note, event)
 {
@@ -437,6 +445,14 @@ RUCY_DEF1(on_note_off, event)
 }
 RUCY_END
 
+static
+RUCY_DEF1(on_control_change, event)
+{
+	CHECK;
+	CALL(on_control_change(to<Reflex::ControlChangeEvent*>(event)));
+}
+RUCY_END
+
 
 static Class cWindow;
 
@@ -489,10 +505,12 @@ Init_reflex_window ()
 	cWindow.define_method("on_pointer_up",     on_pointer_up);
 	cWindow.define_method("on_pointer_move",   on_pointer_move);
 	cWindow.define_method("on_pointer_cancel", on_pointer_cancel);
-	cWindow.define_method("on_wheel", on_wheel);
-	cWindow.define_method("on_note",     on_note);
-	cWindow.define_method("on_note_on",  on_note_on);
-	cWindow.define_method("on_note_off", on_note_off);
+	cWindow.define_method("on_wheel",          on_wheel);
+	cWindow.define_method("on_midi",           on_midi);
+	cWindow.define_method("on_note",           on_note);
+	cWindow.define_method("on_note_on",        on_note_on);
+	cWindow.define_method("on_note_off",       on_note_off);
+	cWindow.define_method("on_control_change", on_control_change);
 
 	cWindow.define_const("ORIENTATION_PORTRAIT",  Reflex::Window::FLAG_PORTRAIT);
 	cWindow.define_const("ORIENTATION_LANDSCAPE", Reflex::Window::FLAG_LANDSCAPE);

data/include/reflex/event.h

@@ -20,6 +20,7 @@ namespace Reflex
 	class Device;
 	class Shape;
 	class View;
+	class MIDI;
 
 
 	class Event
@@ -354,6 +355,63 @@ namespace Reflex
 	};// WheelEvent
 
 
+	class MIDIEvent : public Event
+	{
+
+		public:
+
+			enum Action
+			{
+
+				ACTION_NONE = 0,
+
+				NOTE_ON,
+
+				NOTE_OFF,
+
+				CONTROL_CHANGE,
+
+				PROGRAM_CHANGE,
+
+				CHANNEL_PRESSURE,
+
+				KEY_PRESSURE,
+
+				PITCH_BEND_CHANGE,
+
+				SYSTEM
+
+			};// Action
+
+			MIDIEvent ();
+
+			MIDIEvent (MIDI* midi, const uchar* bytes, double time);
+
+			MIDIEvent dup () const;
+
+			MIDI* midi () const;
+
+			Action action () const;
+
+			int channel () const;
+
+			uchar data1 () const;
+
+			uchar data2 () const;
+
+			bool is_captured () const;
+
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
+
+		private:
+
+			MIDIEvent (const MIDIEvent* src);
+
+	};// MIDIEvent
+
+
 	class NoteEvent : public Event
 	{
 
@@ -391,6 +449,37 @@ namespace Reflex
 	};// NoteEvent
 
 
+	class ControlChangeEvent : public Event
+	{
+
+		public:
+
+			ControlChangeEvent ();
+
+			ControlChangeEvent (
+				int channel, int controller, float value, double time);
+
+			ControlChangeEvent dup () const;
+
+			int channel () const;
+
+			int controller () const;
+
+			float value () const;
+
+			bool is_captured () const;
+
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
+
+		private:
+
+			ControlChangeEvent (const ControlChangeEvent* src);
+
+	};// ControlChangeEvent
+
+
 	class CaptureEvent : public Event
 	{
 

data/include/reflex/midi.h

@@ -30,12 +30,16 @@ namespace Reflex
 
 			virtual const char* name () const;
 
+			virtual void on_midi (MIDIEvent* e);
+
 			virtual void on_note     (NoteEvent* e);
 
 			virtual void on_note_on  (NoteEvent* e);
 
 			virtual void on_note_off (NoteEvent* e);
 
+			virtual void on_control_change (ControlChangeEvent* e);
+
 			virtual operator bool () const;
 
 			static const List& all ();

data/include/reflex/ruby/event.h

@@ -29,8 +29,12 @@ RUCY_DECLARE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::PointerEvent)
 
 RUCY_DECLARE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::WheelEvent)
 
+RUCY_DECLARE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::MIDIEvent)
+
 RUCY_DECLARE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::NoteEvent)
 
+RUCY_DECLARE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::ControlChangeEvent)
+
 RUCY_DECLARE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::CaptureEvent)
 
 RUCY_DECLARE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::TimerEvent)
@@ -74,9 +78,15 @@ namespace Reflex
 	REFLEX_EXPORT Rucy::Class wheel_event_class ();
 	// class Reflex::WheelEvent
 
+	REFLEX_EXPORT Rucy::Class midi_event_class ();
+	// class Reflex::MIDIEvent
+
 	REFLEX_EXPORT Rucy::Class note_event_class ();
 	// class Reflex::NoteEvent
 
+	REFLEX_EXPORT Rucy::Class control_change_event_class ();
+	// class Reflex::ControlChangeEvent
+
 	REFLEX_EXPORT Rucy::Class capture_event_class ();
 	// class Reflex::CaptureEvent
 
@@ -157,12 +167,24 @@ namespace Rucy
 		return Reflex::wheel_event_class();
 	}
 
+	template <> inline Class
+	get_ruby_class<Reflex::MIDIEvent> ()
+	{
+		return Reflex::midi_event_class();
+	}
+
 	template <> inline Class
 	get_ruby_class<Reflex::NoteEvent> ()
 	{
 		return Reflex::note_event_class();
 	}
 
+	template <> inline Class
+	get_ruby_class<Reflex::ControlChangeEvent> ()
+	{
+		return Reflex::control_change_event_class();
+	}
+
 	template <> inline Class
 	get_ruby_class<Reflex::CaptureEvent> ()
 	{

data/include/reflex/ruby/midi.h

@@ -7,6 +7,7 @@
 #include <rucy/class.h>
 #include <rucy/extension.h>
 #include <reflex/midi.h>
+#include <reflex/ruby/event.h>
 
 
 RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::MIDI)
@@ -28,6 +29,15 @@ namespace Reflex
 
 		public:
 
+			virtual void on_midi (MIDIEvent* e)
+			{
+				RUCY_SYM(on_midi);
+				if (this->is_overridable())
+					this->value.call(on_midi, Rucy::value(e));
+				else
+					Super::on_midi(e);
+			}
+
 			virtual void on_note (NoteEvent* e)
 			{
 				RUCY_SYM(on_note);
@@ -55,6 +65,15 @@ namespace Reflex
 					Super::on_note_off(e);
 			}
 
+			virtual void on_control_change (ControlChangeEvent* e)
+			{
+				RUCY_SYM(on_control_change);
+				if (this->is_overridable())
+					this->value.call(on_control_change, Rucy::value(e));
+				else
+					Super::on_control_change(e);
+			}
+
 	};// RubyMIDI
 
 

data/include/reflex/ruby/view.h

@@ -230,6 +230,51 @@ namespace Reflex
 					Super::on_wheel(e);
 			}
 
+			virtual void on_midi (MIDIEvent* e)
+			{
+				RUCY_SYM(on_midi);
+				if (this->is_overridable())
+					this->value.call(on_midi, Rucy::value(e));
+				else
+					Super::on_midi(e);
+			}
+
+			virtual void on_note (NoteEvent* e)
+			{
+				RUCY_SYM(on_note);
+				if (this->is_overridable())
+					this->value.call(on_note, Rucy::value(e));
+				else
+					Super::on_note(e);
+			}
+
+			virtual void on_note_on (NoteEvent* e)
+			{
+				RUCY_SYM(on_note_on);
+				if (this->is_overridable())
+					this->value.call(on_note_on, Rucy::value(e));
+				else
+					Super::on_note_on(e);
+			}
+
+			virtual void on_note_off (NoteEvent* e)
+			{
+				RUCY_SYM(on_note_off);
+				if (this->is_overridable())
+					this->value.call(on_note_off, Rucy::value(e));
+				else
+					Super::on_note_off(e);
+			}
+
+			virtual void on_control_change (ControlChangeEvent* e)
+			{
+				RUCY_SYM(on_control_change);
+				if (this->is_overridable())
+					this->value.call(on_control_change, Rucy::value(e));
+				else
+					Super::on_control_change(e);
+			}
+
 			virtual void on_capture (CaptureEvent* e)
 			{
 				RUCY_SYM(on_capture);

data/include/reflex/ruby/window.h

@@ -191,6 +191,15 @@ namespace Reflex
 					Super::on_wheel(e);
 			}
 
+			virtual void on_midi (MIDIEvent* e)
+			{
+				RUCY_SYM(on_midi);
+				if (this->is_overridable())
+					this->value.call(on_midi, Rucy::value(e));
+				else
+					Super::on_midi(e);
+			}
+
 			virtual void on_note (NoteEvent* e)
 			{
 				RUCY_SYM(on_note);
@@ -218,6 +227,15 @@ namespace Reflex
 					Super::on_note_off(e);
 			}
 
+			virtual void on_control_change (ControlChangeEvent* e)
+			{
+				RUCY_SYM(on_control_change);
+				if (this->is_overridable())
+					this->value.call(on_control_change, Rucy::value(e));
+				else
+					Super::on_control_change(e);
+			}
+
 	};// RubyWindow
 
 

data/include/reflex/view.h

@@ -82,9 +82,9 @@ namespace Reflex
 
 				CAPTURE_POINTER = Xot::bit(1),
 
-				CAPTURE_NOTE    = Xot::bit(2),
+				CAPTURE_MIDI    = Xot::bit(2),
 
-				CAPTURE_ALL     = CAPTURE_KEY | CAPTURE_POINTER | CAPTURE_NOTE,
+				CAPTURE_ALL     = CAPTURE_KEY | CAPTURE_POINTER | CAPTURE_MIDI,
 
 			};// Capture
 
@@ -382,12 +382,16 @@ namespace Reflex
 
 			virtual void on_wheel (WheelEvent* e);
 
+			virtual void on_midi (MIDIEvent* e);
+
 			virtual void on_note     (NoteEvent* e);
 
 			virtual void on_note_on  (NoteEvent* e);
 
 			virtual void on_note_off (NoteEvent* e);
 
+			virtual void on_control_change (ControlChangeEvent* e);
+
 			virtual void on_capture (CaptureEvent* e);
 
 			virtual void on_timer (TimerEvent* e);

data/include/reflex/window.h

@@ -135,12 +135,16 @@ namespace Reflex
 
 			virtual void on_wheel (WheelEvent* e);
 
+			virtual void on_midi (MIDIEvent* e);
+
 			virtual void on_note     (NoteEvent* e);
 
 			virtual void on_note_on  (NoteEvent* e);
 
 			virtual void on_note_off (NoteEvent* e);
 
+			virtual void on_control_change (ControlChangeEvent* e);
+
 			operator bool () const;
 
 			bool operator ! () const;

data/lib/reflex/midi_event.rb

@@ -0,0 +1,68 @@
+require 'xot/const_symbol_accessor'
+require 'reflex/ext'
+
+
+module Reflex
+
+
+  class MIDIEvent < Event
+
+    alias get_action action
+
+    const_symbol_reader :action, **{
+      none:              ACTION_NONE,
+      note_on:           NOTE_ON,
+      note_off:          NOTE_OFF,
+      control_change:    CONTROL_CHANGE,
+      program_change:    PROGRAM_CHANGE,
+      channel_pressure:  CHANNEL_PRESSURE,
+      key_pressure:      KEY_PRESSURE,
+      pitch_bend_change: PITCH_BEND_CHANGE,
+      system:            SYSTEM
+    }
+
+    def note_on?()
+      get_action == NOTE_ON
+    end
+
+    def note_off?()
+      get_action == NOTE_OFF
+    end
+
+    def control_change?()
+      get_action == CONTROL_CHANGE
+    end
+
+    alias cc? control_change?
+
+    def program_change?()
+      get_action == PROGRAM_CHANGE
+    end
+
+    alias pc? program_change?
+
+    def channel_pressure?()
+      get_action == CHANNEL_PRESSURE
+    end
+
+    def key_pressure?()
+      get_action == KEY_PRESSURE
+    end
+
+    def pitch_bend_change?()
+      get_action == PITCH_BEND_CHANGE
+    end
+
+    def system?()
+      get_action == SYSTEM
+    end
+
+    def inspect()
+      "#<Reflex::MIDIEvent action:%s channel:%d data:[%d, %d] captured?:%s>" %
+        [action, channel, data1, data2, captured?]
+    end
+
+  end# NoteEvent
+
+
+end# Reflex

data/lib/reflex/view.rb

@@ -49,7 +49,7 @@ module Reflex
     bit_flag_accessor :capture do
       flag :key,     CAPTURE_KEY
       flag :pointer, CAPTURE_POINTER
-      flag :note,    CAPTURE_NOTE
+      flag :midi,    CAPTURE_MIDI
       flag :all,     CAPTURE_ALL
     end
 
@@ -104,7 +104,7 @@ module Reflex
       if args.empty?
         not cap.empty?
       elsif args.include?(:all)
-        cap == [:key, :pointer, :note]
+        cap == [:key, :pointer, :midi]
       else
         args.all? {|type| cap.include? type}
       end

data/lib/reflex.rb

@@ -39,6 +39,7 @@ require 'reflex/focus_event'
 require 'reflex/key_event'
 require 'reflex/pointer_event'
 require 'reflex/wheel_event'
+require 'reflex/midi_event'
 require 'reflex/note_event'
 require 'reflex/capture_event'
 require 'reflex/timer_event'

data/reflex.gemspec

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