Merge branch 'pep8'

1 files changed, 74 insertions, 72 deletions

diff --git a/voctocore/lib/avrawoutput.py b/voctocore/lib/avrawoutput.py
index 5523a66..b044e24 100644
--- a/voctocore/lib/avrawoutput.py
+++ b/voctocore/lib/avrawoutput.py
@@ -5,76 +5,78 @@ from lib.config import Config
 from lib.tcpmulticonnection import TCPMultiConnection
 from lib.clock import Clock
 
+
 class AVRawOutput(TCPMultiConnection):
-	def __init__(self, channel, port):
-		self.log = logging.getLogger('AVRawOutput['+channel+']')
-		super().__init__(port)
-
-		self.channel = channel
-
-		pipeline = """
-			intervideosrc channel=video_{channel} !
-			{vcaps} !
-			queue !
-			mux.
-
-			interaudiosrc channel=audio_{channel} !
-			{acaps} !
-			queue !
-			mux.
-
-			matroskamux
-				name=mux
-				streamable=true
-				writing-app=Voctomix-AVRawOutput !
-
-			multifdsink
-				blocksize=1048576
-				buffers-max={buffers_max}
-				sync-method=next-keyframe
-				name=fd
-		""".format(
-			channel=self.channel,
-			acaps=Config.get('mix', 'audiocaps'),
-			vcaps=Config.get('mix', 'videocaps'),
-			buffers_max=
-				Config.get('output-buffers', channel)
-					if Config.has_option('output-buffers', channel)
-					else 500,
-		)
-		self.log.debug('Creating Output-Pipeline:\n%s', pipeline)
-		self.outputPipeline = Gst.parse_launch(pipeline)
-		self.outputPipeline.use_clock(Clock)
-
-		self.log.debug('Binding Error & End-of-Stream-Signal on Output-Pipeline')
-		self.outputPipeline.bus.add_signal_watch()
-		self.outputPipeline.bus.connect("message::eos", self.on_eos)
-		self.outputPipeline.bus.connect("message::error", self.on_error)
-
-		self.log.debug('Launching Output-Pipeline')
-		self.outputPipeline.set_state(Gst.State.PLAYING)
-
-	def on_accepted(self, conn, addr):
-		self.log.debug('Adding fd %u to multifdsink', conn.fileno())
-		fdsink = self.outputPipeline.get_by_name('fd')
-		fdsink.emit('add', conn.fileno())
-
-		def on_disconnect(multifdsink, fileno):
-			if fileno == conn.fileno():
-				self.log.debug('fd %u removed from multifdsink', fileno)
-				self.close_connection(conn)
-
-		def on_about_to_disconnect(multifdsink, fileno, status):
-			if fileno == conn.fileno() and status == 3: # Gst.MultiHandleSinkClientStatus.Slow
-				self.log.warning('about to remove fd %u from multifdsink because it is too slow!', fileno)
-
-		fdsink.connect('client-fd-removed', on_disconnect)
-		fdsink.connect('client-removed', on_about_to_disconnect)
-
-	def on_eos(self, bus, message):
-		self.log.debug('Received End-of-Stream-Signal on Output-Pipeline')
-
-	def on_error(self, bus, message):
-		self.log.debug('Received Error-Signal on Output-Pipeline')
-		(error, debug) = message.parse_error()
-		self.log.debug('Error-Details: #%u: %s', error.code, debug)
+
+    def __init__(self, channel, port):
+        self.log = logging.getLogger('AVRawOutput[{}]'.format(channel))
+        super().__init__(port)
+
+        self.channel = channel
+
+        pipeline = """
+            intervideosrc channel=video_{channel} !
+            {vcaps} !
+            queue !
+            mux.
+
+            interaudiosrc channel=audio_{channel} !
+            {acaps} !
+            queue !
+            mux.
+
+            matroskamux
+                name=mux
+                streamable=true
+                writing-app=Voctomix-AVRawOutput !
+
+            multifdsink
+                blocksize=1048576
+                buffers-max={buffers_max}
+                sync-method=next-keyframe
+                name=fd
+        """.format(
+            channel=self.channel,
+            acaps=Config.get('mix', 'audiocaps'),
+            vcaps=Config.get('mix', 'videocaps'),
+            buffers_max=Config.get('output-buffers', channel, fallback=500)
+        )
+        self.log.debug('Creating Output-Pipeline:\n%s', pipeline)
+        self.outputPipeline = Gst.parse_launch(pipeline)
+        self.outputPipeline.use_clock(Clock)
+
+        self.log.debug('Binding Error & End-of-Stream-Signal '
+                       'on Output-Pipeline')
+        self.outputPipeline.bus.add_signal_watch()
+        self.outputPipeline.bus.connect("message::eos", self.on_eos)
+        self.outputPipeline.bus.connect("message::error", self.on_error)
+
+        self.log.debug('Launching Output-Pipeline')
+        self.outputPipeline.set_state(Gst.State.PLAYING)
+
+    def on_accepted(self, conn, addr):
+        self.log.debug('Adding fd %u to multifdsink', conn.fileno())
+        fdsink = self.outputPipeline.get_by_name('fd')
+        fdsink.emit('add', conn.fileno())
+
+        def on_disconnect(multifdsink, fileno):
+            if fileno == conn.fileno():
+                self.log.debug('fd %u removed from multifdsink', fileno)
+                self.close_connection(conn)
+
+        def on_about_to_disconnect(multifdsink, fileno, status):
+            # GST_CLIENT_STATUS_SLOW = 3,
+            if fileno == conn.fileno() and status == 3:
+                self.log.warning('about to remove fd %u from multifdsink '
+                                 'because it is too slow!', fileno)
+
+        fdsink.connect('client-fd-removed', on_disconnect)
+        fdsink.connect('client-removed', on_about_to_disconnect)
+
+    def on_eos(self, bus, message):
+        self.log.debug('Received End-of-Stream-Signal on Output-Pipeline')
+
+    def on_error(self, bus, message):
+        self.log.debug('Received Error-Signal on Output-Pipeline')
+        (error, debug) = message.parse_error()
+        self.log.debug('Error-Details: #%u: %s', error.code, debug)