From 18af1394a8b732d94b48b8f13e78cfcae3e45a6e Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Fri, 15 May 2015 10:40:17 +0200 Subject: Move Class-Level variables to the Instances I should really learn python… MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- voctocore/lib/videomix.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'voctocore/lib/videomix.py') 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') -- cgit v1.2.3