pitivi r1351 - in trunk/pitivi: timeline ui

[edwardrv svn gnome org]

Author: edwardrv
Date: Mon Nov  3 12:28:19 2008
New Revision: 1351
URL: http://svn.gnome.org/viewvc/pitivi?rev=1351&view=rev

Log:
various comments and minor fixes

Modified:
   trunk/pitivi/timeline/objects.py
   trunk/pitivi/timeline/source.py
   trunk/pitivi/ui/dnd.py
   trunk/pitivi/ui/timeline.py

Modified: trunk/pitivi/timeline/objects.py
==============================================================================
--- trunk/pitivi/timeline/objects.py	(original)
+++ trunk/pitivi/timeline/objects.py	Mon Nov  3 12:28:19 2008
@@ -415,6 +415,8 @@
         if self._factory:
             gst.warning("Can't set a factory, this object already has one : %r" % self._factory)
             return
+        if factory !=None and not isinstance(factory, ObjectFactory):
+            raise TypeError, "factory provided is not an ObjectFactory"
         gst.log("factory:%r requires factory:%r" % (factory, self.__requires_factory__))
         self._factory = factory
         if not self.__requires_factory__ or self._factory:

Modified: trunk/pitivi/timeline/source.py
==============================================================================
--- trunk/pitivi/timeline/source.py	(original)
+++ trunk/pitivi/timeline/source.py	Mon Nov  3 12:28:19 2008
@@ -49,6 +49,7 @@
         TimelineObject.__init__(self, **kwargs)
 
     def _makeGnlObject(self):
+        # FIXME : This should all be in *Factory.make*bin
         gst.debug("Making a source for %r" % self)
         if self.isaudio:
             caps = gst.caps_from_string("audio/x-raw-int;audio/x-raw-float")
@@ -71,6 +72,8 @@
             obj = self.makeGnlSourceContents()
         except:
             gst.debug("Failure in calling self.makeGnlSourceContents()")
+            import sys
+            print sys.exc_info()
             return None
         gnl.add(obj)
 

Modified: trunk/pitivi/ui/dnd.py
==============================================================================
--- trunk/pitivi/ui/dnd.py	(original)
+++ trunk/pitivi/ui/dnd.py	Mon Nov  3 12:28:19 2008
@@ -23,11 +23,13 @@
 Drag and drop constants
 """
 
-# FIXME : ... this should be moved to pitivi.ui
-
 TYPE_TEXT_PLAIN = 24
 TYPE_URI_LIST = 25
+
+# FileSourceFactory (or subclasses)
 TYPE_PITIVI_FILESOURCE = 26
+
+# What objects to these correspond to ???
 TYPE_PITIVI_EFFECT = 27
 TYPE_PITIVI_AUDIO_EFFECT = 28
 TYPE_PITIVI_VIDEO_EFFECT = 29

Modified: trunk/pitivi/ui/timeline.py
==============================================================================
--- trunk/pitivi/ui/timeline.py	(original)
+++ trunk/pitivi/ui/timeline.py	Mon Nov  3 12:28:19 2008
@@ -111,6 +111,7 @@
         gst.log("SimpleTimeline, targetType:%d, selection.data:%s" % 
             (targetType, selection.data))
         # FIXME: need to handle other types
+        # FIXME: We also need to clarify the usage of FileSource
         if targetType == dnd.TYPE_PITIVI_FILESOURCE:
             uri = selection.data
         else: