onyx_online/duckypad-twitch
1
0
Fork 0
mirror of https://github.com/onyx-and-iris/duckypad-twitch.git synced 2026-01-09 21:17:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

should OBS be manually closed:

Browse Source 
clean up the request socket.
the event socket should be handled by obsws-python library
This commit is contained in:
Onyx and Iris 2026-01-02 21:32:41 +00:00
parent 4f087a0358
commit be71c49806
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
duckypad_twitch/macros/duckypad.py
View File

@ -39,8 +39,8 @@ def register_hotkeys(duckypad):
keyboard.add_hotkey('ctrl+F18', duckypad.scene.iris_solo) keyboard.add_hotkey('ctrl+F18', duckypad.scene.iris_solo)
def obsws_hotkeys(): def obsws_hotkeys():
keyboard.add_hotkey('ctrl+alt+F13', duckypad.obsws.start_stream) keyboard.add_hotkey('ctrl+F22', duckypad.obsws.start_stream)
keyboard.add_hotkey('ctrl+alt+F14', duckypad.obsws.stop_stream) keyboard.add_hotkey('ctrl+F23', duckypad.obsws.stop_stream)
def duckypad_hotkeys(): def duckypad_hotkeys():
keyboard.add_hotkey('ctrl+F24', duckypad.reset) keyboard.add_hotkey('ctrl+F24', duckypad.reset)

10
duckypad_twitch/obsws.py
View File

@ -54,12 +54,12 @@ class OBSWS(ILayer):
for client in (self.request, self.event): for client in (self.request, self.event):
if client: if client:
client.disconnect() client.disconnect()
self.request = self.event = None
### Event Handlers ### ### Event Handlers ###
def on_stream_state_changed(self, data): def on_stream_state_changed(self, data):
self._duckypad.stream.is_live = data.output_active self._duckypad.stream.is_live = data.output_active
self.logger.info(f'stream is {"live" if self._duckypad.stream.is_live else "offline"}')
def on_current_program_scene_changed(self, data): def on_current_program_scene_changed(self, data):
self._duckypad.stream.current_scene = data.scene_name self._duckypad.stream.current_scene = data.scene_name
@ -77,8 +77,10 @@ class OBSWS(ILayer):
case 'IRIS SOLO': case 'IRIS SOLO':
self.logger.info('Iris Solo Scene enabled, Onyx game pc muted') self.logger.info('Iris Solo Scene enabled, Onyx game pc muted')
def on_exit_started(self, _): def on_exit_started(self, data):
self.event.unsubscribe() self.logger.info('OBS is exiting, disconnecting...')
self.request.disconnect()
self.request = self.event = None
### OBSWS Request Wrappers ### ### OBSWS Request Wrappers ###
@ -98,6 +100,7 @@ class OBSWS(ILayer):
return return
self._call('start_stream') self._call('start_stream')
self.logger.info('stream started')
def stop_stream(self): def stop_stream(self):
resp = self._call('get_stream_status') resp = self._call('get_stream_status')
@ -106,3 +109,4 @@ class OBSWS(ILayer):
return return
self._call('stop_stream') self._call('stop_stream')
self.logger.info('stream stopped')