[pitivi] pitivi: Playbin2 is dead, use playbin



commit d99693304da6ff706621ec74c86bd7c41f32408f
Author: Thibault Saunier <thibault saunier collabora com>
Date:   Mon Jul 2 17:14:22 2012 -0400

    pitivi: Playbin2 is dead, use playbin

 pitivi/mediafilespreviewer.py  |    6 ++----
 pitivi/timeline/thumbnailer.py |    2 +-
 pitivi/viewer.py               |    2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/pitivi/mediafilespreviewer.py b/pitivi/mediafilespreviewer.py
index f98ef56..d56482c 100644
--- a/pitivi/mediafilespreviewer.py
+++ b/pitivi/mediafilespreviewer.py
@@ -132,10 +132,8 @@ class PreviewWidget(gtk.VBox, Loggable):
         self.pack_start(vbox, expand=False, fill=False)
 
     def _unsurePlaybin(self):
-        try:
-            self.player = gst.element_factory_make("playbin2", "preview-player")
-        except:
-            self.player = gst.element_factory_make("playbin", "preview-player")
+        # FIXME GI, remove that method
+        self.player = gst.element_factory_make("playbin", "preview-player")
 
     def setMinimal(self):
         self.remove(self.l_tags)
diff --git a/pitivi/timeline/thumbnailer.py b/pitivi/timeline/thumbnailer.py
index 2764732..7288714 100644
--- a/pitivi/timeline/thumbnailer.py
+++ b/pitivi/timeline/thumbnailer.py
@@ -282,7 +282,7 @@ class RandomAccessPreviewer(Previewer):
         Previewer.__init__(self, instance, uri)
         self._queue = []
 
-        bin = gst.element_factory_make("playbin2")
+        bin = gst.element_factory_make("playbin")
         bin.props.uri = uri
 
         # assume 50 pixel height
diff --git a/pitivi/viewer.py b/pitivi/viewer.py
index f1b958f..0f3a827 100644
--- a/pitivi/viewer.py
+++ b/pitivi/viewer.py
@@ -402,7 +402,7 @@ class PitiviViewer(gtk.VBox, Loggable):
                 clip_uri, gst.TIME_ARGS(position))
 
             self._oldTimelinePos = self.pipeline.getPosition()
-            self._tmp_pipeline = gst.element_factory_make("playbin2")
+            self._tmp_pipeline = gst.element_factory_make("playbin")
             self._tmp_pipeline.set_property("uri", clip_uri)
             self.setPipeline(SimplePipeline(self._tmp_pipeline))
             self._lastClipTrimTime = cur_time



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]