voicemeeter_api_ruby 2.0.3 → 4.0.0

data/lib/strip.rb

@@ -1,50 +1,86 @@
-require_relative 'channel'
-
-
-class Strip < IChannel
-    attr_reader :num_A, :num_B
-
-    def self.make(remote, layout_strip, out_channels)
-        "
-        Factory function for Strip classes.
-        "
-        p_in = layout_strip[:p_in]
-        v_in = layout_strip[:v_in]
-        num_A = out_channels[:p_out]
-        num_B = out_channels[:v_out]
-
-        (0...(p_in + v_in)).map do |i|
-            i < p_in ? \
-            PhysicalStrip.new(remote, i, num_A, num_B) : \
-            VirtualStrip.new(remote, i, num_A, num_B) 
-        end
-    end
-
-    def initialize(remote, i, num_A, num_B)
-        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
-
-    def cmd
-        return "Strip[#{@index}]"
-    end
-end
-
-class PhysicalStrip < Strip
-    def initialize(remote, i, num_A, num_B)
-        super
-        self.make_accessor_float :comp, :gate
-        self.make_accessor_int :limit
-        self.make_reader_only :device, :sr
-    end
-end
-
-class VirtualStrip < Strip
-    def initialize(remote, i, num_A, num_B)
-        super
-        self.make_accessor_bool :mc, :k
-    end
-end
+require_relative 'iremote'
+
+class Strip < IRemote
+    '
+    Concrete Strip class
+    '
+    include Channel_Meta_Functions
+    include Fades
+
+    attr_accessor :gainlayer
+
+    def self.make(remote, layout_strip)
+        '
+        Factory function for Strip classes.
+        '
+        p_in, v_in = layout_strip.values
+        (0...(p_in + v_in)).map do |i|
+            if i < p_in
+                PhysicalStrip.new(remote, i)
+            else
+                VirtualStrip.new(remote, i)
+            end
+        end
+    end
+
+    def initialize(remote, i)
+        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.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) }
+    end
+
+    def identifier
+        "strip[#{@index}]"
+    end
+end
+
+class PhysicalStrip < Strip
+    def initialize(remote, i)
+        super
+        self.make_accessor_float :comp, :gate, :audibility
+        self.make_reader_only :device, :sr
+    end
+end
+
+class VirtualStrip < Strip
+    def initialize(remote, i)
+        super
+        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

data/lib/vban.rb

@@ -1,100 +1,78 @@
-require_relative 'meta'
-require_relative 'errors'
-
-
-class IVban
-    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)
-    end
-
-    def cmd
-        return "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
-    end
-end
-
-
-class Vban < IVban
-    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
-
-    def initialize(remote, i)
-        super
-        self.make_accessor_bool :on
-        self.make_accessor_string :name, :ip
-        self.make_accessor_int :quality, :route
-    end
-end
-
-
-class VbanInstream < Vban
-    def initialize(remote, i)
-        super
-        self.make_reader_int :sr, :channel, :bit
-    end
-
-    def direction
-        return "in"
-    end
-end
-
-
-class VbanOutstream < Vban
-    def initialize(remote, i)
-        super
-        self.make_accessor_int :sr, :channel, :bit
-    end
-
-    def direction
-        return "out"
-    end
-end
+require_relative 'iremote'
+require_relative 'meta'
+require_relative 'errors'
+
+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

data/lib/version.rb

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

data/lib/voicemeeter.rb

@@ -1,39 +1,86 @@
-require_relative 'routines'
-require_relative 'errors'
-
-module Voicemeeter
-    class Remote < Routines
-        def self.make
-            ["basic", "banana", "potato"].to_h do |kind|
-                [kind, Remote.new(kind)]
-            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
-            yield if block_given?
-            
-        ensure
-            logout
-        end
-    end
-
-    def remote(kind)
-        _remotes = Remote.make
-
-        raise VMRemoteErrors.new("Unknown Voicemeeter Kind") unless _remotes[kind]
-        _remotes[kind].login
-        return _remotes[kind]
-    end
-
-    module_function :remote
-end
+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 < 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
+
+        return Remote.new(Kinds.kinds_all.sample)
+    end
+
+    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.3
+  version: 4.0.0
 platform: ruby
 authors:
 - onyx_online
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -31,61 +31,72 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.9.10
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: toml
   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.3.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: observer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        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/recorder.rb
-- lib/routines.rb
 - lib/runvm.rb
 - lib/strip.rb
 - lib/vban.rb
@@ -93,7 +104,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:
@@ -104,14 +115,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,31 +0,0 @@
-require_relative 'meta'
-require_relative 'errors'
-
-class IChannel
-    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