voicemeeter_api_ruby 2.0.4 → 4.1.0

data/lib/recorder.rb

@@ -1,45 +1,20 @@
+require_relative 'iremote'
 require_relative 'meta'
 
+class Recorder < IRemote
+    '
+    Concrete Recorder class
+    '
 
-class IRecorder
-    """
-    Base class for Recorder object
-    """
-    include Meta_Functions
-
-    attr_accessor :remote
-
-    def initialize(remote)
-        self.remote = remote
-    end
-
-    def getter(param)
-        @remote.get_parameter("#{self.cmd}.#{param}")
-    end
-
-    def setter(param, value)
-        @remote.set_parameter("#{self.cmd}.#{param}", value)
-    end
-
-    def cmd
-        raise NotImplementedError
-    end
-end
-
-
-class Recorder < IRecorder
-    """
-    Concrete class for recorder
-    """
     def initialize(remote)
-        super(remote)
-        self.make_writer_only :play, :stop, :record, :ff, :rew
+        super
+        self.make_action_prop :play, :stop, :record, :ff, :rew
 
-        num_A, num_B = remote.layout[:bus].map { |k, v| v }
+        num_A, num_B = remote.kind.layout[:bus].values
         self.make_accessor_bool *make_channel_props(num_A, num_B)
     end
 
-    def cmd
-        return "recorder"
+    def identifier
+        :recorder
     end
 end

data/lib/runvm.rb

@@ -1,18 +1,29 @@
-require_relative 'base'
+require_relative 'cbindings'
+require_relative 'kinds'
 
-include Base
+include CBindings
+include Kinds
 
 module RunVM
-    """
+    '
     Starts Voicemeeter of the Kind requested.
-    """
-    def start(kind)
-        enums = $kinds_all.map.with_index do |val, i|
-            get_arch == 64 && val == "potato" ? [val, i+4] : [val, i+1]
+    '
+    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 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] }
 
-        run_as('runvm', exes[kind])
+        send(:vm_runvm, exes[kind_id])
         sleep(1)
     end
 end

data/lib/strip.rb

@@ -1,19 +1,26 @@
-require_relative 'channel'
+require_relative 'iremote'
+require_relative 'mixin'
 
+class Strip < IRemote
+    '
+    Concrete Strip class
+    '
+    include Channel_Meta_Functions
+    include Fades
+
+    attr_accessor :gainlayer, :levels
 
-class Strip < IChannel
-    """
-    Concrete class for Strip objects
-    """
     def self.make(remote, layout_strip)
-        "
+        '
         Factory function for Strip classes.
-        "
-        p_in, v_in = layout_strip.map { |k, v| v }
+        '
+        p_in, v_in = layout_strip.values
         (0...(p_in + v_in)).map do |i|
-            i < p_in ? \
-            PhysicalStrip.new(remote, i) : \
-            VirtualStrip.new(remote, i) 
+            if i < p_in
+                PhysicalStrip.new(remote, i)
+            else
+                VirtualStrip.new(remote, i)
+            end
         end
     end
 
@@ -21,22 +28,25 @@ class Strip < IChannel
         super
         self.make_accessor_bool :solo, :mute, :mono
         self.make_accessor_float :gain
+        self.make_accessor_int :limit
         self.make_accessor_string :label
 
-        num_A, num_B = remote.layout[:bus].map { |k, v| v }
+        num_A, num_B = remote.kind.layout[:bus].values
         self.make_accessor_bool *make_channel_props(num_A, num_B)
+
+        @gainlayer = (0...8).map { |j| GainLayer.new(remote, i, j) }
+        @levels = StripLevels.new(remote, i)
     end
 
-    def cmd
-        return "Strip[#{@index}]"
+    def identifier
+        "strip[#{@index}]"
     end
 end
 
 class PhysicalStrip < Strip
     def initialize(remote, i)
         super
-        self.make_accessor_float :comp, :gate
-        self.make_accessor_int :limit
+        self.make_accessor_float :comp, :gate, :audibility
         self.make_reader_only :device, :sr
     end
 end
@@ -44,6 +54,78 @@ end
 class VirtualStrip < Strip
     def initialize(remote, i)
         super
-        self.make_accessor_bool :mc, :k
+        self.make_accessor_bool :mc
+        self.make_accessor_int :k
+        self.make_accessor_float :bass, :mid, :treble
+    end
+
+    def appgain(name, gain)
+        self.setter('AppGain', "(\"#{name}\", #{gain})")
+    end
+
+    def appmute(name, mute)
+        self.setter('AppMute', "(\"#{name}\", #{mute ? 1 : 0})")
+    end
+end
+
+class GainLayer < IRemote
+    def initialize(remote, i, j)
+        super(remote, i)
+        @j = j
     end
+
+    def identifier
+        "strip[#{@index}]"
+    end
+
+    def gain
+        self.getter("gainlayer[#{@j}]")
+    end
+
+    def gain=(value)
+        self.setter("gainlayer[#{@j}]", value)
+    end
+end
+
+class StripLevels < IRemote
+    def initialize(remote, i)
+        super
+        if i < @remote.p_in
+            @init = i * 2
+            @offset = 2
+        else
+            @init = (@remote.p_in * 2) + ((i - @remote.p_in) * 8)
+            @offset = 8
+        end
+    end
+
+    def identifier
+        "strip[#{@index}]"
+    end
+
+    def get_level(mode)
+        if @remote.running
+            vals = @remote.cache['strip_level'][@init, @offset]
+        else
+            vals = (@init...@offset).map { |i| get_level(mode, i) }
+        end
+        vals.map { |x| x > 0 ? (20 * Math.log(x, 10)).round(1) : -200.0 }
+    end
+
+    def prefader
+        @remote.strip_mode = 0
+        get_level(0)
+    end
+
+    def postfader
+        @remote.strip_mode = 1
+        get_level(1)
+    end
+
+    def postmute
+        @remote.strip_mode = 2
+        get_level(2)
+    end
+
+    def isdirty?() = @remote._strip_comp[@init, @offset].any?
 end

data/lib/vban.rb

@@ -1,106 +1,78 @@
+require_relative 'iremote'
 require_relative 'meta'
 require_relative 'errors'
 
-
-class IVban
-    """
-    Base class for Vban objects
-    """
+class VbanStream < IRemote
+    '
+    A class representing a VBAN stream
+    '
     include Vban_Meta_Functions
 
-    attr_accessor :remote, :index
-
-    def initialize(remote, index)
-        self.remote = remote
-        self.index = index
-    end
-
-    def getter(param, is_string=false)
-        @remote.get_parameter("#{self.cmd}.#{param}", is_string)
-    end
-
-    def setter(param, value)
-        @remote.set_parameter("#{self.cmd}.#{param}", value)
+    def initialize(remote, i)
+        super
+        self.make_accessor_bool :on
+        self.make_accessor_string :name, :ip
+        self.make_accessor_int :quality, :route
     end
 
-    def cmd
-        return "vban.#{self.direction}stream[#{@index}]"
+    def identifier
+        "vban.#{self.direction}stream[#{@index}]"
     end
 
     def direction
-        raise NotImplementedError
-    end
-
-    def set_multi(param_hash)
-        param_hash.each do |(key,val)|
-            self.send("#{key}=", val)
-        end
+        raise 'Called abstract mehod: direction'
     end
 end
 
-
-class Vban < IVban
-    """
-    Concrete class for Vban objects
-    """
-    def self.make(remote, vban_streams)
-        "
-        Factory function for Vban class.
-
-        Returns a mixin of instream/outstream subclasses
-        "
-        class << self
-            attr_accessor :instream, :outstream, :remote
-
-            def enable
-                @remote.set_parameter("vban.enable", 1)
-            end
-            def disable
-                @remote.set_parameter("vban.enable", 0)
-            end
-        end
-
-        self.instream = 
-        (0...vban_streams[:instream]).map do |i|
-            VbanInstream.new(remote, i)
-        end
-        self.outstream = 
-        (0...vban_streams[:outstream]).map do |i|
-            VbanOutstream.new(remote, i)
-        end
-
-        self.remote = remote
-        return self
-    end
-
+class VbanInstream < VbanStream
+    '
+    A subclass representing a VBAN Instream
+    '
     def initialize(remote, i)
         super
-        self.make_accessor_bool :on
-        self.make_accessor_string :name, :ip
-        self.make_accessor_int :quality, :route
+        self.make_reader_int :sr, :channel, :bit
     end
-end
 
+    def direction
+        :in
+    end
+end
 
-class VbanInstream < Vban
+class VbanOutstream < VbanStream
+    '
+    A subclass representing a VBAN Outstream
+    '
     def initialize(remote, i)
         super
-        self.make_reader_int :sr, :channel, :bit
+        self.make_accessor_int :sr, :channel, :bit
     end
 
     def direction
-        return "in"
+        :out
     end
 end
 
+class Vban
+    attr_accessor :instream, :outstream
 
-class VbanOutstream < Vban
-    def initialize(remote, i)
-        super
-        self.make_accessor_int :sr, :channel, :bit
+    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 direction
-        return "out"
+    def enable
+        @remote.set_parameter('vban.enable', 1)
+    end
+
+    def disable
+        @remote.set_parameter('vban.enable', 0)
     end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Voicemeeter_API_Ruby
-    VERSION = '2.0.4'
+    VERSION = '4.1.0'
 end

data/lib/voicemeeter.rb

@@ -1,60 +1,86 @@
-require_relative 'routines'
-require_relative 'errors'
-
+require_relative 'base'
+require_relative 'strip'
+require_relative 'bus'
+require_relative 'button'
+require_relative 'vban'
+require_relative 'command'
+require_relative 'recorder'
+require_relative 'device'
 
 module Voicemeeter
     include RunVM
 
     private
-    class Remote < Routines
-        """
-        Remote class, subclasses Routines
 
-        Console layout built according to version definition.
+    class Remote < Base
+        include Kinds
+        '
+        Remote class, subclasses Base
 
-        Offers a run method for resource closure.
-        """
-        def self.make(**kwargs)
-            """
-            Factory function that generates a remote class for each kind.
-
-            Returns a hash of Remote classes.
-            """
-            $kinds_all.to_h do |kind|
-                [kind, Remote.new(kind, **kwargs)]
-            end
-        end
+        Console layout built according to a kind
 
-        def initialize(kind)
+        Offers a run method for resource closure.
+        '
+        def initialize(kind, **kwargs)
             super
-            self.strip = Strip.make(self, @layout[:strip])
-            self.bus = Bus.make(self, @layout[:bus])
-            self.button = MacroButton.make(self, @layout[:mb])
-            self.vban = Vban.make(self, @layout[:vban])
+            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 remote(kind, **kwargs)
-        """
-        Request a Remote for a specific kind and login to the API
-        """
-        _remotes = Remote.make(**kwargs)
 
-        raise VMRemoteErrors.new("Unknown Voicemeeter Kind.") unless _remotes.key? kind
+    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
 
-        _remotes[kind].login
-        return _remotes[kind]
+        Remote.new(Kinds.kinds_all.sample)
     end
 
-    module_function :remote, :start
+    module_function :start
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voicemeeter_api_ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 4.1.0
 platform: ruby
 authors:
 - onyx_online
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -45,61 +45,59 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: observer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.3
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.14.4
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.14.4
+        version: '3.4'
 description: A wrapper for Voicemeeter virtual mixer API in Ruby
 email: code@onyxandiris.online
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.md
+- CHANGELOG.md
+- LICENSE
 files:
+- CHANGELOG.md
+- LICENSE
+- README.md
 - lib/base.rb
 - lib/bus.rb
 - lib/button.rb
-- lib/channel.rb
+- lib/cbindings.rb
 - lib/command.rb
+- lib/configs.rb
+- lib/device.rb
 - lib/errors.rb
 - lib/inst.rb
+- lib/iremote.rb
+- lib/kinds.rb
 - lib/meta.rb
+- lib/mixin.rb
 - lib/recorder.rb
-- lib/routines.rb
 - lib/runvm.rb
 - lib/strip.rb
 - lib/vban.rb
@@ -107,7 +105,7 @@ files:
 - lib/voicemeeter.rb
 homepage: https://rubygems.org/gems/voicemeeter_api_ruby
 licenses:
-- NGPL
+- MIT
 metadata:
   source_code_uri: https://github.com/onyx-and-iris/voicemeeter-api-ruby.git
 post_install_message:
@@ -118,14 +116,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.12
 signing_key:
 specification_version: 4
 summary: Voicemeeter API wrapper

data/lib/channel.rb

@@ -1,34 +0,0 @@
-require_relative 'meta'
-require_relative 'errors'
-
-class IChannel
-    """
-    Base class for audio channels
-    """
-    include Channel_Meta_Functions
-
-    attr_accessor :remote, :index
-
-    def initialize(remote, i)
-        self.remote = remote
-        self.index = i
-    end
-
-    def getter(param, is_string=false)
-        @remote.get_parameter("#{self.cmd}.#{param}", is_string)
-    end
-
-    def setter(param, value)
-        @remote.set_parameter("#{self.cmd}.#{param}", value)
-    end
-
-    def cmd
-        raise NotImplementedError
-    end
-
-    def set_multi(param_hash)
-        param_hash.each do |(key,val)|
-            self.send("#{key}=", val)
-        end
-    end
-end