Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const CONNECTIVITY_TIMEOUT = 1000 // ms
interface SisyfosApiEvents {
error: [Error]
initialized: []
mixerOnline: [boolean]
mixerOnlineChanged: []
connected: []
disconnected: []
}
Expand Down Expand Up @@ -238,10 +238,6 @@ export class SisyfosApi extends EventEmitter<SisyfosApiEvents> {
return this._mixerOnline
}

setMixerOnline(state: boolean) {
this._mixerOnline = state
}

private _monitorConnectivity() {
const pingSisyfos = () => {
if (this._oscClient) this._oscClient.send({ address: `/ping/${this._pingCounter}`, args: [] })
Expand Down Expand Up @@ -296,12 +292,20 @@ export class SisyfosApi extends EventEmitter<SisyfosApiEvents> {
this._clearPingTimer()
this.updateIsConnected(true)
this._pingCounter++
this.emit('mixerOnline', true)

if (!this._mixerOnline) {
this._mixerOnline = true
this.emit('mixerOnlineChanged')
}
} else if (message.args[0].value === 'offline') {
this._clearPingTimer()
this.updateIsConnected(true)
this._pingCounter++
this.emit('mixerOnline', false)

if (this._mixerOnline) {
this._mixerOnline = false
this.emit('mixerOnlineChanged')
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ export class SisyfosMessageDevice extends DeviceWithState<SisyfosState, DeviceOp
this._sisyfos.on('disconnected', () => {
this._connectionChanged()
})
this._sisyfos.on('mixerOnline', (onlineStatus) => {
this._sisyfos.setMixerOnline(onlineStatus)
this._sisyfos.on('mixerOnlineChanged', () => {
this._connectionChanged()
})

Expand Down
Loading