voicemeeter_api_ruby 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bef8ab40208452163296fb8d4c40654a2a28b98e897d3fc27fc848b78f8ba11
-  data.tar.gz: 5362e5f27306ba5c311e5dd934ca01dd153747528727e4437e605e5c32063949
+  metadata.gz: b3a0e9817ffa5ec8ae524a4af3fe6a64f9f85277a83cb6e39c64f7746006a564
+  data.tar.gz: eecdc15368fb025b6632961ab3df850ac505e79de105f472569e6b0678dd96d9
 SHA512:
-  metadata.gz: 620076c47a8cad5c8698949369a92d9dede2b498b921f1b4ad3e55fa08cbed66f20190356fa818124521e1f1580348938a241e8bc77a12c0016da3f84a105170
-  data.tar.gz: 150032337a426731a12f0e012cc9bc7a24572bfe0caaceaee3f89e8fed77a42129e16d5883066f776003c307258fc01c4c925259190e82a6911339a842b81f3e
+  metadata.gz: 390dda38c9597c3996d913b3c5c0462307ffd7df102ca5fad2879e76b682104b373ecb5c9b0879911cee20622decfece3f0756082d7d1c85e3ad349ace1a547f
+  data.tar.gz: fd2bf7bfb8bd6157f4dc54e22e1636629ae7a934c466752ddc2f3fda23b9abebef31f5002435dcc4d75075fe792e34aad78295296c5910b107a72adad261750b

data/lib/base.rb

@@ -65,27 +65,38 @@ module Base
         end
     end
 
-    def polling(func)
-        MAX_POLLS.times do
-            return true if func.include?('param') && self.pdirty
-            return true if func.include?('macro') && self.mdirty
-            sleep(DELAY)
+    def polling(func, name=nil, id=nil, mode=nil)
+        params = {
+            "get_parameter" => name,
+            "macro_getstatus" => "mb_#{id}_#{mode}"
+        }
+        MAX_POLLS.times do |i|
+            if @cache.key? params[func]
+                if func.include?('param') && self.pdirty ||
+                func.include?('macro') && self.mdirty
+                    return @cache.delete(params[func])[0]
+                end
+                sleep(DELAY)
+                break if @cache[params[func]][1] == false && i == 1
+            end
         end
-        false
+
+        val = yield
+        self.cache.store(params[func], [val, false])
+        val
     end
 
     def retval=(values)
         """ Writer validation for CAPI calls """
         retval, func = *values
         raise CAPIErrors.new(retval, func) if retval&.nonzero?
-
         @retval = retval
     end
 
     def run_as(func, *args)
         val = send('vmr_' + func, *args)
         self.retval = [val, func]
-        sleep(DELAY)
+        sleep(DELAY) if func.include?('set') && @wait
     end
 end
 

data/lib/button.rb

@@ -18,6 +18,12 @@ class IMacroButton
     def setter(set, mode)
         @remote.macro_setstatus(@index, set, mode)
     end
+
+    def set_multi(param_hash)
+        param_hash.each do |(key,val)|
+            self.send("#{key}=", val)
+        end
+    end
 end
 
 

data/lib/channel.rb

@@ -22,4 +22,10 @@ class IChannel
     def cmd
         raise NotImplementedError
     end
+
+    def set_multi(param_hash)
+        param_hash.each do |(key,val)|
+            self.send("#{key}=", val)
+        end
+    end
 end

data/lib/command.rb

@@ -23,7 +23,7 @@ end
 class Command < ICommand
     def initialize(remote)
         super
-        self.make_writer_only :show, :restart, :reset, :shutdown
+        self.make_action_prop :show, :restart, :reset, :shutdown
         self.make_writer_bool :showvbanchat, :lock
     end
 

data/lib/meta.rb

@@ -225,17 +225,25 @@ end
 
 module Commands_Meta_Functions
     include Meta_Functions
+    def make_action_prop(*params)
+        params.each do |param|
+            define_singleton_method("#{param}") do
+                self.setter("#{param}", 1)
+            end
+        end
+    end
+
     def make_writer_bool(*params)
         params.each do |param|
             cmds = {
                 :showvbanchat => 'DialogShow.VBANCHAT',
             }
             if cmds[param] then val = cmds[param] else val = param end
-    
+
             opts = [false, true]
             define_singleton_method("#{param}=") do |value|
-                raise OutOfBoundsErrors.new(opts[param]) unless opts.include? value
-                self.setter("#{val}", value ? 1 : 0)
+                raise OutOfBoundsErrors.new(opts) unless opts.include? value
+                self.setter("#{param}", value ? 1 : 0)
             end
         end
     end

data/lib/routines.rb

@@ -19,7 +19,7 @@ class Routines
     attr_accessor :properties, :layout, :strip, :bus, :button, :vban, :command,
     :recorder
 
-    attr_reader :retval, :cache
+    attr_reader :retval, :cache, :wait
 
     SIZE = 1
     BUFF = 512
@@ -27,14 +27,8 @@ class Routines
     def initialize(kind)
         define_version(kind)
 
-        self.strip = Strip.make(self, @layout[:strip], @layout[:bus])
-        self.bus = Bus.make(self, @layout[:bus])
-        self.button = MacroButton.make(self, @layout[:mb])
-        self.vban = Vban.make(self, @layout[:vban])
-        self.command = Command.new(self)
-        self.recorder = Recorder.new(self, @layout[:bus])
-
         self.cache = Hash.new
+        @wait = true
     end
 
     def login
@@ -56,19 +50,16 @@ class Routines
     end
 
     def get_parameter(name, is_string=false)
-        if self.polling(__method__.to_s)
-            val = @cache.delete(name)
-            return val
-        end
-
-        if is_string
-            c_get = FFI::MemoryPointer.new(:string, BUFF, true)
-            run_as("get_parameter_string", name, c_get)
-            c_get.read_string
-        else
-            c_get = FFI::MemoryPointer.new(:float, SIZE)
-            run_as("get_parameter_float", name, c_get)
-            c_get.read_float.round(1)
+        self.polling("get_parameter", name) do
+            if is_string
+                c_get = FFI::MemoryPointer.new(:string, BUFF, true)
+                run_as("get_parameter_string", name, c_get)
+                c_get.read_string
+            else
+                c_get = FFI::MemoryPointer.new(:float, SIZE)
+                run_as("get_parameter_float", name, c_get)
+                c_get.read_float.round(1)
+            end
         end
     end
 
@@ -78,51 +69,47 @@ class Routines
         else    
             run_as("set_parameter_float", name, value.to_f)
         end
-        self.cache.store(name, value)
+        self.cache.store(name, [value, true])
     end
 
     def macro_getstatus(id, mode)
-        if self.polling(__method__.to_s)
-            val = @cache.delete("mb_#{id}_#{mode}")
-            return val
+        self.polling("macro_getstatus", name=nil, id, mode) do
+            c_get = FFI::MemoryPointer.new(:float, SIZE)
+            run_as("macro_getstatus", id, c_get, mode)
+            c_get.read_float.to_i
         end
-
-        c_get = FFI::MemoryPointer.new(:float, SIZE)
-        run_as("macro_getstatus", id, c_get, mode)
-        c_get.read_float.to_i
     end
 
     def macro_setstatus(id, state, mode)
         run_as("macro_setstatus", id, state, mode)
-        self.cache.store("mb_#{id}_#{mode}", state)
+        self.cache.store("mb_#{id}_#{mode}", [state, true])
     end
 
     def set_parameter_multi(param_hash)
+        @wait = false
         param_hash.each do |(key,val)|
-            prop, m2, m3, *remaining = key.to_s.split('_')
-            if m2.to_i.to_s == m2 then m2 = m2.to_i end
-            if m3.to_i.to_s == m3 then m3 = m3.to_i end
-
-            param_hash[key].each do |(k,v)|
-                param = k
-                value = v
-
-                case prop
-                when "strip"
-                    self.strip[m2].send("#{param}=", value)
-                when "bus"
-                    self.bus[m2].send("#{param}=", value)
-                when "button"
-                    self.button[m2].send("#{param}=", value)
-                when "vban"
-                    if m2 == "instream"
-                        self.vban.instream[m3].send("#{param}=", value)
-                    else
-                        self.vban.outstream[m3].send("#{param}=", value)
-                    end
+            prop, m2, m3, *rem = key.to_s.split('_')
+            if m2.to_i.to_s == m2 then m2 = m2.to_i
+            elsif m3.to_i.to_s == m3 then m3 = m3.to_i end
+
+            case prop
+            when "strip"
+                self.strip[m2].set_multi(val)
+            when "bus"
+                self.bus[m2].set_multi(val)
+            when "button", "mb"
+                self.button[m2].set_multi(val)
+            when "vban"
+                if ["instream", "in"].include? m2
+                    self.vban.instream[m3].set_multi(val)
+                elsif ["outstream", "out"].include? m2
+                    self.vban.outstream[m3].set_multi(val)
                 end
             end
         end
+        @wait = true
     end
     alias_method "set_multi", :set_parameter_multi
+    alias_method "set", :set_parameter
+    alias_method "get", :get_parameter
 end

data/lib/strip.rb

@@ -24,6 +24,7 @@ class Strip < IChannel
         super(remote, i)
         self.make_accessor_bool :solo, :mute, :mono
         self.make_accessor_float :gain
+        self.make_accessor_string :label
         self._make_channel_props(num_A, num_B)
     end
 

data/lib/vban.rb

@@ -27,6 +27,12 @@ class IVban
     def direction
         raise NotImplementedError
     end
+
+    def set_multi(param_hash)
+        param_hash.each do |(key,val)|
+            self.send("#{key}=", val)
+        end
+    end
 end
 
 
@@ -69,6 +75,7 @@ class Vban < IVban
     end
 end
 
+
 class VbanInstream < Vban
     def initialize(remote, i)
         super
@@ -80,6 +87,7 @@ class VbanInstream < Vban
     end
 end
 
+
 class VbanOutstream < Vban
     def initialize(remote, i)
         super

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Voicemeeter_API_Ruby
-    VERSION = '2.0.2'
+    VERSION = '2.0.3'
 end

data/lib/voicemeeter.rb

@@ -9,12 +9,21 @@ module Voicemeeter
             end
         end
 
+        def initialize(kind)
+            super
+            self.strip = Strip.make(self, @layout[:strip], @layout[:bus])
+            self.bus = Bus.make(self, @layout[:bus])
+            self.button = MacroButton.make(self, @layout[:mb])
+            self.vban = Vban.make(self, @layout[:vban])
+            self.command = Command.new(self)
+            self.recorder = Recorder.new(self, @layout[:bus])
+        end
+
         def run
-            if block_given?
-                yield
-                
-                logout
-            end
+            yield if block_given?
+            
+        ensure
+            logout
         end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voicemeeter_api_ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - onyx_online
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi