[pitivi] Change "state-changed" signal name as there was a conflict with another signal.
- From: Jean-FranÃois Fortin Tam <jfft src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] Change "state-changed" signal name as there was a conflict with another signal.
- Date: Sun, 2 Sep 2012 04:01:26 +0000 (UTC)
commit b0c703f56ae2be25659d0637cff7b85aa00096d6
Author: Mathieu Duponchelle <mathieu duponchelle epitech eu>
Date: Fri Aug 10 08:54:49 2012 +0200
Change "state-changed" signal name as there was a conflict with another signal.
pitivi/utils/pipeline.py | 8 ++++----
pitivi/viewer.py | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/pitivi/utils/pipeline.py b/pitivi/utils/pipeline.py
index bb214c2..72fcf43 100644
--- a/pitivi/utils/pipeline.py
+++ b/pitivi/utils/pipeline.py
@@ -136,14 +136,14 @@ class SimplePipeline(Loggable, Signallable):
- Along with an periodic callback (optional)
Signals:
- - C{state-changed} : The state of the pipeline changed.
+ - C{state-change} : The state of the pipeline changed.
- C{position} : The current position of the pipeline changed.
- C{eos} : The Pipeline has finished playing.
- C{error} : An error happened.
"""
__signals__ = {
- "state-changed": ["state"],
+ "state-change": ["state"],
"position": ["position"],
"duration-changed": ["duration"],
"eos": [],
@@ -408,7 +408,7 @@ class SimplePipeline(Loggable, Signallable):
self._listenToPosition(False)
if emit_state_change:
- self.emit('state-changed', new)
+ self.emit('state-change', new)
elif message.type == gst.MESSAGE_ERROR:
error, detail = message.parse_error()
@@ -458,7 +458,7 @@ class Pipeline(ges.TimelinePipeline, SimplePipeline):
"""
__gsignals__ = {
- "state-changed": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
+ "state-change": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
(gobject.TYPE_INT,)),
"position": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
(gobject.TYPE_UINT64,)),
diff --git a/pitivi/viewer.py b/pitivi/viewer.py
index 0725e5f..2f38bb2 100644
--- a/pitivi/viewer.py
+++ b/pitivi/viewer.py
@@ -131,7 +131,7 @@ class PitiviViewer(gtk.VBox, Loggable):
self.pipeline.pause()
self.seeker.seek(position)
- self.pipeline.connect("state-changed", self._pipelineStateChangedCb)
+ self.pipeline.connect("state-change", self._pipelineStateChangedCb)
self.pipeline.connect("position", self._positionCb)
self.pipeline.connect("window-handle-message", self._windowHandleMessageCb)
self.pipeline.connect("duration-changed", self._durationChangedCb)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]