3 Commits

Author SHA1 Message Date
0ee045f172 Handle cases where the client won't be connected if OBS isn't running
All checks were successful
continuous-integration/drone/push Build is passing
2020-01-14 23:49:46 -05:00
c5db9d1f88 Warn/show alert when state is not active
All checks were successful
continuous-integration/drone/push Build is passing
2020-01-14 23:40:02 -05:00
8de69d7c40 [ci-skip] Add readme
Some checks reported errors
continuous-integration/drone/push Build was killed
2020-01-14 23:36:12 -05:00
3 changed files with 34 additions and 14 deletions

9
README.md Normal file
View File

@ -0,0 +1,9 @@
StreamDeck OBS Replay
=====================
Installation
------------
Install [obs-websocket](https://github.com/Palakis/obs-websocket) and configure
Add plugin to Stream Deck (double click) and configure your icons with the host, port (default: 4444) and password (if configured).

View File

@ -37,12 +37,12 @@
"Author": "Meow.tf", "Author": "Meow.tf",
"Category": "OBS Replay", "Category": "OBS Replay",
"CodePathWin": "replay.exe", "CodePathWin": "replay.exe",
"Description": "Control OBS' Replays using StreamDeck.", "Description": "Control OBS' Replays using StreamDeck and obs-websocket",
"Name": "OBS Replay", "Name": "OBS Replay",
"Icon": "images/pluginIcon", "Icon": "images/pluginIcon",
"CategoryIcon": "images/pluginIcon", "CategoryIcon": "images/pluginIcon",
"URL": "https://streamdeck.meow.tf/obsreplay", "URL": "https://streamdeck.meow.tf/obsreplay",
"Version": "1.0.0", "Version": "1.0.2",
"SDKVersion": 2, "SDKVersion": 2,
"OS": [ "OS": [
{ {

View File

@ -11,16 +11,16 @@ import (
const ( const (
actionReplayToggle = "tf.meow.obsreplay.replay_toggle" actionReplayToggle = "tf.meow.obsreplay.replay_toggle"
actionReplaySave = "tf.meow.obsreplay.replay_save" actionReplaySave = "tf.meow.obsreplay.replay_save"
) )
var ( var (
contextMutex sync.RWMutex contextMutex sync.RWMutex
clientMutex sync.RWMutex clientMutex sync.RWMutex
stateMutex sync.RWMutex stateMutex sync.RWMutex
clients = make(map[string]*obsws.Client) clients = make(map[string]*obsws.Client)
contexts = make(map[string]string) contexts = make(map[string]string)
cachedStates = make(map[string]int) cachedStates = make(map[string]int)
) )
@ -52,6 +52,15 @@ func replaySave(action, context string, payload *fastjson.Value, deviceId string
return return
} }
stateMutex.RLock()
state, exists := cachedStates[context]
stateMutex.RUnlock()
if exists && state == 0 {
sdk.ShowAlert(context)
return
}
req := obsws.NewSaveReplayBufferRequest() req := obsws.NewSaveReplayBufferRequest()
if err := req.Send(c); err != nil { if err := req.Send(c); err != nil {
@ -79,6 +88,14 @@ func clientForContext(context string) *obsws.Client {
return nil return nil
} }
if !c.Connected() {
err := c.Connect()
if err != nil {
return nil
}
}
return c return c
} }
@ -122,12 +139,6 @@ func checkClient(host string, port int, password string) string {
if !ok { if !ok {
client = &obsws.Client{Host: host, Port: port, Password: password} client = &obsws.Client{Host: host, Port: port, Password: password}
err := client.Connect()
if err != nil {
return ""
}
client.AddEventHandler("StreamStatus", streamStatusUpdate(key)) client.AddEventHandler("StreamStatus", streamStatusUpdate(key))
client.AddEventHandler("ReplayStarted", loopContextState(key, 1)) client.AddEventHandler("ReplayStarted", loopContextState(key, 1))
client.AddEventHandler("ReplayStopped", loopContextState(key, 0)) client.AddEventHandler("ReplayStopped", loopContextState(key, 0))
@ -253,4 +264,4 @@ func cleanupSockets() {
for _, client := range clients { for _, client := range clients {
client.Disconnect() client.Disconnect()
} }
} }