thomasvs - in flumotion/branches/platform-3: . flumotion/component

[flumotion-commit at lists.fluendo.com]

Author: thomasvs
Date: Tue Jul 31 16:55:21 2007
New Revision: 5395

Modified:
   flumotion/branches/platform-3/   (props changed)
   flumotion/branches/platform-3/ChangeLog
   flumotion/branches/platform-3/flumotion/component/feedcomponent.py
Log:
merge gstdebug fix from trunk

Merged revisions 5377 via svnmerge from 
https://svn.fluendo.com/svn/flumotion/trunk

........
  r5377 | thomasvs | 2007-07-30 15:55:41 +0200 (Mon, 30 Jul 2007) | 7 lines
  
  	* flumotion/component/feedcomponent.py
  	  (FeedComponentMedium.remote_setGstDebug):
  	  Fix setting the debug stream to a glob.
  	  Tested with bin/flumotion-command -m localhost:7531 invoke
  	  /default/http-audio setGstDebug s multi*:5
........


Modified: flumotion/branches/platform-3/ChangeLog
==============================================================================
--- flumotion/branches/platform-3/ChangeLog	(original)
+++ flumotion/branches/platform-3/ChangeLog	Tue Jul 31 16:55:21 2007
@@ -1,4 +1,13 @@
-2007-07-31  Michael Smith <msmith at fluendo.com>
+2007-07-30  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* flumotion/component/feedcomponent.py
+	  (FeedComponentMedium.remote_setGstDebug):
+	  Fix setting the debug stream to a glob.
+	  Tested with bin/flumotion-command -m localhost:7531 invoke
+	  /default/http-audio setGstDebug s multi*:5
+	  Merged from trunk, [5733]
+
+2007-07-30  Michael Smith <msmith at fluendo.com>
 
 	* flumotion/component/feedcomponent.py:
 	* flumotion/component/feedcomponent010.py:

Modified: flumotion/branches/platform-3/flumotion/component/feedcomponent.py
==============================================================================
--- flumotion/branches/platform-3/flumotion/component/feedcomponent.py	(original)
+++ flumotion/branches/platform-3/flumotion/component/feedcomponent.py	Tue Jul 31 16:55:21 2007
@@ -106,13 +106,19 @@
                 value = int(pair[0])
             elif len(pair) == 2:
                 glob, value = pair
+                value = int(value)
             else:
                 self.warning("Cannot parse GStreamer debug setting '%s'." %
                     part) 
                 continue
 
             if glob:
-                gst.debug_set_threshold_for_name(glob, value)
+                try:
+                    # value has to be an integer
+                    gst.debug_set_threshold_for_name(glob, value)
+                except TypeError:
+                    self.warning("Cannot set glob %s to value %s" % (
+                        glob, value))
             else:
                 gst.debug_set_default_threshold(value)