#669:

* when we stop the wrapper, we want to clean everything so call cleanup() which calls stop()
* prevent races in stop() which can also be called by the network thread..
* don't bother logging details of data we drop (and we do drop it now that we call cleanup during the wrapper exit)

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

src/xpra/sound/sink.py

@@ -182,9 +182,10 @@ def get_info(self):
 
     def add_data(self, data, metadata=None):
         #debug("sound sink: adding %s bytes to %s, metadata: %s, level=%s", len(data), self.src, metadata, int(self.queue.get_property("current-level-time")/MS_TO_NS))
-        log("add_data(%s bytes, %s) queue_state=%s, src=%s", len(data), metadata, self.queue_state, self.src)
         if not self.src:
+            log("add_data(..) dropped")
             return
+        log("add_data(%s bytes, %s) queue_state=%s, src=%s", len(data), metadata, self.queue_state, self.src)
         if self.queue_state == "overrun":
             clt = self.queue.get_property("current-level-time")
             qpct = int(min(QUEUE_TIME, clt)*100.0/QUEUE_TIME)

src/xpra/sound/sound_pipeline.py

@@ -105,7 +105,9 @@ def start(self):
         log("SoundPipeline.start() done")
 
     def stop(self):
-        if not self.pipeline:
+        p = self.pipeline
+        self.pipeline = None
+        if not p:
             return
         log("SoundPipeline.stop()")
         #uncomment this to see why we end up calling stop()
@@ -116,7 +118,7 @@ def stop(self):
         #        if v:
         #            log(v)
         self.state = "stopped"
-        self.pipeline.set_state(gst.STATE_NULL)
+        p.set_state(gst.STATE_NULL)
         self.volume = None
         log("SoundPipeline.stop() done")
 

src/xpra/sound/wrapper.py

@@ -60,7 +60,7 @@ def start(self):
     def stop(self):
         wo = self.wrapped_object
         if wo:
-            wo.stop()
+            wo.cleanup()
             self.wrapped_object = None
         subprocess_callee.stop(self)