diff --git a/lib/voicemeeter.rb b/lib/voicemeeter.rb index 0df703e..344015d 100644 --- a/lib/voicemeeter.rb +++ b/lib/voicemeeter.rb @@ -1,4 +1,36 @@ +require "yaml" +require "pathname" +require "win32/registry" +require "ffi" +require "date" +require "logger" + +require_relative "voicemeeter/logger" +require_relative "voicemeeter/worker" +require_relative "voicemeeter/event" +require_relative "voicemeeter/util" +require_relative "voicemeeter/meta" +require_relative "voicemeeter/iremote" +require_relative "voicemeeter/mixins" +require_relative "voicemeeter/install" + +require_relative "voicemeeter/base" +require_relative "voicemeeter/bus" +require_relative "voicemeeter/button" +require_relative "voicemeeter/cbindings" +require_relative "voicemeeter/command" +require_relative "voicemeeter/configs" +require_relative "voicemeeter/device" +require_relative "voicemeeter/errors" +require_relative "voicemeeter/fx" +require_relative "voicemeeter/kinds" +require_relative "voicemeeter/midi" +require_relative "voicemeeter/option" +require_relative "voicemeeter/patch" +require_relative "voicemeeter/recorder" require_relative "voicemeeter/remote" +require_relative "voicemeeter/strip" +require_relative "voicemeeter/vban" module Voicemeeter end diff --git a/lib/voicemeeter/base.rb b/lib/voicemeeter/base.rb index 467d6ff..fb6c434 100644 --- a/lib/voicemeeter/base.rb +++ b/lib/voicemeeter/base.rb @@ -1,13 +1,3 @@ -require_relative "install" -require_relative "cbindings" -require_relative "kinds" -require_relative "midi" -require_relative "event" -require_relative "worker" -require_relative "errors" -require_relative "util" -require_relative "logger" - module Voicemeeter class Base # Base class for Remote types diff --git a/lib/voicemeeter/bus.rb b/lib/voicemeeter/bus.rb index 5a85c0e..65f2fc6 100644 --- a/lib/voicemeeter/bus.rb +++ b/lib/voicemeeter/bus.rb @@ -1,7 +1,3 @@ -require_relative "iremote" -require_relative "kinds" -require_relative "mixins" - module Voicemeeter module Bus class Base diff --git a/lib/voicemeeter/button.rb b/lib/voicemeeter/button.rb index 052347f..23b916c 100644 --- a/lib/voicemeeter/button.rb +++ b/lib/voicemeeter/button.rb @@ -1,7 +1,3 @@ -require_relative "iremote" -require_relative "meta" -require_relative "logger" - module Voicemeeter module Button module ButtonEnum diff --git a/lib/voicemeeter/cbindings.rb b/lib/voicemeeter/cbindings.rb index 52048ed..fe60d98 100644 --- a/lib/voicemeeter/cbindings.rb +++ b/lib/voicemeeter/cbindings.rb @@ -1,8 +1,3 @@ -require_relative "install" -require_relative "errors" -require_relative "util" -require_relative "logger" - module Voicemeeter module CBindings # Ruby bindings for the C-API functions diff --git a/lib/voicemeeter/command.rb b/lib/voicemeeter/command.rb index 17783df..cc6df74 100644 --- a/lib/voicemeeter/command.rb +++ b/lib/voicemeeter/command.rb @@ -1,6 +1,3 @@ -require_relative "iremote" -require_relative "meta" - module Voicemeeter class Command include IRemote diff --git a/lib/voicemeeter/configs.rb b/lib/voicemeeter/configs.rb index aba9cb5..390b8f2 100644 --- a/lib/voicemeeter/configs.rb +++ b/lib/voicemeeter/configs.rb @@ -1,10 +1,3 @@ -require "yaml" -require "pathname" - -require_relative "kinds" -require_relative "logger" -require_relative "errors" - module Voicemeeter module Configs class TOMLConfBuilder diff --git a/lib/voicemeeter/device.rb b/lib/voicemeeter/device.rb index 2bc27bb..063f7ba 100644 --- a/lib/voicemeeter/device.rb +++ b/lib/voicemeeter/device.rb @@ -1,6 +1,3 @@ -require_relative "iremote" -require_relative "meta" - module Voicemeeter class Device def initialize(remote) diff --git a/lib/voicemeeter/errors.rb b/lib/voicemeeter/errors.rb index d712de3..e07fdd5 100644 --- a/lib/voicemeeter/errors.rb +++ b/lib/voicemeeter/errors.rb @@ -1,5 +1,3 @@ -require_relative "util" - module Voicemeeter module Errors class VMError < StandardError; end diff --git a/lib/voicemeeter/event.rb b/lib/voicemeeter/event.rb index ba7df2c..87e0937 100644 --- a/lib/voicemeeter/event.rb +++ b/lib/voicemeeter/event.rb @@ -1,5 +1,3 @@ -require_relative "logger" - module Voicemeeter module Events module Callback diff --git a/lib/voicemeeter/fx.rb b/lib/voicemeeter/fx.rb index e15ab5e..7ce1ba0 100644 --- a/lib/voicemeeter/fx.rb +++ b/lib/voicemeeter/fx.rb @@ -1,5 +1,3 @@ -require_relative "iremote" - module Voicemeeter class Fx include IRemote diff --git a/lib/voicemeeter/install.rb b/lib/voicemeeter/install.rb index 752343c..7f5d296 100644 --- a/lib/voicemeeter/install.rb +++ b/lib/voicemeeter/install.rb @@ -1,10 +1,3 @@ -require "win32/registry" -require "pathname" -require "ffi" - -require_relative "logger" -require_relative "errors" - module Voicemeeter private diff --git a/lib/voicemeeter/iremote.rb b/lib/voicemeeter/iremote.rb index 152b599..46c5cd0 100644 --- a/lib/voicemeeter/iremote.rb +++ b/lib/voicemeeter/iremote.rb @@ -1,7 +1,3 @@ -require_relative "errors" -require_relative "meta" -require_relative "logger" - module Voicemeeter module IRemote # A commmon interface between the base Remote class and extended classes. diff --git a/lib/voicemeeter/logger.rb b/lib/voicemeeter/logger.rb index 892f5c4..8a6f612 100644 --- a/lib/voicemeeter/logger.rb +++ b/lib/voicemeeter/logger.rb @@ -1,5 +1,3 @@ -require "logger" - module Voicemeeter module Logging def logger diff --git a/lib/voicemeeter/option.rb b/lib/voicemeeter/option.rb index 68e23ed..bf6fb2a 100644 --- a/lib/voicemeeter/option.rb +++ b/lib/voicemeeter/option.rb @@ -1,5 +1,3 @@ -require_relative "iremote" - module Voicemeeter module Option class Base diff --git a/lib/voicemeeter/patch.rb b/lib/voicemeeter/patch.rb index d32b0e2..11b2eea 100644 --- a/lib/voicemeeter/patch.rb +++ b/lib/voicemeeter/patch.rb @@ -1,5 +1,3 @@ -require_relative "iremote" - module Voicemeeter module Patch class Base diff --git a/lib/voicemeeter/recorder.rb b/lib/voicemeeter/recorder.rb index c4488d8..41bfdf4 100644 --- a/lib/voicemeeter/recorder.rb +++ b/lib/voicemeeter/recorder.rb @@ -1,10 +1,3 @@ -require_relative "iremote" -require_relative "meta" -require_relative "mixins" -require_relative "errors" - -require "date" - module Voicemeeter module Recorder module FileTypeEnum diff --git a/lib/voicemeeter/remote.rb b/lib/voicemeeter/remote.rb index ec7a2f4..19d7c42 100644 --- a/lib/voicemeeter/remote.rb +++ b/lib/voicemeeter/remote.rb @@ -1,18 +1,3 @@ -require_relative "base" -require_relative "kinds" -require_relative "errors" -require_relative "strip" -require_relative "bus" -require_relative "button" -require_relative "vban" -require_relative "command" -require_relative "recorder" -require_relative "device" -require_relative "fx" -require_relative "patch" -require_relative "option" -require_relative "configs" - module Voicemeeter module Builder # Builder module for Remote factories. diff --git a/lib/voicemeeter/strip.rb b/lib/voicemeeter/strip.rb index 1ad20e9..b5ec883 100644 --- a/lib/voicemeeter/strip.rb +++ b/lib/voicemeeter/strip.rb @@ -1,7 +1,3 @@ -require_relative "iremote" -require_relative "kinds" -require_relative "mixins" - module Voicemeeter module Strip class Base diff --git a/lib/voicemeeter/vban.rb b/lib/voicemeeter/vban.rb index 74183db..5e83a3a 100644 --- a/lib/voicemeeter/vban.rb +++ b/lib/voicemeeter/vban.rb @@ -1,7 +1,3 @@ -require_relative "iremote" -require_relative "meta" -require_relative "errors" - module Voicemeeter module Vban class VbanStream diff --git a/lib/voicemeeter/version.rb b/lib/voicemeeter/version.rb index 1f1151e..85a815d 100644 --- a/lib/voicemeeter/version.rb +++ b/lib/voicemeeter/version.rb @@ -1,5 +1,5 @@ module Voicemeeter - module Version + module VERSION module_function def major @@ -22,6 +22,4 @@ module Voicemeeter to_a.join(".") end end - - VERSION = Version.to_s end diff --git a/lib/voicemeeter/worker.rb b/lib/voicemeeter/worker.rb index 5770258..f11bdbb 100644 --- a/lib/voicemeeter/worker.rb +++ b/lib/voicemeeter/worker.rb @@ -1,5 +1,3 @@ -require_relative "logger" - module Voicemeeter module Worker # Event threads, provides updates to observers