Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    obsws (0.4.0)
+    obsws (0.3.3)
       waitutil (~> 0.2.1)
       websocket-driver (~> 0.7.5)
 

README.md

@@ -16,10 +16,14 @@
 ### Bundler
 
 ```
-bundle add obsws
+bundle add 'obsws'
 bundle install
 ```
 
+### Gem
+
+`gem install 'obsws'`
+
 ## `Use`
 
 #### Example `main.rb`
@@ -63,28 +67,23 @@ For a full list of requests refer to [Requests](https://github.com/obsproject/ob
 
 ### Events
 
-Register `on_` callback methods. Method names should match the api event but snake cased.
+Register an observer class and define `on_` methods for events. Method names should match the api event but snake cased.
 
 example:
 
 ```ruby
 class Observer
     def initialize
-        @e_client = OBSWS::Events::Client.new(host: "localhost", port: 4455, password: "strongpassword")
-        # register callback methods with the Event client
-        @e_client.register(
-          [
-            method(:on_current_program_scene_changed),
-            method(:on_input_mute_state_changed)
-          ]
-        )
+        @e_client = OBSWS::Events::Client.new(**kwargs)
+        # register class with the event client
+        @e_client.add_observer(self)
     end
 
     # define "on_" event methods.
-    def on_current_program_scene_changed(data)
+    def on_current_program_scene_changed
         ...
     end
-    def on_input_mute_state_changed(data)
+    def on_input_mute_state_changed
         ...
     end
     ...

examples/events/main.rb

@@ -21,9 +21,11 @@ class Main
   def infostring
     resp = @r_client.get_version
     [
-      "Using obs version: #{resp.obs_version}.",
-      "With websocket version: #{resp.obs_web_socket_version}"
-    ].join(" ")
+      "Using obs version:",
+      resp.obs_version,
+      "With websocket version:",
+      resp.obs_web_socket_version
+    ].join("\n")
   end
 
   def on_current_program_scene_changed(data)

examples/levels/main.rb

@@ -1,6 +1,7 @@
 require_relative "../../lib/obsws"
 require "yaml"
 
+
 module LevelTypes
   VU = 0
   POSTFADER = 1
@@ -13,12 +14,7 @@ class Main
   def initialize(**kwargs)
     subs = OBSWS::Events::SUBS::LOW_VOLUME | OBSWS::Events::SUBS::INPUTVOLUMEMETERS
     @e_client = OBSWS::Events::Client.new(subs:, **kwargs)
-    @e_client.register(
-      [
-        method(:on_input_mute_state_changed),
-        method(:on_input_volume_meters)
-      ]
-    )
+    @e_client.add_observer(self)
   end
 
   def run

lib/obsws/event.rb

@@ -43,7 +43,7 @@ module OBSWS
 
       def add_observer(observer)
         observer = [observer] if !observer.respond_to? :each
-        observer.each { |o| observers << o unless observers.include? o }
+        observer.each { |o| observers << o }
       end
 
       def remove_observer(observer)
@@ -52,18 +52,15 @@ module OBSWS
 
       def notify_observers(event, data)
         observers.each do |o|
-          if o.is_a? Method
-            if o.name.to_s == "on_#{snakecase(event)}"
-              data.empty? ? o.call : o.call(data)
+          if o.respond_to? "on_#{snakecase(event)}"
+            if data.empty?
+              o.send("on_#{snakecase(event)}")
+            else
+              o.send("on_#{snakecase(event)}", data)
             end
-          elsif o.respond_to? "on_#{snakecase(event)}"
-            data.empty? ? o.send("on_#{snakecase(event)}") : o.send("on_#{snakecase(event)}", data)
           end
         end
       end
-
-      alias_method :register, :add_observer
-      alias_method :deregister, :remove_observer
     end
 
     class Client

lib/obsws/version.rb

@@ -7,11 +7,11 @@ module OBSWS
     end
 
     def minor
-      4
+      3
     end
 
     def patch
-      0
+      3
     end
 
     def to_a