voicemeeter_api_ruby 4.3.1 → 4.4.1

data/lib/voicemeeter/runvm.rb

@@ -1,31 +1,31 @@
-require_relative "cbindings"
-require_relative "kinds"
-
-module Voicemeeter
-  module RunVM
-    "
-    Starts Voicemeeter of the Kind requested.
-    "
-    include CBindings
-    include Kinds
-
-    def start(kind_id)
-      unless Kinds.kind_map.key? kind_id
-        raise VMRemoteErrors.new("Unknown Voicemeeter Kind.")
-      end
-
-      enums =
-        Kinds.kinds_all.map.with_index do |kind, i|
-          if CBindings::OS_BITS == 64 && kind.name.to_s == "potato"
-            [kind.name.to_s, i + 4]
-          else
-            [kind.name.to_s, i + 1]
-          end
-        end
-      exes = enums.to_h { |k, v| [k, v.to_i] }
-
-      CBindings.vm_runvm(exes[kind_id])
-      sleep(1)
-    end
-  end
-end
+require_relative "cbindings"
+require_relative "kinds"
+
+module Voicemeeter
+  module RunVM
+    "
+    Starts Voicemeeter of the Kind requested.
+    "
+    include CBindings
+    include Kinds
+
+    def start(kind_id)
+      unless Kinds.kind_map.key? kind_id
+        raise VMRemoteErrors.new("Unknown Voicemeeter Kind.")
+      end
+
+      enums =
+        Kinds.kinds_all.map.with_index do |kind, i|
+          if CBindings::OS_BITS == 64 && kind.name.to_s == "potato"
+            [kind.name.to_s, i + 4]
+          else
+            [kind.name.to_s, i + 1]
+          end
+        end
+      exes = enums.to_h { |k, v| [k, v.to_i] }
+
+      CBindings.vm_runvm(exes[kind_id])
+      sleep(1)
+    end
+  end
+end

data/lib/voicemeeter/strip.rb

@@ -96,10 +96,10 @@ module Voicemeeter
     end
 
     def get_level(mode)
-      if @remote.running
+      if @remote.running && @remote.event.ldirty
         vals = @remote.cache["strip_level"][@init, @offset]
       else
-        vals = (@init...@offset).map { |i| get_level(mode, i) }
+        vals = (@init...@init + @offset).map { |i| @remote.get_level(mode, i) }
       end
       vals.map { |x| x > 0 ? (20 * Math.log(x, 10)).round(1) : -200.0 }
     end

data/lib/voicemeeter/vban.rb

@@ -1,80 +1,80 @@
-require_relative "iremote"
-require_relative "meta"
-require_relative "errors"
-
-module Voicemeeter
-  class VbanStream < IRemote
-    "
-    A class representing a VBAN stream
-    "
-    include Vban_Meta_Functions
-
-    def initialize(remote, i)
-      super
-      self.make_accessor_bool :on
-      self.make_accessor_string :name, :ip
-      self.make_accessor_int :quality, :route
-    end
-
-    def identifier
-      "vban.#{self.direction}stream[#{@index}]"
-    end
-
-    def direction
-      raise "Called abstract mehod: direction"
-    end
-  end
-
-  class VbanInstream < VbanStream
-    "
-    A subclass representing a VBAN Instream
-    "
-    def initialize(remote, i)
-      super
-      self.make_reader_int :sr, :channel, :bit
-    end
-
-    def direction
-      :in
-    end
-  end
-
-  class VbanOutstream < VbanStream
-    "
-    A subclass representing a VBAN Outstream
-    "
-    def initialize(remote, i)
-      super
-      self.make_accessor_int :sr, :channel, :bit
-    end
-
-    def direction
-      :out
-    end
-  end
-
-  class Vban
-    attr_accessor :instream, :outstream
-
-    def initialize(remote, vban_streams)
-      "
-      Initializes a Vban class
-
-      Creates an array for each in/out stream
-      "
-      vban_in, vban_out = vban_streams.values
-      self.instream = (0...vban_in).map { |i| VbanInstream.new(remote, i) }
-      self.outstream = (0...vban_out).map { |i| VbanOutstream.new(remote, i) }
-
-      @remote = remote
-    end
-
-    def enable
-      @remote.set_parameter("vban.enable", 1)
-    end
-
-    def disable
-      @remote.set_parameter("vban.enable", 0)
-    end
-  end
-end
+require_relative "iremote"
+require_relative "meta"
+require_relative "errors"
+
+module Voicemeeter
+  class VbanStream < IRemote
+    "
+    A class representing a VBAN stream
+    "
+    include Vban_Meta_Functions
+
+    def initialize(remote, i)
+      super
+      self.make_accessor_bool :on
+      self.make_accessor_string :name, :ip
+      self.make_accessor_int :quality, :route
+    end
+
+    def identifier
+      "vban.#{self.direction}stream[#{@index}]"
+    end
+
+    def direction
+      raise "Called abstract mehod: direction"
+    end
+  end
+
+  class VbanInstream < VbanStream
+    "
+    A subclass representing a VBAN Instream
+    "
+    def initialize(remote, i)
+      super
+      self.make_reader_int :sr, :channel, :bit
+    end
+
+    def direction
+      :in
+    end
+  end
+
+  class VbanOutstream < VbanStream
+    "
+    A subclass representing a VBAN Outstream
+    "
+    def initialize(remote, i)
+      super
+      self.make_accessor_int :sr, :channel, :bit
+    end
+
+    def direction
+      :out
+    end
+  end
+
+  class Vban
+    attr_accessor :instream, :outstream
+
+    def initialize(remote, vban_streams)
+      "
+      Initializes a Vban class
+
+      Creates an array for each in/out stream
+      "
+      vban_in, vban_out = vban_streams.values
+      self.instream = (0...vban_in).map { |i| VbanInstream.new(remote, i) }
+      self.outstream = (0...vban_out).map { |i| VbanOutstream.new(remote, i) }
+
+      @remote = remote
+    end
+
+    def enable
+      @remote.set_parameter("vban.enable", 1)
+    end
+
+    def disable
+      @remote.set_parameter("vban.enable", 0)
+    end
+  end
+end

data/lib/voicemeeter/version.rb

@@ -1,25 +1,25 @@
-module Voicemeeter
-  module Version
-    module_function
-
-    def major
-      4
-    end
-
-    def minor
-      3
-    end
-
-    def patch
-      1
-    end
-
-    def to_a
-      [major, minor, patch]
-    end
-
-    def to_s
-      to_a.join(".")
-    end
-  end
-end
+module Voicemeeter
+  module Version
+    module_function
+
+    def major
+      4
+    end
+
+    def minor
+      4
+    end
+
+    def patch
+      1
+    end
+
+    def to_a
+      [major, minor, patch]
+    end
+
+    def to_s
+      to_a.join(".")
+    end
+  end
+end

data/lib/voicemeeter/worker.rb

@@ -0,0 +1,43 @@
+module Voicemeeter
+  module Worker
+    def init_worker
+      puts "Listening for #{@event.get.join(", ")} events"
+      @cache["strip_level"], @cache["bus_level"] = _get_levels
+      @running = true
+      Thread.new do
+        loop do
+          Thread.stop if !@running
+          if @event.pdirty && pdirty?
+            changed
+            notify_observers("pdirty")
+          end
+          if @event.mdirty && mdirty?
+            changed
+            notify_observers("mdirty")
+          end
+          if @event.midi && get_midi_message
+            changed
+            notify_observers("midi")
+          end
+          if @event.ldirty && ldirty?
+            changed
+            @_strip_comp =
+              @cache["strip_level"].map.with_index do |x, i|
+                !(x == @strip_buf[i])
+              end
+            @_bus_comp =
+              @cache["bus_level"].map.with_index { |x, i| !(x == @bus_buf[i]) }
+            @cache["strip_level"] = @strip_buf
+            @cache["bus_level"] = @bus_buf
+            notify_observers("ldirty")
+          end
+          sleep(@ratelimit)
+        end
+      end
+    end
+
+    def end_worker
+      @running = false
+    end
+  end
+end

data/lib/voicemeeter.rb

@@ -1,86 +1,9 @@
-require_relative "voicemeeter/base"
-require_relative "voicemeeter/strip"
-require_relative "voicemeeter/bus"
-require_relative "voicemeeter/button"
-require_relative "voicemeeter/vban"
-require_relative "voicemeeter/command"
-require_relative "voicemeeter/recorder"
-require_relative "voicemeeter/device"
-
-module Voicemeeter
-  include RunVM
-
-  private
-
-  class Remote < Base
-    include Kinds
-    "
-    Remote class, subclasses Base
-
-    Console layout built according to a kind
-
-    Offers a run method for resource closure.
-    "
-    def initialize(kind, **kwargs)
-      super
-      self.strip = Strip.make(self, kind.layout[:strip])
-      self.bus = Bus.make(self, kind.layout[:bus])
-      self.button = MacroButton.make(self, kind.layout[:mb])
-      self.vban = Vban.new(self, kind.layout[:vban])
-      self.command = Command.new(self)
-      self.recorder = Recorder.new(self)
-      self.device = Device.new(self)
-    end
-
-    def run
-      "
-      Handles login/logout
-
-      Starts/stops the observable thread.
-      "
-      login
-      init_thread
-
-      yield if block_given?
-    ensure
-      end_thread
-      logout
-    end
-  end
-
-  public
-
-  def self.remote(kind_id, **kwargs)
-    "
-    Factory method for remotes.
-
-    Creates a hash of remote classes, one for each kind.
-
-    Handles kind_id request errors.
-
-    Returns a remote class of the kind requested.
-    "
-    _remotes =
-      Kinds.kinds_all.to_h do |kind|
-        [kind.name.to_s, Remote.new(kind, **kwargs)]
-      end
-
-    unless _remotes.key? kind_id
-      raise VMRemoteErrors.new("Unknown Voicemeeter Kind.")
-    end
-    _remotes[kind_id]
-  end
-
-  def self.testing
-    "
-    Returns a random Remote class
-    "
-    unless ENV["RACK_ENV"] == "dev"
-      raise VMRemoteErrors.new("Not in developer mode")
-    end
-
-    Remote.new(Kinds.kinds_all.sample)
-  end
-
-  module_function :start
-end
+require_relative "voicemeeter/base"
+require_relative "voicemeeter/strip"
+require_relative "voicemeeter/bus"
+require_relative "voicemeeter/button"
+require_relative "voicemeeter/vban"
+require_relative "voicemeeter/command"
+require_relative "voicemeeter/recorder"
+require_relative "voicemeeter/device"
+require_relative "voicemeeter/remote"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voicemeeter_api_ruby
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.4.1
 platform: ruby
 authors:
 - onyx_online
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-06 00:00:00.000000000 Z
+date: 2022-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -93,16 +93,20 @@ files:
 - lib/voicemeeter/configs.rb
 - lib/voicemeeter/device.rb
 - lib/voicemeeter/errors.rb
+- lib/voicemeeter/event.rb
 - lib/voicemeeter/inst.rb
 - lib/voicemeeter/iremote.rb
 - lib/voicemeeter/kinds.rb
 - lib/voicemeeter/meta.rb
+- lib/voicemeeter/midi.rb
 - lib/voicemeeter/mixin.rb
 - lib/voicemeeter/recorder.rb
+- lib/voicemeeter/remote.rb
 - lib/voicemeeter/runvm.rb
 - lib/voicemeeter/strip.rb
 - lib/voicemeeter/vban.rb
 - lib/voicemeeter/version.rb
+- lib/voicemeeter/worker.rb
 homepage: https://rubygems.org/gems/voicemeeter_api_ruby
 licenses:
 - MIT