[pitivi: 11/28] Fix merge screwup.
- From: Edward Hervey <edwardrv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi: 11/28] Fix merge screwup.
- Date: Mon, 1 Mar 2010 10:58:29 +0000 (UTC)
commit 3e6c1d627e0601d58d11633b695a4e49e7726f53
Author: Alessandro Decina <alessandro d gmail com>
Date: Sun Feb 28 22:23:10 2010 +0100
Fix merge screwup.
pitivi/factories/base.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/pitivi/factories/base.py b/pitivi/factories/base.py
index e89e61a..3afc40a 100644
--- a/pitivi/factories/base.py
+++ b/pitivi/factories/base.py
@@ -30,6 +30,7 @@ from pitivi.elements.singledecodebin import SingleDecodeBin
from pitivi.elements.smartscale import SmartVideoScale
from pitivi.signalinterface import Signallable
from pitivi.stream import match_stream_groups_map, AudioStream, VideoStream
+from pitivi.utils import formatPercent
# FIXME: define a proper hierarchy
class ObjectFactoryError(Exception):
@@ -226,9 +227,9 @@ class SourceFactory(ObjectFactory):
self.debug("stream:%r", stream)
props = ObjectFactory.getInterpolatedProperties(self, stream)
if isinstance(stream, AudioStream):
- props.update({"volume" : (0.0, 2.0), formatPercent})
+ props.update({"volume" : (0.0, 2.0, formatPercent)})
elif isinstance(stream, VideoStream):
- props.update({"alpha" : (0.0, 1.0), formatPercent})
+ props.update({"alpha" : (0.0, 1.0, formatPercent)})
self.debug("returning %r", props)
return props
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]