msmith - in flumotion/trunk: . flumotion/component/base flumotion/component/producers/playlist

[flumotion-commit at lists.fluendo.com]

Author: msmith
Date: Wed Jul  4 13:17:01 2007
New Revision: 5298

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/component/base/watcher.py
   flumotion/trunk/flumotion/component/producers/playlist/playlist.py
Log:
        * flumotion/component/base/watcher.py:
          %f is not a filename specifier. Fix warning logging.
        * flumotion/component/producers/playlist/playlist.py:
          Don't throw KeyError when trying to unschedule something not
          scheduled. Fixes #703.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Wed Jul  4 13:17:01 2007
@@ -1,3 +1,11 @@
+2007-07-04  Michael Smith <msmith at fluendo.com>
+
+	* flumotion/component/base/watcher.py:
+	  %f is not a filename specifier. Fix warning logging.
+	* flumotion/component/producers/playlist/playlist.py:
+	  Don't throw KeyError when trying to unschedule something not
+	  scheduled. Fixes #703.
+
 2007-07-04  Andy Wingo  <wingo at pobox.com>
 
 	* flumotion/common/bundle.py (BundlerBasket.getDependencies):

Modified: flumotion/trunk/flumotion/component/base/watcher.py
==============================================================================
--- flumotion/trunk/flumotion/component/base/watcher.py	(original)
+++ flumotion/trunk/flumotion/component/base/watcher.py	Wed Jul  4 13:17:01 2007
@@ -160,7 +160,7 @@
                 stat = os.stat(f)
                 ret[f] = (stat.st_mtime, stat.st_size)
             except OSError, e:
-                self.debug('could not read file %f: %s', f,
+                self.debug('could not read file %s: %s', f,
                            log.getExceptionMessage(e))
         return ret
 

Modified: flumotion/trunk/flumotion/component/producers/playlist/playlist.py
==============================================================================
--- flumotion/trunk/flumotion/component/producers/playlist/playlist.py	(original)
+++ flumotion/trunk/flumotion/component/producers/playlist/playlist.py	Wed Jul  4 13:17:01 2007
@@ -280,11 +280,11 @@
 
     def unscheduleItem(self, item):
         self.debug("Unscheduling item at uri %s", item.uri)
-        if self._hasVideo and item.hasVideo:
+        if self._hasVideo and item.hasVideo and item in self._vsrcs:
             vsrc = self._vsrcs.pop(item)
             self.videocomp.remove(vsrc)
             vsrc.set_state(gst.STATE_NULL)
-        if self._hasAudio and item.hasAudio: 
+        if self._hasAudio and item.hasAudio and item in self._asrcs: 
             asrc = self._asrcs.pop(item)
             self.audiocomp.remove(asrc)
             asrc.set_state(gst.STATE_NULL)