zaheer - in flumotion/branches/platform-3: . flumotion/component/producers/firewire

[flumotion-commit at lists.fluendo.com]

Author: zaheer
Date: Wed May 16 12:42:00 2007
New Revision: 4958

Modified:
   flumotion/branches/platform-3/   (props changed)
   flumotion/branches/platform-3/ChangeLog
   flumotion/branches/platform-3/flumotion/component/producers/firewire/firewire.py
Log:
2007-04-13  Zaheer Abbas Merali  <zaheerabbas at merali dot org>

        merged from: TRUNK, 4764

        * flumotion/component/producers/firewire/firewire.py
          (Firewire.setVolume): Remove unnecessary whitespace.
          (Firewire._bus_message_received_cb): Fix bug
          detecting camera disconnection. Turns out gst.Structure
          is no longer iterable.



Modified: flumotion/branches/platform-3/ChangeLog
==============================================================================
--- flumotion/branches/platform-3/ChangeLog	(original)
+++ flumotion/branches/platform-3/ChangeLog	Wed May 16 12:42:00 2007
@@ -1,5 +1,15 @@
-2007-05-16  Thomas Vander Stichele  <thomas at apestaart dot org>
+2007-04-13  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+
+	merged from: TRUNK, 4764
+
+	* flumotion/component/producers/firewire/firewire.py
+	  (Firewire.setVolume): Remove unnecessary whitespace.
+	  (Firewire._bus_message_received_cb): Fix bug
+	  detecting camera disconnection. Turns out gst.Structure
+	  is no longer iterable.
 
+2007-05-16  Thomas Vander Stichele  <thomas at apestaart dot org>
+	
 	merged from: TRUNK, 4828,4829,4877-4879,4898,4913
 
 	* flumotion/component/misc/httpfile/file.py (File.renderAuthenticated,

Modified: flumotion/branches/platform-3/flumotion/component/producers/firewire/firewire.py
==============================================================================
--- flumotion/branches/platform-3/flumotion/component/producers/firewire/firewire.py	(original)
+++ flumotion/branches/platform-3/flumotion/component/producers/firewire/firewire.py	Wed May 16 12:42:00 2007
@@ -135,7 +135,6 @@
         @param value: float between 0.0 and 4.0
         """
         self.debug("Setting volume to %f" % (value))
-
         self.volume.set_property('volume', value)
 
     # detect camera unplugging or other cause of firewire bus reset
@@ -147,9 +146,8 @@
         if message.structure.get_name() == "ieee1394-bus-reset":
             # we have a firewire bus reset
             s = message.structure
-            # current-device-change is only in gst-plugins-good 0.10.3
-            # not yet released
-            if 'current-device-change' in s:
+            # current-device-change is only in gst-plugins-good >= 0.10.3
+            if s.has_key('current-device-change'):
                 if s['current-device-change'] != 0:
                     # we actually have a connect or disconnect of the camera
                     # so first remove all the previous messages warning about a