summaryrefslogtreecommitdiff
path: root/voctocore/lib/videomix.py
diff options
context:
space:
mode:
authorMaZderMind <github@mazdermind.de>2015-05-15 10:40:17 +0200
committerMaZderMind <github@mazdermind.de>2015-05-15 10:40:17 +0200
commit18af1394a8b732d94b48b8f13e78cfcae3e45a6e (patch)
tree277a4ed47ce1823742da57a9999b75dd1a265f22 /voctocore/lib/videomix.py
parent389f87470bc988a2e4c26b4ce6e23a313aafbaf0 (diff)
Move Class-Level variables to the Instances
I should really learn python…
Diffstat (limited to 'voctocore/lib/videomix.py')
-rw-r--r--voctocore/lib/videomix.py13
1 files changed, 4 insertions, 9 deletions
diff --git a/voctocore/lib/videomix.py b/voctocore/lib/videomix.py
index 147b1ba..bd4ca70 100644
--- a/voctocore/lib/videomix.py
+++ b/voctocore/lib/videomix.py
@@ -12,15 +12,6 @@ class CompositeModes(Enum):
class VideoMix(object):
log = logging.getLogger('VideoMix')
- mixingPipeline = None
-
- caps = None
- names = []
-
- compositeMode = CompositeModes.fullscreen
- sourceA = 0
- sourceB = 1
-
def __init__(self):
self.caps = Config.get('mix', 'videocaps')
@@ -62,6 +53,10 @@ class VideoMix(object):
self.mixingPipeline = Gst.parse_launch(pipeline)
self.log.debug('Initializing Mixer-State')
+
+ self.compositeMode = CompositeModes.fullscreen
+ self.sourceA = 0
+ self.sourceB = 1
self.updateMixerState()
self.log.debug('Launching Mixing-Pipeline')