From e3b72b9c4509d39ed4759c65cfa50fb463795965 Mon Sep 17 00:00:00 2001 From: onyx-and-iris Date: Fri, 14 Jul 2023 11:44:49 +0100 Subject: [PATCH] run files through standard --- .vscode/settings.json | 3 +++ lib/voicemeeter/base.rb | 10 +++++----- lib/voicemeeter/bus.rb | 37 ++++++++++++++++--------------------- lib/voicemeeter/event.rb | 16 ++++++++++------ lib/voicemeeter/worker.rb | 3 ++- voicemeeter.gemspec | 3 ++- 6 files changed, 38 insertions(+), 34 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..aa9996d --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "standardRuby.commandPath": "C:\\Ruby32-x64\\bin\\standardrb.bat" +} \ No newline at end of file diff --git a/lib/voicemeeter/base.rb b/lib/voicemeeter/base.rb index d09191e..8ea388c 100644 --- a/lib/voicemeeter/base.rb +++ b/lib/voicemeeter/base.rb @@ -8,6 +8,7 @@ require "easy_logging" module Voicemeeter class Base + include EasyLogging include Worker include Events::Callbacks @@ -25,10 +26,9 @@ module Voicemeeter Events::Tracker.new( **(kwargs.select { |k, _| %i[pdirty mdirty ldirty midi].include? k }) ) - @callbacks = Array.new - @running = false + @callbacks = [] @que = Queue.new - @cache = { strip_mode: 0 } + @cache = {strip_mode: 0} end def to_s @@ -36,7 +36,7 @@ module Voicemeeter end def login - self.runvm if CBindings.call(:bind_login, ok: [0, 1]) == 1 + runvm if CBindings.call(:bind_login, ok: [0, 1]) == 1 clear_dirty logger.info "Successfully logged into #{self} version #{version}" if event.any? @@ -79,7 +79,7 @@ module Voicemeeter kinds = { basic: Kinds::KindEnum::BASIC, banana: Kinds::KindEnum::BANANA, - potato: Install::OS_BITS == 64 ? 6 : Kinds::KindEnum::POTATO + potato: (Install::OS_BITS == 64) ? 6 : Kinds::KindEnum::POTATO } CBindings.call(:bind_run_voicemeeter, kinds[kind.name]) sleep(1) diff --git a/lib/voicemeeter/bus.rb b/lib/voicemeeter/bus.rb index cab8175..ed49142 100644 --- a/lib/voicemeeter/bus.rb +++ b/lib/voicemeeter/bus.rb @@ -11,13 +11,8 @@ module Voicemeeter attr_reader :eq, :mode, :levels def self.make(remote, i) - " - Factory function for Bus classes. - - Returns a PhysicalBus or VirtualBus class - " p_out = remote.kind.phys_out - i < p_out ? PhysicalBus.new(remote, i) : VirtualBus.new(remote, i) + (i < p_out) ? PhysicalBus.new(remote, i) : VirtualBus.new(remote, i) end def initialize(remote, i) @@ -57,17 +52,17 @@ module Voicemeeter def initialize(remote, i) super make_accessor_bool :normal, - :amix, - :bmix, - :repeat, - :composite, - :tvmix, - :upmix21, - :upmix41, - :upmix61, - :centeronly, - :lfeonly, - :rearonly + :amix, + :bmix, + :repeat, + :composite, + :tvmix, + :upmix21, + :upmix41, + :upmix61, + :centeronly, + :lfeonly, + :rearonly end def identifier @@ -88,12 +83,12 @@ module Voicemeeter end def getter(mode) - if @remote.running && @remote.event.ldirty - vals = @remote.cache[:bus_level][@init, @offset] + vals = if @remote.running && @remote.event.ldirty + @remote.cache[:bus_level][@init, @offset] else - vals = (@init...@init + @offset).map { |i| @remote.get_level(mode, i) } + (@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 } + vals.map { |x| (x > 0) ? (20 * Math.log(x, 10)).round(1) : -200.0 } end def all diff --git a/lib/voicemeeter/event.rb b/lib/voicemeeter/event.rb index 66942ea..1b90d7c 100644 --- a/lib/voicemeeter/event.rb +++ b/lib/voicemeeter/event.rb @@ -1,3 +1,5 @@ +require "easy_logging" + module Voicemeeter module Events module Callbacks @@ -16,13 +18,15 @@ module Voicemeeter if callback.respond_to? :on_update callback.on_update { event.to_s[3..] } else - callback.call if callback.name == event + callback.call # if callback == event end end end end class Tracker + include EasyLogging + attr_reader :pdirty, :mdirty, :midi, :ldirty def initialize(pdirty: false, mdirty: false, midi: false, ldirty: false) @@ -33,15 +37,15 @@ module Voicemeeter end def to_s - "#{self.class.name.split("::").last}" + self.class.name.split("::").last.to_s end def info(msg = nil) info_msg = msg ? ["#{msg} events."] : [] - if any? - info_msg += ["Now listening for #{get.join(", ")} events"] + info_msg += if any? + ["Now listening for #{get.join(", ")} events"] else - info_msg += ["Not listening for any events"] + ["Not listening for any events"] end logger.info(info_msg.join(" ")) end @@ -67,7 +71,7 @@ module Voicemeeter end def get - %w[pdirty mdirty midi ldirty].reject { |ev| !send("#{ev}") } + %w[pdirty mdirty midi ldirty].reject { |ev| !send(ev.to_s) } end def any? diff --git a/lib/voicemeeter/worker.rb b/lib/voicemeeter/worker.rb index 3e74030..58f4775 100644 --- a/lib/voicemeeter/worker.rb +++ b/lib/voicemeeter/worker.rb @@ -13,6 +13,7 @@ module Voicemeeter que << :ldirty if event.ldirty sleep(@ratelimit) end + logger.debug("closing producer thread") que << :stop end end @@ -25,8 +26,8 @@ module Voicemeeter loop do e_from_que = @que.pop if e_from_que == :stop + logger.debug("closing worker thread") break - logger.debug("closing #{self} thread") end on_event :on_pdirty if e_from_que == :pdirty && pdirty? on_event :on_mdirty if e_from_que == :mdirty && mdirty? diff --git a/voicemeeter.gemspec b/voicemeeter.gemspec index 34d3ebc..13a552c 100644 --- a/voicemeeter.gemspec +++ b/voicemeeter.gemspec @@ -1,6 +1,6 @@ # frozen_string_literal: true + require File.expand_path("lib/voicemeeter/version", __dir__) -lib = File.expand_path("./lib") Gem::Specification.new do |spec| spec.name = "voicemeeter" @@ -16,6 +16,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "ffi", "~> 1.9", ">= 1.9.10" spec.add_runtime_dependency "easy_logging", "~> 0.4.0" spec.add_development_dependency "rspec", "~> 3.4" + spec.add_development_dependency "standard", "~> 1.30" spec.required_ruby_version = ">= 3.0" spec.metadata = { "source_code_uri" => "https://github.com/onyx-and-iris/voicemeeter-rb.git"