voctocore: pep8ify

* Indent by 4 spaces
* Reformat some argument lists
* Two newlines before free functions
* One newline before methods
* Spaces around infix operators

1 files changed, 83 insertions, 79 deletions

diff --git a/voctocore/lib/audiomix.py b/voctocore/lib/audiomix.py
index 6c1768a..37376fd 100644
--- a/voctocore/lib/audiomix.py
+++ b/voctocore/lib/audiomix.py
@@ -5,83 +5,87 @@ from enum import Enum
 from lib.config import Config
 from lib.clock import Clock
 
+
 class AudioMix(object):
-	def __init__(self):
-		self.log = logging.getLogger('AudioMix')
-
-		self.selectedSource = 0
-
-		self.caps = Config.get('mix', 'audiocaps')
-		self.names = Config.getlist('mix', 'sources')
-		self.log.info('Configuring Mixer for %u Sources', len(self.names))
-
-		pipeline = """
-			audiomixer name=mix !
-			{caps} !
-			queue !
-			tee name=tee
-
-			tee. ! queue ! interaudiosink channel=audio_mix_out
-		""".format(
-			caps=self.caps
-		)
-
-		if Config.getboolean('previews', 'enabled'):
-			pipeline += """
-				tee. ! queue ! interaudiosink channel=audio_mix_preview
-			"""
-
-		if Config.getboolean('stream-blanker', 'enabled'):
-			pipeline += """
-				tee. ! queue ! interaudiosink channel=audio_mix_streamblanker
-			"""
-
-		for idx, name in enumerate(self.names):
-			pipeline += """
-				interaudiosrc channel=audio_{name}_mixer !
-				{caps} !
-				mix.
-			""".format(
-				name=name,
-				caps=self.caps
-			)
-
-		self.log.debug('Creating Mixing-Pipeline:\n%s', pipeline)
-		self.mixingPipeline = Gst.parse_launch(pipeline)
-		self.mixingPipeline.use_clock(Clock)
-
-		self.log.debug('Binding Error & End-of-Stream-Signal on Mixing-Pipeline')
-		self.mixingPipeline.bus.add_signal_watch()
-		self.mixingPipeline.bus.connect("message::eos", self.on_eos)
-		self.mixingPipeline.bus.connect("message::error", self.on_error)
-
-		self.log.debug('Initializing Mixer-State')
-		self.updateMixerState()
-
-		self.log.debug('Launching Mixing-Pipeline')
-		self.mixingPipeline.set_state(Gst.State.PLAYING)
-
-	def updateMixerState(self):
-		self.log.info('Updating Mixer-State')
-
-		for idx, name in enumerate(self.names):
-			volume = int(idx == self.selectedSource)
-
-			self.log.debug('Setting Mixerpad %u to volume=%0.2f', idx, volume)
-			mixerpad = self.mixingPipeline.get_by_name('mix').get_static_pad('sink_%u' % idx)
-			mixerpad.set_property('volume', volume)
-
-	def setAudioSource(self, source):
-		self.selectedSource = source
-		self.updateMixerState()
-
-	def getAudioSource(self):
-		return self.selectedSource
-
-	def on_eos(self, bus, message):
-		self.log.debug('Received End-of-Stream-Signal on Mixing-Pipeline')
-
-	def on_error(self, bus, message):
-		self.log.debug('Received Error-Signal on Mixing-Pipeline')
-		(error, debug) = message.parse_error()
-		self.log.debug('Error-Details: #%u: %s', error.code, debug)
+
+    def __init__(self):
+        self.log = logging.getLogger('AudioMix')
+
+        self.selectedSource = 0
+
+        self.caps = Config.get('mix', 'audiocaps')
+        self.names = Config.getlist('mix', 'sources')
+        self.log.info('Configuring Mixer for %u Sources', len(self.names))
+
+        pipeline = """
+            audiomixer name=mix !
+            {caps} !
+            queue !
+            tee name=tee
+
+            tee. ! queue ! interaudiosink channel=audio_mix_out
+        """.format(
+            caps=self.caps
+        )
+
+        if Config.getboolean('previews', 'enabled'):
+            pipeline += """
+                tee. ! queue ! interaudiosink channel=audio_mix_preview
+            """
+
+        if Config.getboolean('stream-blanker', 'enabled'):
+            pipeline += """
+                tee. ! queue ! interaudiosink channel=audio_mix_streamblanker
+            """
+
+        for idx, name in enumerate(self.names):
+            pipeline += """
+                interaudiosrc channel=audio_{name}_mixer !
+                {caps} !
+                mix.
+            """.format(
+                name=name,
+                caps=self.caps
+            )
+
+        self.log.debug('Creating Mixing-Pipeline:\n%s', pipeline)
+        self.mixingPipeline = Gst.parse_launch(pipeline)
+        self.mixingPipeline.use_clock(Clock)
+
+        self.log.debug('Binding Error & End-of-Stream-Signal '
+                       'on Mixing-Pipeline')
+        self.mixingPipeline.bus.add_signal_watch()
+        self.mixingPipeline.bus.connect("message::eos", self.on_eos)
+        self.mixingPipeline.bus.connect("message::error", self.on_error)
+
+        self.log.debug('Initializing Mixer-State')
+        self.updateMixerState()
+
+        self.log.debug('Launching Mixing-Pipeline')
+        self.mixingPipeline.set_state(Gst.State.PLAYING)
+
+    def updateMixerState(self):
+        self.log.info('Updating Mixer-State')
+
+        for idx, name in enumerate(self.names):
+            volume = int(idx == self.selectedSource)
+
+            self.log.debug('Setting Mixerpad %u to volume=%0.2f', idx, volume)
+            mixerpad = (self.mixingPipeline.get_by_name('mix')
+                                           .get_static_pad('sink_%u' % idx))
+            mixerpad.set_property('volume', volume)
+
+    def setAudioSource(self, source):
+        self.selectedSource = source
+        self.updateMixerState()
+
+    def getAudioSource(self):
+        return self.selectedSource
+
+    def on_eos(self, bus, message):
+        self.log.debug('Received End-of-Stream-Signal on Mixing-Pipeline')
+
+    def on_error(self, bus, message):
+        self.log.debug('Received Error-Signal on Mixing-Pipeline')
+        (error, debug) = message.parse_error()
+        self.log.debug('Error-Details: #%u: %s', error.code, debug)