msmith - in flumotion/branches/playlist-1: . flumotion/component/producers/playlist

[flumotion-commit at lists.fluendo.com]

Author: msmith
Date: Thu May  3 12:51:06 2007
New Revision: 4873

Modified:
   flumotion/branches/playlist-1/ChangeLog
   flumotion/branches/playlist-1/flumotion/component/producers/playlist/playlist.py
   flumotion/branches/playlist-1/flumotion/component/producers/playlist/playlist.xml
Log:
        * flumotion/component/producers/playlist/playlist.py:
        * flumotion/component/producers/playlist/playlist.xml:
          Some renaming and minor fixes.



Modified: flumotion/branches/playlist-1/ChangeLog
==============================================================================
--- flumotion/branches/playlist-1/ChangeLog	(original)
+++ flumotion/branches/playlist-1/ChangeLog	Thu May  3 12:51:06 2007
@@ -1,3 +1,9 @@
+2007-05-03  Michael Smith,,,  <set EMAIL_ADDRESS environment variable>
+
+	* flumotion/component/producers/playlist/playlist.py:
+	* flumotion/component/producers/playlist/playlist.xml:
+	  Some renaming and minor fixes.
+
 2007-05-03  Michael Smith <msmith at fluendo.com>
 
 	* flumotion/component/producers/playlist/playlist.py:

Modified: flumotion/branches/playlist-1/flumotion/component/producers/playlist/playlist.py
==============================================================================
--- flumotion/branches/playlist-1/flumotion/component/producers/playlist/playlist.py	(original)
+++ flumotion/branches/playlist-1/flumotion/component/producers/playlist/playlist.py	Thu May  3 12:51:06 2007
@@ -76,13 +76,13 @@
     return gnlsrc
 
 
-class PlaylistMedium(feedcomponent.FeedComponentMedium):
+class PlaylistProducerMedium(feedcomponent.FeedComponentMedium):
     def __init__(self, comp):
         feedcomponent.FeedComponentMedium.__init__(self, comp)
 
-class Playlist(feedcomponent.FeedComponent):
+class PlaylistProducer(feedcomponent.FeedComponent):
 
-    componentMediumClass = PlaylistMedium
+    componentMediumClass = PlaylistProducerMedium
 
     def init(self):
         self.basetime = -1
@@ -200,8 +200,10 @@
         Use audio and/or video.
         """
         start = starttime - self.basetime
-        # This works around a bug somewhere. TODO! 
+        # This works around a bug in videotestsrc and videorate. TODO! This
+        # can be removed once we upgrade to a future version of gst-plugins-base
         start = (start / gst.SECOND) * gst.SECOND
+
         if start < 0:
             if start + duration < 0:
                 return
@@ -219,18 +221,19 @@
         if audio:
             asrc = file_gnl_src(None, uri, self.audiocaps,
                 start, duration, offset, 0)
-            self.videocomp.add(asrc)
+            self.audiocomp.add(asrc)
 
     def testSchedule(self, pipeline):
         # Now, we want to schedule something for a particular date...
-        uri = "file:///home/msmith/media/testfiles/matrix.avi"
+        uri = "file:///home/msmith/media/testfiles/thehillshaveeyes_h480p.mov"
 
         for minute in xrange(8, 50):
             when = (2007, 5, 3, 11, minute, 0, 0, 123, 0) 
             whengst = int(time.mktime(when)) * gst.SECOND
 
             duration = 45 * gst.SECOND
-            self.scheduleFile(uri, whengst, duration, 0, True, False)
+            offset = 15 * gst.SECOND
+            self.scheduleFile(uri, whengst, duration, offset, True, False)
 
     def create_pipeline(self):
         pipeline = self._buildPipeline() 

Modified: flumotion/branches/playlist-1/flumotion/component/producers/playlist/playlist.xml
==============================================================================
--- flumotion/branches/playlist-1/flumotion/component/producers/playlist/playlist.xml	(original)
+++ flumotion/branches/playlist-1/flumotion/component/producers/playlist/playlist.xml	Thu May  3 12:51:06 2007
@@ -8,7 +8,7 @@
       <feeder name="video"/>
       <entries>
         <entry type="component" location="playlist.py"
-               function="Playlist" />
+               function="PlaylistProducer" />
       </entries>
 
       <synchronization required="yes" clock-priority="110" />