[pitivi] Fix for changed API
- From: Jean-FranÃois Fortin Tam <jfft src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] Fix for changed API
- Date: Sun, 2 Sep 2012 03:59:59 +0000 (UTC)
commit 6f74b671e5c1404c737c490252233a0fe82373ec
Author: Matas Brazdeikis <matas brazdeikis lt>
Date: Fri Aug 3 15:20:06 2012 +0100
Fix for changed API
pitivi/mediafilespreviewer.py | 6 +++---
pitivi/timeline/track.py | 4 ++--
pitivi/utils/pipeline.py | 3 ++-
3 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/pitivi/mediafilespreviewer.py b/pitivi/mediafilespreviewer.py
index f7dbe6b..8783b8a 100644
--- a/pitivi/mediafilespreviewer.py
+++ b/pitivi/mediafilespreviewer.py
@@ -327,7 +327,7 @@ class PreviewWidget(gtk.VBox, Loggable):
def _update_position(self, *args):
if self.is_playing:
- curr_pos = self.player.query_position(self.time_format, None)[0]
+ curr_pos = self.player.query_position(self.time_format)[1]
self.pos_adj.set_value(long(curr_pos))
return self.is_playing
@@ -392,7 +392,7 @@ class PreviewWidget(gtk.VBox, Loggable):
else:
realsink = sink
if realsink.get_factory().get_name() == 'autovideosink':
- realsink = realsink.sinks().next()
+ realsink = realsink.iterate_sinks().next()[1]
realsink.set_property('force-aspect-ratio', True)
realsink.set_property("handle-expose", True)
@@ -410,7 +410,7 @@ class PreviewWidget(gtk.VBox, Loggable):
gobject.TYPE_INT,
gobject.TYPE_UINT):
name = gst.tag_get_nick(tag)
- value = unicode(tag_list[tag]).replace('<', ' ').replace('>', ' ')
+ value = unicode(taglist.get_string(tag)[1]).replace('<', ' ').replace('>', ' ')
self.tags[name] = value
def _tag_found_cb(self, abus, mess):
diff --git a/pitivi/timeline/track.py b/pitivi/timeline/track.py
index 1e8a15f..ef75625 100644
--- a/pitivi/timeline/track.py
+++ b/pitivi/timeline/track.py
@@ -188,10 +188,10 @@ class TrackObjectController(Controller):
self.previous_x = self.previous_x * ratio
self.ref = Zoomable.pixelToNs(10000000000)
- tx = self._view.props.parent.get_transform()
+ tx = self._view.props.parent.get_simple_transform()
# store y offset for later priority calculation
- self._y_offset = tx[5]
+ self._y_offset = tx[4]
# zero y component of mousdown coordiante
self._mousedown = Point(self._mousedown[0], 0)
diff --git a/pitivi/utils/pipeline.py b/pitivi/utils/pipeline.py
index b46ffa3..bb214c2 100644
--- a/pitivi/utils/pipeline.py
+++ b/pitivi/utils/pipeline.py
@@ -439,7 +439,8 @@ class SimplePipeline(Loggable, Signallable):
# handle element message synchronously
self.emit('window-handle-message', message)
#Remove the bus sync handler avoiding deadlocks
- self._bus.set_sync_handler(None)
+ #FIXME wrong anotation dont allow none, reported as bug b681139
+ #self._bus.set_sync_handler(None, None)
self._has_sync_bus_handler = False
return gst.BUS_PASS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]