From bee166f35420884b23e668884e869c9c01758a34 Mon Sep 17 00:00:00 2001
From: onyx-and-iris <code@onyxandiris.online>
Date: Wed, 26 Jul 2023 14:12:47 +0100
Subject: [PATCH] prepend Util::Cache

---
 lib/voicemeeter/base.rb | 28 ++++++++++++----------------
 lib/voicemeeter/util.rb | 16 ++++++++--------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/lib/voicemeeter/base.rb b/lib/voicemeeter/base.rb
index be17524..9d6381c 100644
--- a/lib/voicemeeter/base.rb
+++ b/lib/voicemeeter/base.rb
@@ -12,7 +12,7 @@ module Voicemeeter
   class Base
     include Logging
     include Worker
-    include Util::Cache
+    prepend Util::Cache
 
     attr_reader :kind, :midi, :event, :callback, :running, :delay, :cache
     alias_method :observer, :callback
@@ -105,16 +105,14 @@ module Voicemeeter
     end
 
     def get(name, is_string = false)
-      polling(:get, name:) do
-        if is_string
-          cget = FFI::MemoryPointer.new(:string, 512, true)
-          CBindings.call(:bind_get_parameter_string_a, name, cget)
-          cget.read_string
-        else
-          cget = FFI::MemoryPointer.new(:float, 1)
-          CBindings.call(:bind_get_parameter_float, name, cget)
-          cget.read_float.round(1)
-        end
+      if is_string
+        cget = FFI::MemoryPointer.new(:string, 512, true)
+        CBindings.call(:bind_get_parameter_string_a, name, cget)
+        cget.read_string
+      else
+        cget = FFI::MemoryPointer.new(:float, 1)
+        CBindings.call(:bind_get_parameter_float, name, cget)
+        cget.read_float.round(1)
       end
     end
 
@@ -128,11 +126,9 @@ module Voicemeeter
     end
 
     def get_buttonstatus(id, mode)
-      polling(:get_buttonstatus, id:, mode:) do
-        cget = FFI::MemoryPointer.new(:float, 1)
-        CBindings.call(:bind_macro_button_get_status, id, cget, mode)
-        cget.read_float.to_i
-      end
+      cget = FFI::MemoryPointer.new(:float, 1)
+      CBindings.call(:bind_macro_button_get_status, id, cget, mode)
+      cget.read_float.to_i
     end
 
     def set_buttonstatus(id, mode, state)
diff --git a/lib/voicemeeter/util.rb b/lib/voicemeeter/util.rb
index e793530..4499d2d 100644
--- a/lib/voicemeeter/util.rb
+++ b/lib/voicemeeter/util.rb
@@ -19,16 +19,16 @@ module Voicemeeter
     end
 
     module Cache
-      def polling(func, **kwargs)
-        params = {
-          get: kwargs[:name],
-          get_buttonstatus: "mb_#{kwargs[:id]}_#{kwargs[:mode]}"
-        }
-        return cache.delete(params[func]) if cache.key? params[func]
-
+      def get(name, is_string = false)
+        return cache.delete(name) if cache.key? name
         clear_dirty if @sync
+        super
+      end
 
-        yield
+      def get_buttonstatus(id, mode)
+        return cache.delete("mb_#{id}_#{mode}") if cache.key? "mb_#{id}_#{mode}"
+        clear_dirty if @sync
+        super
       end
     end
   end