pitivi r1120 - in trunk: . pitivi pitivi/timeline

[edwardrv svn gnome org]

Author: edwardrv
Date: Sat May 17 12:54:58 2008
New Revision: 1120
URL: http://svn.gnome.org/viewvc/pitivi?rev=1120&view=rev

Log:
* pitivi/bin.py:
lower error level for a non-fatal issue.
* pitivi/pitivi.py:
project is not a class property
* pitivi/timeline/objects.py:
Fix __repr__ and add more debugging


Modified:
   trunk/ChangeLog
   trunk/pitivi/bin.py
   trunk/pitivi/pitivi.py
   trunk/pitivi/timeline/objects.py

Modified: trunk/pitivi/bin.py
==============================================================================
--- trunk/pitivi/bin.py	(original)
+++ trunk/pitivi/bin.py	Sat May 17 12:54:58 2008
@@ -229,7 +229,7 @@
     def stopRecording(self):
         """ stop the recording, removing the encoding thread """
         if self.recording == False:
-            self.error("This bin is not in recording mode !")
+            self.warning("This bin is not in recording mode !")
             return False
 
         self.set_state(gst.STATE_PAUSED)

Modified: trunk/pitivi/pitivi.py
==============================================================================
--- trunk/pitivi/pitivi.py	(original)
+++ trunk/pitivi/pitivi.py	Sat May 17 12:54:58 2008
@@ -89,15 +89,13 @@
                        ( ))
         }
 
-    project = None
-
     def __init__(self, use_ui=True, *args, **kwargs):
         """
         initialize pitivi with the command line arguments
         """
         gst.log("starting up pitivi...")
         gobject.GObject.__init__(self)
-
+		self.project = None
         self._use_ui = use_ui
 
         # patch gst-python for new behaviours

Modified: trunk/pitivi/timeline/objects.py
==============================================================================
--- trunk/pitivi/timeline/objects.py	(original)
+++ trunk/pitivi/timeline/objects.py	Sat May 17 12:54:58 2008
@@ -327,7 +327,9 @@
         self._setFactory(factory)
 
     def __repr__(self):
-        return "<%s '%s' at 0x%x>" % (type(self).__name__, self.name, id(self))
+        if hasattr(self, "name"):
+            return "<%s '%s' at 0x%x>" % (type(self).__name__, self.name, id(self))
+        return "<%s at 0x%x>" % (type(self).__name__, id(self))
 
     def _makeGnlObject(self):
         """ create and return the gnl_object """
@@ -340,8 +342,10 @@
         gst.log("factory:%r requires factory:%r" % (factory, self.__requires_factory__))
         self.factory = factory
         if not self.__requires_factory__ or self.factory:
+            gst.log("%r Creating associated gnlobject" % self)
             self.gnlobject = self._makeGnlObject()
             self.gnlobject.connect("notify::start", self._startDurationChangedCb)
+            self.gnlobject.log("got gnlobject !")
             self.gnlobject.connect("notify::duration", self._startDurationChangedCb)
             self._setStartDurationTime(self.start, self.duration, True)
 
@@ -364,6 +368,9 @@
 
     def _startDurationChangedCb(self, gnlobject, property):
         """ start/duration time has changed """
+        gst.log("self:%r , gnlobject:%r" % (self, gnlobject))
+        if not gnlobject == self.gnlobject:
+            gst.warning("We're receiving signals from an object we dont' control (self.gnlobject:%r, gnlobject:%r)" % (self.gnlobject, gnlobject))
         self.gnlobject.debug("property:%s" % property.name)
         start = -1
         duration = -1