use a queue

src/main/kotlin/net/eksb/obsdc/DBus.kt

@@ -7,9 +7,10 @@ import org.freedesktop.dbus.interfaces.DBusInterface
 import org.freedesktop.dbus.interfaces.DBusSigHandler
 import org.freedesktop.dbus.messages.DBusSignal
 import org.slf4j.LoggerFactory
+import java.util.Queue
 import kotlin.concurrent.thread
 
-class DBus(handler: Handler) {
+class DBus(private val q: Queue<Op>) {
 
 	private val thread = thread(
 		start = true,
@@ -26,7 +27,7 @@ class DBus(handler: Handler) {
 				log.info("signal: ${signal.op}")
 				val op = Op.valueOf(signal.op)
 				log.info("op: ${op}")
-				handler.handle(op)
+				q.offer(op)
 			}
 			while (true) {
 				try {

src/main/kotlin/net/eksb/obsdc/Main.kt

@@ -1,9 +1,13 @@
 package net.eksb.obsdc
 
+import java.util.concurrent.BlockingQueue
+import java.util.concurrent.LinkedBlockingQueue
+
 object Main {
     @JvmStatic
     fun main(args: Array<String>) {
-        val obs = ObsCommunity()
+        val q:BlockingQueue<Op> = LinkedBlockingQueue()
-        DBus(obs.handler) // forks non-daemon thread
+        DBus(q) // forks non-daemon thread
+        ObsCommunity(q).run() // blocks
     }
 }

src/main/kotlin/net/eksb/obsdc/Obs.kt

@@ -1,5 +0,0 @@
-package net.eksb.obsdc
-
-interface Obs {
-	val handler:Handler
-}

src/main/kotlin/net/eksb/obsdc/ObsCommunity.kt

@@ -2,45 +2,49 @@ package net.eksb.obsdc
 
 import io.obswebsocket.community.client.OBSRemoteController
 import org.slf4j.LoggerFactory
+import java.util.concurrent.BlockingQueue
 
-class ObsCommunity: Obs, AutoCloseable {
+class ObsCommunity(private val q:BlockingQueue<Op>): AutoCloseable {
 
-	// TODO: make a single controller, and read ops from a queue.
+	private val controller = OBSRemoteController.builder()
+		.host("localhost")
+		.port(4455)
+		.password("R3tRkVXhFofJ2wRF") // TODO put this in a file
+		.autoConnect(false)
+		.lifecycle().onReady(::ready).and()
+		.build()
 
-	override fun close() {}
+	fun run() {
+		controller.connect()
+	}
 
-	override val handler: Handler = Handler { op ->
+	override fun close() {
-		var controller:OBSRemoteController? = null
+		controller.disconnect()
+	}
 
-		fun ready() {
+	private fun ready() {
-			controller?.let { controller ->
+		while (true) {
-				log.info("ready to send ${op}")
+			val op: Op = q.take() // blocks
+			log.info("op: ${op}")
+			op(op)
+		}
+	}
 
-				when(op) {
+	private fun op(op:Op) {
-					Op.STUDIO_TRANSITION -> {
+		when(op) {
-						controller.triggerStudioModeTransition { response ->
+			Op.STUDIO_TRANSITION -> {
-							log.info("Response successful: ${response.isSuccessful}")
+				controller.triggerStudioModeTransition { response ->
-							controller.disconnect()
+					// This does not get called?
-						}
+					log.info("Response successful: ${response.isSuccessful}")
-					}
 				}
 			}
 		}
-
-		controller = OBSRemoteController.builder()
-			.host("localhost")
-			.port(4455)
-			.password("R3tRkVXhFofJ2wRF") // TODO put this in a file
-			.autoConnect(true)
-			.lifecycle()
-			.onReady {
-				ready()
-			}
-			.and()
-			.build()
 	}
 
 	companion object {
 		private val log = LoggerFactory.getLogger(ObsCommunity::class.java)
 	}
 }
+
+// Move window:
+// https://github.com/obsproject/obs-websocket/blob/master/docs/generated/protocol.md#setsceneitemtransform

src/scripts/obs-signal

@@ -0,0 +1,2 @@
+#!/bin/sh
+dbus-send --session --type=signal --dest=net.eksb.obsdc / net.eksb.Obsdc.Signal string:$1