[pitivi] previewers: fix bad conflict resolution.
- From: Mathieu Duponchelle <mathieudu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] previewers: fix bad conflict resolution.
- Date: Thu, 1 Aug 2013 12:32:06 +0000 (UTC)
commit cd259bc0875ab1268dda69f85856e4f58562d89d
Author: Mathieu Duponchelle <mathieu duponchelle epitech eu>
Date: Thu Aug 1 14:28:33 2013 +0200
previewers: fix bad conflict resolution.
pitivi/timeline/previewers.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/pitivi/timeline/previewers.py b/pitivi/timeline/previewers.py
index 6aa8cef..cc411b7 100644
--- a/pitivi/timeline/previewers.py
+++ b/pitivi/timeline/previewers.py
@@ -787,7 +787,7 @@ class AudioPreviewer(Clutter.Actor, PreviewGenerator, Zoomable, Loggable):
def _launchPipeline(self):
self.debug('Now generating waveforms for "%s"' % filename_from_uri(self._uri))
self.peaks = None
- self.pipeline = Gst.parse_launch("uridecodebin uri=" + self._uri + " ! audioconvert ! level
name=wavelevel interval=10000000 post-messages=true ! fakesink qos=false")
+ self.pipeline = Gst.parse_launch("uridecodebin name=decode uri=" + self._uri + " ! audioconvert !
level name=wavelevel interval=10000000 post-messages=true ! fakesink qos=false")
self._level = self.pipeline.get_by_name("wavelevel")
decode = self.pipeline.get_by_name("decode")
decode.connect("autoplug-select", self._autoplugSelectCb)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]