[pitivi/ges: 169/287] utils: Move togglePayback() from misc.py to playback.py
- From: Jean-FranÃois Fortin Tam <jfft src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi/ges: 169/287] utils: Move togglePayback() from misc.py to playback.py
- Date: Thu, 15 Mar 2012 16:40:02 +0000 (UTC)
commit 2d2d340622aa6bbe33101979b64548343f39c785
Author: Thibault Saunier <thibault saunier collabora com>
Date: Mon Jan 9 16:17:10 2012 -0300
utils: Move togglePayback() from misc.py to playback.py
pitivi/ui/encodingdialog.py | 2 +-
pitivi/ui/viewer.py | 2 +-
pitivi/utils/misc.py | 17 -----------------
pitivi/utils/playback.py | 17 +++++++++++++++++
4 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/pitivi/ui/encodingdialog.py b/pitivi/ui/encodingdialog.py
index 21c0653..41d6d5f 100644
--- a/pitivi/ui/encodingdialog.py
+++ b/pitivi/ui/encodingdialog.py
@@ -33,7 +33,7 @@ import time
from gettext import gettext as _
from pitivi import configure
-from pitivi.utils.misc import togglePlayback, Seeker, beautify_ETA
+from pitivi.utils.playback import togglePlayback, Seeker, beautify_ETA
from pitivi.settings import MultimediaSettings
from pitivi.utils.signal import Signallable
diff --git a/pitivi/ui/viewer.py b/pitivi/ui/viewer.py
index 60d9e17..601d49a 100644
--- a/pitivi/ui/viewer.py
+++ b/pitivi/ui/viewer.py
@@ -29,7 +29,7 @@ from gettext import gettext as _
from pitivi.utils.loggable import Loggable
from pitivi.settings import GlobalSettings
-from pitivi.utils.misc import togglePlayback
+from pitivi.utils.playback import togglePlayback
from pitivi.utils.ui import SPACING, hex_to_rgb
from pitivi.ui.dynamic import TimeWidget
diff --git a/pitivi/utils/misc.py b/pitivi/utils/misc.py
index 0935118..34db7e6 100644
--- a/pitivi/utils/misc.py
+++ b/pitivi/utils/misc.py
@@ -376,20 +376,3 @@ def show_user_manual():
continue
log.warning("utils", "Failed loading URIs")
# TODO: Show an error message to the user.
-
-
-#-----------------------------------------------------------------------------#
-# Pipeline utils #
-def togglePlayback(pipeline):
- if int(pipeline.get_state()[1]) == int(gst.STATE_PLAYING):
- state = gst.STATE_PAUSED
- else:
- state = gst.STATE_PLAYING
-
- res = pipeline.set_state(state)
- if res == gst.STATE_CHANGE_FAILURE:
- gst.error("Could no set state to %s")
- state = gst.STATE_NULL
- pipeline.set_state(state)
-
- return state
diff --git a/pitivi/utils/playback.py b/pitivi/utils/playback.py
index 7b9afa6..7a1b677 100644
--- a/pitivi/utils/playback.py
+++ b/pitivi/utils/playback.py
@@ -118,3 +118,20 @@ class Seeker(Signallable):
def setPosition(self, position):
self.emit("position-changed", position)
+
+
+#-----------------------------------------------------------------------------#
+# Pipeline utils #
+def togglePlayback(pipeline):
+ if int(pipeline.get_state()[1]) == int(gst.STATE_PLAYING):
+ state = gst.STATE_PAUSED
+ else:
+ state = gst.STATE_PLAYING
+
+ res = pipeline.set_state(state)
+ if res == gst.STATE_CHANGE_FAILURE:
+ gst.error("Could no set state to %s")
+ state = gst.STATE_NULL
+ pipeline.set_state(state)
+
+ return state
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]