pitivi r1171 - in branches/SOC_2008_BLEWIS: . pitivi/timeline

[edwardrv svn gnome org]

Author: edwardrv
Date: Wed Jul 16 15:50:28 2008
New Revision: 1171
URL: http://svn.gnome.org/viewvc/pitivi?rev=1171&view=rev

Log:
* pitivi/timeline/composition.py:
* pitivi/timeline/objects.py:
* pitivi/timeline/source.py:
Fix issues with (media_)start/duration introduced in refactoring.
Add more debug statements.


Modified:
   branches/SOC_2008_BLEWIS/ChangeLog
   branches/SOC_2008_BLEWIS/pitivi/timeline/composition.py
   branches/SOC_2008_BLEWIS/pitivi/timeline/objects.py
   branches/SOC_2008_BLEWIS/pitivi/timeline/source.py

Modified: branches/SOC_2008_BLEWIS/pitivi/timeline/composition.py
==============================================================================
--- branches/SOC_2008_BLEWIS/pitivi/timeline/composition.py	(original)
+++ branches/SOC_2008_BLEWIS/pitivi/timeline/composition.py	Wed Jul 16 15:50:28 2008
@@ -427,10 +427,10 @@
         my_add_sorted(self.sources[position-1], source)
 
         # add it to self.gnlobject
-        self.gnlobject.info("adding %s to our composition" % source.gnlobject)
+        self.gnlobject.info("adding %s to our composition" % source.gnlobject.props.name)
         self.gnlobject.add(source.gnlobject)
 
-        self.gnlobject.info("added source %s" % source.gnlobject)
+        self.gnlobject.info("added source %s" % source.gnlobject.props.name)
         gst.info("%s" % str(self.sources))
         self.emit('source-added', source)
 
@@ -447,7 +447,7 @@
         auto_linked : if True will add the brother (if any) of the given source
                 to the linked composition with the same parameters
         """
-        self.gnlobject.info("source %s , position:%d, self.sources:%s" %(source, position, self.sources))
+        self.gnlobject.info("source %s , position:%d, self.sources:%s" %(source.name, position, self.sources))
 
         # make sure object to add has valid start/duration
         if source.start == -1 or source.duration <= 0:

Modified: branches/SOC_2008_BLEWIS/pitivi/timeline/objects.py
==============================================================================
--- branches/SOC_2008_BLEWIS/pitivi/timeline/objects.py	(original)
+++ branches/SOC_2008_BLEWIS/pitivi/timeline/objects.py	Wed Jul 16 15:50:28 2008
@@ -353,7 +353,7 @@
         # really modify the start/duration time
         self.gnlobject.info("start:%s , duration:%s" %( gst.TIME_ARGS(start),
                                                         gst.TIME_ARGS(duration)))
-        if duration and (not self.duration == duration or force):
+        if duration > 0 and (not self.duration == duration or force):
             self.duration = duration
             self.gnlobject.set_property("duration", long(duration))
         if not start == gst.CLOCK_TIME_NONE and (not self.start == start or force):
@@ -376,12 +376,16 @@
         duration = 0
         if property.name == "start":
             start = gnlobject.get_property("start")
+            gst.log("start: %s => %s" % (gst.TIME_ARGS(self.start),
+                                         gst.TIME_ARGS(start)))
             if start == self.start:
                 start = gst.CLOCK_TIME_NONE
             else:
                 self.start = long(start)
         elif property.name == "duration":
             duration = gnlobject.get_property("duration")
+            gst.log("duration: %s => %s" % (gst.TIME_ARGS(self.duration),
+                                            gst.TIME_ARGS(duration)))
             if duration == self.duration:
                 duration = 0
             else:

Modified: branches/SOC_2008_BLEWIS/pitivi/timeline/source.py
==============================================================================
--- branches/SOC_2008_BLEWIS/pitivi/timeline/source.py	(original)
+++ branches/SOC_2008_BLEWIS/pitivi/timeline/source.py	Wed Jul 16 15:50:28 2008
@@ -126,8 +126,8 @@
         mduration = None
         if property.name == "media-start":
             mstart = gnlobject.get_property("media-start")
-            gst.log("%s %s" % (gst.TIME_ARGS(mstart),
-                               gst.TIME_ARGS(self.media_start)))
+            gst.log("start: %s => %s" % (gst.TIME_ARGS(self.media_start),
+                                         gst.TIME_ARGS(mstart)))
             if self.media_start == gst.CLOCK_TIME_NONE:
                 self.media_start = mstart
             elif mstart == self.media_start:
@@ -136,8 +136,8 @@
                 self.media_start = mstart
         elif property.name == "media-duration":
             mduration = gnlobject.get_property("media-duration")
-            gst.log("%s %s" % (gst.TIME_ARGS(mduration),
-                               gst.TIME_ARGS(self.media_duration)))
+            gst.log("duration: %s => %s" % (gst.TIME_ARGS(self.media_duration),
+                                         gst.TIME_ARGS(mduration)))
             if mduration == self.media_duration:
                 mduration = None
             else:
@@ -189,20 +189,19 @@
         TimelineSource.__init__(self, **kw)
 
     def _makeGnlObject(self):
+        if self.media_start == gst.CLOCK_TIME_NONE:
+            self.media_start = 0
+        if self.media_duration == 0:
+            self.media_duration = self.factory.length
+
         gnlobject = TimelineSource._makeGnlObject(self)
         if gnlobject == None:
             return None
 
         # we override start/duration
-        gnlobject.set_property("duration", long(1))
         gnlobject.set_property("duration", long(self.factory.length))
         gnlobject.set_property("start", long(0))
 
-        if self.media_start == gst.CLOCK_TIME_NONE:
-            self.media_start = 0
-        if self.media_duration == 0:
-            self.media_duration = self.factory.length
-
         return gnlobject
 
     def makeGnlSourceContents(self):