minor refactoring

1 files changed, 26 insertions, 26 deletions

diff --git a/src/flufigut.py b/src/flufigut.py
index a20f014..0009c50 100755
--- a/src/flufigut.py
+++ b/src/flufigut.py
@@ -246,9 +246,9 @@ class Planet:
     def _generate_inputs(self):
         self.flow['inputs'] = {}
         master_cnt = 0
-        for source, input in self._desc.inputs.items():
-            comp_name = 'capture-%s' % source
-            comp_desc = 'capture raw data from %s' % (source)
+        for input_name, input in self._desc.inputs.items():
+            comp_name = 'capture-%s' % input_name
+            comp_desc = 'capture raw data from %s' % (input_name)
             worker = self.__get_worker(comp_name)
 
             self.flow['inputs'][comp_name] = {
@@ -261,7 +261,7 @@ class Planet:
             if input['master']:
                 master_cnt += 1
 
-            self.__add_worker_flag(worker, "input", source)
+            self.__add_worker_flag(worker, "input", input_name)
             self.__set_input_properties(comp_name, input['properties'])
 
         if master_cnt == 0:
@@ -271,17 +271,17 @@ class Planet:
 
     #
     # muxes
-    def __generate_audio_feeder(self, input, source, input_samplerate, target_samplerate):
+    def __generate_audio_feeder(self, input_feeder, input_name, input_samplerate, target_samplerate):
         if target_samplerate == input_samplerate:
-            return input
+            return input_feeder
 
-        comp_name = 'resample-%s-%s' % (source, target_samplerate)
-        comp_desc = 'resample audio from %s to %s Hz' % (source, target_samplerate)
+        comp_name = 'resample-%s-%s' % (input_name, target_samplerate)
+        comp_desc = 'resample audio from %s to %s Hz' % (input_name, target_samplerate)
         self.flow['inputs'][comp_name] = {
             'type': 'audio-resample',
             'desc': comp_desc,
             'worker': str(self.__get_worker(comp_name)),
-            'feeder': input,
+            'feeder': input_feeder,
             'properties': {
                 'samplerate': target_samplerate,
             },
@@ -289,20 +289,20 @@ class Planet:
         return comp_name
 
     def __generate_audio_encoder(self, mux, format, profile):
-        source = mux['audio'].split(':')[0]
+        input_name = mux['audio'].split(':')[0]
         encoder = self._desc.globals['formats'][format]['audio']
         bitrate = self._desc.globals['profiles'][profile]['audio']
-        input_samplerate = self._desc.inputs[source]['properties']['samplerate']
+        input_samplerate = self._desc.inputs[input_name]['properties']['samplerate']
         samplerate = input_samplerate
         if 'samplerate' in self._desc.globals['formats'][format]:
             samplerate = self._desc.globals['formats'][format]['samplerate']
 
-        feeder = self.__generate_audio_feeder('capture-%s' % (mux['audio']), source, input_samplerate, samplerate)
-        comp_name = 'encode-%s-%s-%i-%i' % (source, encoder, bitrate, samplerate)
-        comp_desc = '%s encoder for %i kbit/s @ %i Hz, from %s' % (encoder, bitrate, samplerate, source)
+        feeder = self.__generate_audio_feeder('capture-%s' % (mux['audio']), input_name, input_samplerate, samplerate)
+        comp_name = 'encode-%s-%s-%i-%i' % (input_name, encoder, bitrate, samplerate)
+        comp_desc = '%s encoder for %i kbit/s @ %i Hz, from %s' % (encoder, bitrate, samplerate, input_name)
         if bitrate == 0:
-            comp_name = 'encode-%s-%s-%i' % (source, encoder, samplerate)
-            comp_desc = '%s encoder @ %i Hz, from %s' % (encoder, samplerate, source)
+            comp_name = 'encode-%s-%s-%i' % (input_name, encoder, samplerate)
+            comp_desc = '%s encoder @ %i Hz, from %s' % (encoder, samplerate, input_name)
 
         if comp_name in self.flow['encoders-audio']:
             return comp_name
@@ -318,21 +318,21 @@ class Planet:
         }
         return comp_name
 
-    def __generate_video_feeder(self, input, source, input_resolution, target_resolution):
+    def __generate_video_feeder(self, input_feeder, input_name, input_resolution, target_resolution):
         if self._desc.globals['resolutions'][target_resolution]['rate'] != self._desc.globals['resolutions'][input_resolution]['rate']:
             raise Exception("ERROR: video rate conversion is not supported!!!")
 
         if target_resolution == input_resolution:
-            return input
+            return input_feeder
 
-        comp_name = 'resize-%s-%s' % (source, target_resolution)
-        comp_desc = 'resize video from %s to %sx%s' % (source, self._desc.globals['resolutions'][target_resolution]['width'],
+        comp_name = 'resize-%s-%s' % (input_name, target_resolution)
+        comp_desc = 'resize video from %s to %sx%s' % (input_name, self._desc.globals['resolutions'][target_resolution]['width'],
                                                        self._desc.globals['resolutions'][target_resolution]['height'])
         self.flow['inputs'][comp_name] = {
             'type': 'video-resize',
             'desc': comp_desc,
             'worker': str(self.__get_worker(comp_name)),
-            'feeder': input,
+            'feeder': input_feeder,
             'properties': {
                 'width': self._desc.globals['resolutions'][target_resolution]['width'],
                 'height': self._desc.globals['resolutions'][target_resolution]['height'],
@@ -344,19 +344,19 @@ class Planet:
         if 'video' not in self._desc.globals['profiles'][profile]:
             return None
 
-        source = mux['video'].split(':')[0]
+        input_name = mux['video'].split(':')[0]
         encoder = self._desc.globals['formats'][format]['video']
-        input_resolution = self._desc.inputs[source]['properties']['resolution']
+        input_resolution = self._desc.inputs[input_name]['properties']['resolution']
         resolution = self._desc.globals['profiles'][profile]['video']
         bitrate = self._desc.globals['bitrates'][encoder][resolution]
 
         if input_resolution == "":
             raise Exception("format definition needs video but no video input given")
 
-        feeder = self.__generate_video_feeder('capture-%s' % (mux['video']), source, input_resolution, resolution)
-        comp_name = 'encode-%s-%s-%s' % (source, encoder, resolution)
+        feeder = self.__generate_video_feeder('capture-%s' % (mux['video']), input_name, input_resolution, resolution)
+        comp_name = 'encode-%s-%s-%s' % (input_name, encoder, resolution)
         comp_desc = '%s encoder for %sx%s, from %s' % (encoder, self._desc.globals['resolutions'][resolution]['width'],
-                                                       self._desc.globals['resolutions'][resolution]['height'], source)
+                                                       self._desc.globals['resolutions'][resolution]['height'], input_name)
 
         if comp_name in self.flow['encoders-video']:
             return comp_name