initialize all instance attributes early so that pipeline setup failu…

…res can still run through the cleanup function safely

git-svn-id: https://xpra.org/svn/Xpra/trunk@12248 3bb7dfac-3a0b-4e04-842a-767bc560f471

src/xpra/sound/sink.py

@@ -75,6 +75,18 @@ def __init__(self, sink_type=None, sink_options={}, codecs=get_codecs(), codec_o
         SoundPipeline.__init__(self, codec)
         self.sink_type = sink_type
         self.levels = deque(maxlen=100)
+        self.volume = None
+        self.src    = None
+        self.queue  = None
+        self.overruns = 0
+        self.underruns = 0
+        self.overrun_events = deque(maxlen=100)
+        self.underrun_events = deque(maxlen=100)
+        self.queue_state = "starting"
+        self.last_underrun = 0
+        self.last_overrun = 0
+        self.last_max_update = time.time()
+        self.level_lock = Lock()
         decoder_str = plugin_str(decoder, codec_options)
         pipeline_els = []
         appsrc_el = ["appsrc",
@@ -122,15 +134,6 @@ def __init__(self, sink_type=None, sink_options={}, codecs=get_codecs(), codec_o
         self.volume = self.pipeline.get_by_name("volume")
         self.src    = self.pipeline.get_by_name("src")
         self.queue  = self.pipeline.get_by_name("queue")
-        self.overruns = 0
-        self.underruns = 0
-        self.overrun_events = deque(maxlen=100)
-        self.underrun_events = deque(maxlen=100)
-        self.queue_state = "starting"
-        self.last_underrun = 0
-        self.last_overrun = 0
-        self.last_max_update = time.time()
-        self.level_lock = Lock()
         if QUEUE_SILENT==0 and self.queue:
             self.queue.connect("overrun", self.queue_overrun)
             self.queue.connect("underrun", self.queue_underrun)

src/xpra/sound/src.py

@@ -68,8 +68,16 @@ def __init__(self, src_type=None, src_options={}, codecs=get_codecs(), codec_opt
             raise InitExit(1, "no matching codecs between arguments '%s' and supported list '%s'" % (csv(codecs), csv(get_codecs().keys())))
         codec = matching[0]
         encoder, fmt = get_encoder_formatter(codec)
-        SoundPipeline.__init__(self, codec)
+        self.queue = None
+        self.caps = None
+        self.volume = None
+        self.sink = None
+        self.src = None
         self.src_type = src_type
+        self.buffer_latency = False
+        self.jitter_queue = None
+        self.file = None
+        SoundPipeline.__init__(self, codec)
         src_options["name"] = "src"
         source_str = plugin_str(src_type, src_options)
         #FIXME: this is ugly and relies on the fact that we don't pass any codec options to work!
@@ -97,8 +105,6 @@ def __init__(self, src_type=None, src_options={}, codecs=get_codecs(), codec_opt
         self.sink = self.pipeline.get_by_name("sink")
         if SOURCE_QUEUE_TIME>0:
             self.queue  = self.pipeline.get_by_name("queue")
-        else:
-            self.queue = None
         if self.queue:
             try:
                 self.queue.set_property("silent", True)
@@ -111,7 +117,6 @@ def __init__(self, src_type=None, src_options={}, codecs=get_codecs(), codec_opt
                 self.sink.set_property("enable-last-sample", False)
         except Exception as e:
             log("failed to disable last buffer: %s", e)
-        self.caps = None
         self.skipped_caps = set()
         if JITTER>0:
             self.jitter_queue = Queue()
@@ -124,7 +129,6 @@ def __init__(self, src_type=None, src_options={}, codecs=get_codecs(), codec_opt
             self.sink.connect("new-buffer", self.on_new_buffer)
             self.sink.connect("new-preroll", self.on_new_preroll0)
         self.src = self.pipeline.get_by_name("src")
-        self.buffer_latency = False
         if not WIN32 and not OSX:
             try:
                 global BUFFER_TIME, LATENCY_TIME
@@ -143,7 +147,6 @@ def settime(attr, v):
                 self.buffer_latency = True
             except Exception as e:
                 log.info("source %s does not support 'buffer-time' or 'latency-time': %s", self.src_type, e)
-        self.file = None
         gen = generation.increase()
         if SAVE_TO_FILE is not None:
             parts = codec.split("+")