msmith - in flumotion/trunk: . flumotion/component flumotion/component/consumers/httpstreamer

[flumotion-commit at lists.fluendo.com]

Author: msmith
Date: Tue Feb 27 12:51:16 2007
New Revision: 4530

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/component/consumers/httpstreamer/http.py
   flumotion/trunk/flumotion/component/feedcomponent010.py
Log:
        * flumotion/component/consumers/httpstreamer/http.py:
          Ensure we chain up to our parent when stopping!
          Possibly fixes some shutdown races.

        * flumotion/component/feedcomponent010.py:
          Add some debug.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Tue Feb 27 12:51:16 2007
@@ -1,3 +1,12 @@
+2007-02-27  Michael Smith  <msmith at fluendo.com>
+
+	* flumotion/component/consumers/httpstreamer/http.py:
+	  Ensure we chain up to our parent when stopping!
+	  Possibly fixes some shutdown races.
+
+	* flumotion/component/feedcomponent010.py:
+	  Add some debug.
+
 2007-02-26  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* flumotion/admin/gtk/wizard.py:

Modified: flumotion/trunk/flumotion/component/consumers/httpstreamer/http.py
==============================================================================
--- flumotion/trunk/flumotion/component/consumers/httpstreamer/http.py	(original)
+++ flumotion/trunk/flumotion/component/consumers/httpstreamer/http.py	Tue Feb 27 12:51:16 2007
@@ -658,7 +658,9 @@
             self._updateCallLaterId = None
 
         if self.type == 'slave' and self._pbclient:
-            return self._pbclient.deregisterPath(self.mountPoint)
+            d1 = self._pbclient.deregisterPath(self.mountPoint)
+            d2 = feedcomponent.ParseLaunchComponent.do_stop(self)
+            return defer.DeferredList([d1,d2])
         else:
             return feedcomponent.ParseLaunchComponent.do_stop(self)
 

Modified: flumotion/trunk/flumotion/component/feedcomponent010.py
==============================================================================
--- flumotion/trunk/flumotion/component/feedcomponent010.py	(original)
+++ flumotion/trunk/flumotion/component/feedcomponent010.py	Tue Feb 27 12:51:16 2007
@@ -609,6 +609,7 @@
                     feedId)
             self._add_buffer_probe(pad, feedId, firstTime=True)
 
+        self.debug("Setting pipeline %r to GST_STATE_PLAYING", self.pipeline)
         self.pipeline.set_state(gst.STATE_PLAYING)
 
     def _feeder_probe_calllater(self):
@@ -815,6 +816,7 @@
         multifdsink.
         This will call the registered callable on the fd.
         """
+        self.debug("removing client for fd %d", fd)
         feedId = ':'.join(sink.get_name().split(':')[1:])
         self._feeders[feedId].removeClient(fd)
         if fd in self._fdCleanup: