midinous 1.0.4 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '087d361408672ac98221ecb150db5de9a9174628926a161c397edbef8ab6c9c5'
-  data.tar.gz: 035ce40f9e72ee926cf06d03760eac8afe81165539c0c3fd0fcac221250a7c29
+  metadata.gz: 89ce42f2e2944cfdff16e619467accf34d03027a47151f67c21793fe9f794c6d
+  data.tar.gz: 89f30cf29078a6c1800015a9daff0573364623819b6f372de03e4b63a9ffe20a
 SHA512:
-  metadata.gz: cb1c9a4a684aacd1297515073797b0c9d6443cd2ac82307927a3eca537fb9837e2b4c34ca2941ef78c6265ce56064170a8bd263e7e4b1964c667d272d8211175
-  data.tar.gz: a10869ab6d2651dba2bd57ea6336fad8c41e40743cf615296c32ac66bbdd6fef90e5a711f720aa2c2fc05e3168b4e80be00961bae6653afd407f85cbb459bec2
+  metadata.gz: e52a3bf73a9e77ba7f7e5ca0d968c227c6ec090c4da2982fc77edf4c23030ffce31bc6696788f22349dd2aea8756e3735df7405d15673685935be9036cebd72b
+  data.tar.gz: e7d4013eb378bfb232c3bdc0bebc22bfbc8f9396d72097f61ef94ed6816e89264c0a017e8f34b9b669cdb7a26eb5f8a6cd23d40a4cf8e1cc5aff4bbd4c83a9ce

data/lib/midinous/canvas.rb

@@ -296,7 +296,6 @@ class Canvas_Control
 	
 	def canvas_del
 		@nouspoints = Pl.delete_points(@nouspoints)
-		UI::canvas.queue_draw
 	end
 	
 	def canvas_bg_draw(cr)

data/lib/midinous/extensions.rb

@@ -0,0 +1,92 @@
+#   Copyright (C) 2019 James "Nornec" Ratliff
+#
+#   This file is part of Midinous
+#
+#   Midinous is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   Midinous is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with Midinous.  If not, see <https://www.gnu.org/licenses/>.
+
+module UniMIDI
+	class Loader
+		class << self
+			def clear_devices
+				@devices = nil
+			end
+		end
+	end
+end
+
+module MIDIWinMM
+  module Map
+		def reattach_funcs
+			attach_function :midiInOpen, [:pointer, :uint, :input_callback, :DWORD_PTR, :DWORD], :MMRESULT
+		end
+	end
+	
+	#References MIDIWinMM\input.rb
+	class Input
+		def enable(options = {}, &block)
+      init_input_buffer
+      handle_ptr = FFI::MemoryPointer.new(FFI.type_size(:int))
+      initialize_local_buffer
+      @event_callback = get_event_callback
+      Map.winmm_func(:midiInOpen, handle_ptr, @id, @event_callback, 0, Device::WinmmCallbackFlag)
+      
+      @handle = handle_ptr.read_int
+      
+      #Map.winmm_func(:midiInPrepareHeader, @handle, @header.pointer, @header.size)      
+      #Map.winmm_func(:midiInAddBuffer, @handle, @header.pointer, @header.size)
+      Map.winmm_func(:midiInStart, @handle)
+
+      @enabled = true
+      
+      unless block.nil?
+        begin
+          yield(self)
+        ensure
+          close
+        end
+      else
+        self
+      end
+    end
+		alias_method :start, :enable
+    alias_method :open, :enable	
+	end
+
+	
+end
+
+class GuiListener < MIDIEye::Listener
+
+	GUI_LISTEN_INTERVAL = 1.0 / 10
+	
+	def gui_listen_loop
+    loop do
+      poll
+      @event.trigger_enqueued
+      sleep(GUI_LISTEN_INTERVAL)
+    end
+  end
+	
+	def gui_listen
+		@listener = Thread.new do
+			begin
+				gui_listen_loop
+			rescue Exception => exception
+				Thread.main.raise(exception)
+			end
+		end
+		@listener.abort_on_exception = true
+		true
+	end
+end

data/lib/midinous/init.rb

@@ -15,6 +15,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with Midinous.  If not, see <https://www.gnu.org/licenses/>.
 
+require "midinous/extensions"
 require "midinous/proc_midi"
 require "midinous/constants"
 require "midinous/logic"
@@ -22,6 +23,7 @@ require "midinous/style/ui"
 require "midinous/canvas"
 require "midinous/key_bindings"
 
+
 class Init_Prog
 
 	def initialize #Build the user interface, initiate the objects in the program
@@ -129,8 +131,8 @@ module Event_Router
 	UI::stop.signal_connect("button-press-event")             {CC.canvas_stop}
 	UI::play.signal_connect("button-press-event")             {CC.canvas_play}
 	UI::scale_combo.signal_connect("changed")                 {CC.set_scale(UI::scale_combo.active_iter[0],CC.root_note)}
-
-	#For menu items
+	
+	#For menu items	
 	UI::in_device_items.each_with_index  {|i, idx| i.signal_connect("button-press-event") {UI.set_device(idx,"i")}}
 	UI::out_device_items.each_with_index {|o, idx| o.signal_connect("button-press-event") {UI.set_device(idx,"o")}}
 	UI::in_channel_items.each do |i|      
@@ -139,6 +141,20 @@ module Event_Router
 			UI.regen_status
 		end
 	end
+
+	UI::edit_io.signal_connect("button-press-event") do
+		UI::clear_io_menu_items
+		Pm.regenerate
+		UI::set_io_menu_items
+		UI::in_device_items.each_with_index  {|i, idx| i.signal_connect("button-press-event") {UI.set_device(idx,"i")}}
+		UI::out_device_items.each_with_index {|o, idx| o.signal_connect("button-press-event") {UI.set_device(idx,"o")}}
+		UI::in_channel_items.each do |i|      
+			i.signal_connect("button-press-event") do
+				Pm.in_chan = i.label.to_i
+				UI.regen_status
+			end
+		end
+	end
 	
 	UI::help_about.signal_connect("button-press-event")       {UI::about_window.visible   = true}
 	UI::help_notes.signal_connect("button-press-event")       {UI::notes_window.visible   = true}
@@ -191,7 +207,7 @@ module Event_Router
 	UI::canvas.signal_connect("set-path-mode-v")              {Pl.set_path_mode("vert")}
 	UI::canvas.signal_connect("note-inc-up")                  {Pl.inc_note(1)}
 	UI::canvas.signal_connect("note-inc-dn")                  {Pl.inc_note(-1)}
-	UI::canvas.signal_connect("path-rotate-bck")              {Pl.play_mode_rotate_selected("-")}
-	UI::canvas.signal_connect("path-rotate-fwd")              {Pl.play_mode_rotate_selected("+")}
+	UI::canvas.signal_connect("path-rotate-bck")              {Pl.path_rotate("-")}
+	UI::canvas.signal_connect("path-rotate-fwd")              {Pl.path_rotate("+")}
 end
 

data/lib/midinous/logic.rb

@@ -117,10 +117,10 @@ module Logic_Controls #various reusable functions useful for checks and math
 		end
 	end
 	
-	def round_num_to_grid(num)
+	def round_num_to_grid(num) #2050
 		temp = num % CC.grid_spacing
 		num -= temp if temp < (CC.grid_spacing/2)
-		num -= n-temp+CC.grid_spacing if temp >= (CC.grid_spacing/2)
+		num  = (num-temp)+CC.grid_spacing if temp >= (CC.grid_spacing/2)
 		return num
 	end
 	

data/lib/midinous/points.rb

@@ -71,7 +71,7 @@ class Point_Logic
 	def set_note_via_devc(note)
 		CC.nouspoints.find_all(&:selected).each {|n| n.note = note}
 		Pm.note_send(Pm.in_chan,note,100)
-		GLib::Timeout.add(1000) do 
+		GLib::Timeout.add(100) do 
 			Pm.note_rlse(1,note)
 			false
 		end
@@ -129,34 +129,43 @@ class Point_Logic
 		@copy_pos = origins.min
 		@copy_type = type
 		@mempointsbuff = CC.nouspoints.find_all(&:selected)
+		@paste_count = 0
 	end		
 	def paste_points
 		return if @mempointsbuff.empty?
 		copy_lookup = {}
+		
+		# Clone the cut copy of pasted points if someone wants to cutpaste more than once
+		# Then turn the cut operation into the copy operation
+		copy_points("copy") if @paste_count == 1
 
 		# Clone the points and track old point => new point
 		@mempointsbuff.each do |n|
-				n.selected = false if @copy_type == "copy"
-				mem_point = n.clone
-				@mempoints << mem_point
-				copy_lookup[n.object_id] = mem_point
+			n.selected = false if @copy_type == "copy"
+			mem_point = n.clone
+			@mempoints << mem_point
+			copy_lookup[n.object_id] = mem_point
 		end
 
 		# Update the point relations
 		@mempoints.each do |n|
-				n.path_to   = n.path_to.map   { |pt| copy_lookup[pt.object_id] }.compact
-				n.path_from = n.path_from.map { |pf| copy_lookup[pf.object_id] }.compact
+			n.path_to   = n.path_to.map   { |pt| copy_lookup[pt.object_id] }.compact
+			n.path_from = n.path_from.map { |pf| copy_lookup[pf.object_id] }.compact
 		end
 		
 		@paste_count = 0 if @copy_type == "copy"
-		CC.nouspoints.reject!(&:selected) if @copy_type == "cut" && @paste_count == 0
+		delete_points(CC.nouspoints) if @copy_type == "cut" && @paste_count == 0
 		@paste_count += 1
-
+		
 		paste_pos = CC.mouse_last_pos
-		diff = round_to_grid([paste_pos[0] - @copy_pos[0],paste_pos[1] - @copy_pos[1]])
-		@mempoints.each {|m| m.set_destination(diff)}
+		diff = round_to_grid([paste_pos[0] - @copy_pos[0],paste_pos[1] - @copy_pos[1]])	
+		@mempoints.each do |m|
+			m.set_destination(diff)
+			m.selected = true
+		end
 		@mempoints.each {|m| CC.nouspoints << m} if paste_check(diff,@mempoints)
 		@mempoints = []
+		
 		populate_prop(CC.nouspoints)
 		UI::canvas.queue_draw
 	end
@@ -258,8 +267,8 @@ class Point_Logic
 				else UI::prop_mod_button.sensitive = false
 				end
 			when "X-coordinate", "Y-coordinate"
-				if round_num_to_grid(text.to_i) >= CC.grid_spacing && 
-				   round_num_to_grid(text.to_i) <= (CANVAS_SIZE - CC.grid_spacing)
+				if text.to_i >= CC.grid_spacing && 
+				   text.to_i <= (CANVAS_SIZE - CC.grid_spacing)
 				then
 						 UI::prop_mod_button.sensitive = true
 				else UI::prop_mod_button.sensitive = false
@@ -317,9 +326,9 @@ class Point_Logic
 			when "Channel"
 				points.find_all(&:selected).each {|p| p.channel = UI::prop_mod.text.to_i}
 			when "X-coordinate"
-				points.find(&:selected).x = UI::prop_mod.text.to_i
+				points.find(&:selected).x = round_num_to_grid(UI::prop_mod.text.to_i)
 			when "Y-coordinate"
-				points.find(&:selected).y = UI::prop_mod.text.to_i
+				points.find(&:selected).y = round_num_to_grid(UI::prop_mod.text.to_i)
 			when "Color"
 				points.find_all(&:selected).each {|p| p.set_default_color(hex_to_color("##{UI::prop_mod.text}"))}
 			when "Path Mode"
@@ -368,14 +377,17 @@ class Point_Logic
 					n.play_modes.rotate!(dir)	until n.play_modes[0] == "portal"
 				when "portal"
 					n.play_modes.rotate!(dir)	until n.play_modes[0] == "robin"
+				when "random","split"
+				  n.play_modes.rotate!(dir) until n.play_modes[0] == "robin"
 				end
 			else
 				n.play_modes.rotate!(dir)
 			end
+			populate_prop(CC.nouspoints.find_all)
 			UI::canvas.queue_draw
 		end
 	end
-	def play_mode_rotate_selected(dir)
+	def path_rotate(dir)
 		CC.nouspoints.find_all(&:selected).each do |n|
 			case dir
 			when "+"
@@ -384,6 +396,7 @@ class Point_Logic
 				n.path_to.rotate!(-1)
 			end
 		end
+
 		UI::canvas.queue_draw
 	end
 	
@@ -402,11 +415,15 @@ class Point_Logic
 		points.reject!(&:selected)
 		UI::prop_list_model.clear
 		UI::prop_mod.text = ""
+		UI::canvas.queue_draw
 		return points
 	end
 	def delete_paths_to(points)
 		points.find_all {|f| !f.path_to.length.zero? && f.selected == true}.each {|n| n.path_to.each {|b| b.path_from.reject! {|g| g == n }}}
-		points.find_all {|f| !f.path_to.length.zero? && f.selected == true}.each {|n| n.path_to = []}
+		points.find_all {|f| !f.path_to.length.zero? && f.selected == true}.each do |n| 
+		  n.path_to = []
+			play_mode_rotate(1)
+	  end
 		UI::canvas.queue_draw
 	end
 	def delete_paths_from(points)

data/lib/midinous/proc_midi.rb

@@ -15,34 +15,10 @@
 #   You should have received a copy of the GNU General Public License
 #   along with Midinous.  If not, see <https://www.gnu.org/licenses/>.
 
-class GuiListener < MIDIEye::Listener
-
-	GUI_LISTEN_INTERVAL = 1.0 / 10
-	
-	def gui_listen_loop
-    loop do
-      poll
-      @event.trigger_enqueued
-      sleep(GUI_LISTEN_INTERVAL)
-    end
-  end
-	
-	def gui_listen
-		@listener = Thread.new do
-			begin
-				gui_listen_loop
-			rescue Exception => exception
-				Thread.main.raise(exception)
-			end
-		end
-		@listener.abort_on_exception = true
-		true
-	end
-end
-
 class Proc_Midi
 	attr_accessor :out_list, :in_list, :in_chan
 	attr_reader   :out_id,   :in_id, :in, :midi_in
+
 	def initialize(oid,iid)
 		@out_list = []
 		@in_list  = []
@@ -54,12 +30,38 @@ class Proc_Midi
 		
 		@in_id  = iid
 		@in_list  = UniMIDI::Input.all
-		unless @in_list.empty?
+		unless @in_list.length <= 1
 			@in  = UniMIDI::Input.use(@in_id)
       set_listener
 		end
 	end
-	
+	def regenerate
+		@midi_in.close unless @midi_in.nil?
+		@in_list.each  do |i| 
+			#i.clear_buffer
+			i.close
+		end
+		@out_list.each {|o| o.close}
+		UniMIDI::Input.all.each  {|i| i = nil}
+		UniMIDI::Output.all.each {|o| o = nil}
+
+		@in = nil
+		@out = nil
+		
+		@in_list = []
+		@out_list = []
+		
+		UniMIDI::Loader.clear_devices
+
+		@in_list  = UniMIDI::Input.all
+		@out_list = UniMIDI::Output.all
+
+		UI.set_device(0,"i")
+		UI.set_device(0,"o")
+		
+		set_listener unless @in_list.length <= 1
+	end
+
 	#Restart the listener
 	def set_listener
 		@midi_in = GuiListener.new(@in)
@@ -71,15 +73,17 @@ class Proc_Midi
 	
 	#Select the output device
 	def sel_out(id)
+		@out = UniMIDI::Output.all[@out_id].close
 		@out = UniMIDI::Output.use(id)
 		@out_id = id
 	end
 	
 	#Select the input device
 	def sel_in(id)
+		@in = UniMIDI::Input.all[@in_id].close
 		@in = UniMIDI::Input.use(id)
 		@in_id = id
-		@midi_in.close
+		@midi_in.close unless @midi_in.nil?
 		set_listener
 	end
 	
@@ -109,7 +113,7 @@ class NoteSender
 	def stop
 		Pm.note_rlse(@chan,@note)
 	end
-	
+
 end
 
 Pm = Proc_Midi.new(0,0)

data/lib/midinous/style/midinous.glade

@@ -14,7 +14,7 @@ the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
 https://github.com/Nornec/Midinous
-https://nornec.bandcamp/com
+https://nornec.bandcamp.com
 https://youtube.com/nornec
 https://rubygems.org/gems/midinous</property>
   </object>
@@ -486,7 +486,7 @@ Ctrl+Q       -- Quit</property>
 		<property name="visible">True</property>
 		<property name="name">midinous_main</property>
     <property name="can_focus">False</property>
-		<property name="resizable">True</property>
+		<property name="resizable">false</property>
 		<property name="deletable">True</property>
 		<property name="title" translatable="yes">Midinous</property>
 		<property name="icon_name">accessories-calculator-symbolic</property>
@@ -567,6 +567,29 @@ Ctrl+Q       -- Quit</property>
                   </object>
                 </child>
               </object>
+            </child>
+						<child>
+              <object class="GtkMenuItem">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_Edit</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="edit_menu">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="edit_io">
+                        <property name="label">_IO Regenerate</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
             </child>
 						<child>
               <object class="GtkMenuItem">

data/lib/midinous/style/ui.rb

@@ -104,6 +104,9 @@ class UI_Elements
 		end
 		
 		#Menus
+		def edit_menu
+			@builder.get_object("edit_menu")
+		end
 		def input_menu
 			@builder.get_object("input_menu")
 		end
@@ -133,6 +136,9 @@ class UI_Elements
 		def file_quit
 			@builder.get_object("file_quit")
 		end
+		def edit_io
+			@builder.get_object("edit_io")
+		end
 		def help_about
 			@builder.get_object("help_about")
 		end		
@@ -299,18 +305,29 @@ class UI_Elements
 		def scale_display
 			@builder.get_object("scale_display")
 		end
-		
-		16.times.with_index {|i| @in_channel_items << Gtk::ImageMenuItem.new(label: (i+1).to_s)}
-		@in_channel_items.each {|i| input_channel_menu.append(i)}
-		input_channel_menu.show_all
-		
-		Pm.in_list.each  {|i| @in_device_items << Gtk::ImageMenuItem.new(label: i.name)}
-		@in_device_items.each  {|i| input_menu.append(i)}
-		input_menu.show_all
-		
-		Pm.out_list.each {|o| @out_device_items << Gtk::ImageMenuItem.new(label: o.name)}
-		@out_device_items.each {|o| output_menu.append(o)}
-		output_menu.show_all
+		def clear_io_menu_items
+			@in_channel_items.each {|i| input_channel_menu.remove(i)}
+			@in_channel_items = []
+			@in_device_items.each {|i| input_menu.remove(i)}
+			@in_device_items = []
+			@out_device_items.each {|o| output_menu.remove(o)}
+			@out_device_items = []
+		end
+		def set_io_menu_items
+			unless Pm.in_list.length <= 1
+				16.times.with_index {|i| @in_channel_items << Gtk::ImageMenuItem.new(label: (i+1).to_s)}
+				@in_channel_items.each {|i| input_channel_menu.append(i)}
+	
+				Pm.in_list.each  {|i| @in_device_items << Gtk::ImageMenuItem.new(label: i.name)}
+				@in_device_items.each  {|i| input_menu.append(i)}
+			end
+			Pm.out_list.each {|o| @out_device_items << Gtk::ImageMenuItem.new(label: o.name)}
+			@out_device_items.each {|o| output_menu.append(o)}
+			
+			input_channel_menu.show_all
+			input_menu.show_all
+			output_menu.show_all
+		end
 		
 		def set_device(id,type)
 			case type
@@ -323,7 +340,7 @@ class UI_Elements
 		end
 
 		def regen_status
-			unless Pm.in_list.empty?
+			unless Pm.in_list.length <= 1
 				status_area.text = "Using: Output[#{Pm.out_list[Pm.out_id].name}] "\
 				"Input[#{Pm.in_list[Pm.in_id].name} Channel: #{Pm.in_chan}]"
 			else
@@ -471,8 +488,10 @@ class UI_Elements
 		t_sig_label.markup      = "<b>#{t_sig_label.text}</b>"
 		scale_label.markup      = "<b>#{scale_label.text}</b>"
 		
+		set_io_menu_items
 		regen_status
 		
+		
 		#canvas.add_events(Gdk::EventMask::BUTTON_PRESS_MASK.nick) #This points to a nickname, basically a string like "button-press-mask" in this case
 
 		#Accel groups, parameter 2 is the modifier
@@ -631,6 +650,7 @@ class UI_Elements
 		@current_file = file_chooser.uri
 		operator = @current_file.sub("file:///","")
 		operator = operator.gsub("/","\\")
+		operator = operator.gsub("%20"," ")
 		
 		load = IO.binread(operator)
 		load = load.gsub("\r","")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midinous
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.8
 platform: ruby
 authors:
 - James "Nornec" Ratliff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2019-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3
@@ -66,6 +66,7 @@ files:
 - lib/midinous.rb
 - lib/midinous/canvas.rb
 - lib/midinous/constants.rb
+- lib/midinous/extensions.rb
 - lib/midinous/init.rb
 - lib/midinous/key_bindings.rb
 - lib/midinous/logic.rb
@@ -87,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="