add protocol features and minor fixes

1 files changed, 57 insertions, 7 deletions

diff --git a/voctocore/lib/commands.py b/voctocore/lib/commands.py
index f0b8011..664a6ca 100644
--- a/voctocore/lib/commands.py
+++ b/voctocore/lib/commands.py
@@ -1,5 +1,7 @@
 #!/usr/bin/python3
 import logging
+import json
+
 
 from lib.config import Config
 from lib.videomix import CompositeModes
@@ -22,6 +24,12 @@ class ControlServerCommands():
 		if src_name_or_id < 0 or src_name_or_id >= len(self.sources):
 			raise IndexError("source %s unknown" % src_name_or_id)
 
+	def encodeSourceName(self, src_id):
+		try:
+			return self.sources[src_id]
+		except Exception as e:
+			raise IndexError("source %s unknown" % src_id)
+
 	def decodeBlankerSourceName(self, src_name_or_id):
 		if isinstance(src_name_or_id, str):
 			try:
@@ -32,6 +40,12 @@ class ControlServerCommands():
 		if src_name_or_id < 0 or src_name_or_id >= len(self.blankersources):
 			raise IndexError("source %s unknown" % src_name_or_id)
 
+	def encodeBlankerSourceName(self, src_id):
+		try:
+			return self.blankersources[src_id]
+		except Exception as e:
+			raise IndexError("source %s unknown" % src_id)
+
 
 	def message(self, *args):
 		return True
@@ -41,16 +55,28 @@ class ControlServerCommands():
 		self.pipeline.vmix.setVideoSourceA(src_id)
 		return True
 
+	def get_video_a(self):
+		src_id = self.pipeline.vmix.getVideoSourceA()
+		return (True, self.encodeSourceName(src_id))
+
 	def set_video_b(self, src_name_or_id):
 		src_id = self.decodeSourceName(src_name_or_id)
 		self.pipeline.vmix.setVideoSourceB(src_id)
 		return True
 
+	def get_video_b(self):
+		src_id = self.pipeline.vmix.getVideoSourceB()
+		return (True, self.encodeSourceName(src_id))
+
 	def set_audio(self, src_name_or_id):
 		src_id = self.decodeSourceName(src_name_or_id)
 		self.pipeline.amix.setAudioSource(src_id)
 		return True
 
+	def get_audio(self):
+		src_id = self.pipeline.amix.getAudioSource()
+		return (True, self.encodeSourceName(src_id))
+
 	def set_composite_mode(self, composite_mode):
 		try:
 			mode = CompositeModes[composite_mode]
@@ -60,11 +86,35 @@ class ControlServerCommands():
 		self.pipeline.vmix.setCompositeMode(mode)
 		return True
 
-	def set_stream_blank(self, src_name_or_id):
-		src_id = self.decodeBlankerSourceName(src_name_or_id)
-		self.pipeline.streamblanker.setBlankSource(src_id)
-		return True
+	def get_composite_mode(self):
+		try:
+			mode = self.pipeline.vmix.getCompositeMode()
+			return (True, mode.name)
+		except Exception as e:
+			raise KeyError("composite-mode %s unknown" % mode)
+
+	def set_stream_status(self, *args):
+		try:
+			if args[0] == "live":
+				self.pipeline.streamblanker.setBlankSource(None)
+				return True
+			elif args [0] == "blank":
+				src_id = self.decodeBlankerSourceName(args[1])
+				self.pipeline.streamblanker.setBlankSource(src_id)
+				return True
+			else:
+				return (False, "invocation: set_stream_status (live | blank <mode>)")
+		except IndexError as e:
+			return (False, "invocation: set_stream_status (live | blank <mode>)")
+
+	def get_stream_status(self):
+		if self.pipeline.streamblanker.blankSource is None:
+			return (True, "live")
+
+		name = self.encodeBlankerSourceName(self.pipeline.streamblanker.blankSource)
+		return (True, "blank " + name)
+
+	def get_config(self):
+		confdict = {k: dict(v) for k, v in dict(Config).items()}
+		return (True, json.dumps(confdict))
 
-	def set_stream_live(self):
-		self.pipeline.streamblanker.setBlankSource(None)
-		return True