zaheer - in flumotion/branches/newoverlay-1: .
flumotion/component/converters/overlay po
flumotion-commit at lists.fluendo.com
flumotion-commit at lists.fluendo.com
Sat Feb 24 14:45:28 CET 2007
Author: zaheer
Date: Sat Feb 24 14:45:18 2007
New Revision: 4522
Modified:
flumotion/branches/newoverlay-1/ChangeLog
flumotion/branches/newoverlay-1/flumotion/component/converters/overlay/osdparser.py
flumotion/branches/newoverlay-1/flumotion/component/converters/overlay/overlay.py
flumotion/branches/newoverlay-1/flumotion/component/converters/overlay/overlay.xml
flumotion/branches/newoverlay-1/po/ca.po
flumotion/branches/newoverlay-1/po/es.po
flumotion/branches/newoverlay-1/po/fr.po
flumotion/branches/newoverlay-1/po/nl.po
flumotion/branches/newoverlay-1/po/no.po
flumotion/branches/newoverlay-1/po/pt_BR.po
Log:
2007-02-24 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* flumotion/component/converters/overlay/osdparser.py:
* flumotion/component/converters/overlay/overlay.py:
* flumotion/component/converters/overlay/overlay.xml:
* po/ca.po:
* po/es.po:
* po/fr.po:
* po/nl.po:
* po/no.po:
* po/pt_BR.po:
Small cleanups. Correct properties in overlay xml.
Modified: flumotion/branches/newoverlay-1/ChangeLog
==============================================================================
--- flumotion/branches/newoverlay-1/ChangeLog (original)
+++ flumotion/branches/newoverlay-1/ChangeLog Sat Feb 24 14:45:18 2007
@@ -1,3 +1,16 @@
+2007-02-24 Zaheer Abbas Merali <zaheerabbas at merali dot org>
+
+ * flumotion/component/converters/overlay/osdparser.py:
+ * flumotion/component/converters/overlay/overlay.py:
+ * flumotion/component/converters/overlay/overlay.xml:
+ * po/ca.po:
+ * po/es.po:
+ * po/fr.po:
+ * po/nl.po:
+ * po/no.po:
+ * po/pt_BR.po:
+ Small cleanups. Correct properties in overlay xml.
+
2007-02-23 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* flumotion/component/converters/overlay/Makefile.am:
Modified: flumotion/branches/newoverlay-1/flumotion/component/converters/overlay/osdparser.py
==============================================================================
--- flumotion/branches/newoverlay-1/flumotion/component/converters/overlay/osdparser.py (original)
+++ flumotion/branches/newoverlay-1/flumotion/component/converters/overlay/osdparser.py Sat Feb 24 14:45:18 2007
@@ -23,7 +23,7 @@
def write(self,str):
self.str=self.str + str
-class FluOsdParser:
+class FluOsdParser(log.Loggable):
def __init__(self):
self.width = None
self.height = None
@@ -102,7 +102,7 @@
if fontshadow == 1:
draw.text((xpos+2, ypos+2), text, font=font, fill='black')
draw.text((xpos, ypos), text, font=font, fill=fontcolour)
- log.debug("we have text: %s with position (%d,%d) amd size %d" % (text,xpos,ypos,fontsize))
+ self.debug("we have text: %s with position (%d,%d) and size %d" % (text,xpos,ypos,fontsize))
return self.image.tostring()
def generate_png(self):
Modified: flumotion/branches/newoverlay-1/flumotion/component/converters/overlay/overlay.py
==============================================================================
--- flumotion/branches/newoverlay-1/flumotion/component/converters/overlay/overlay.py (original)
+++ flumotion/branches/newoverlay-1/flumotion/component/converters/overlay/overlay.py Sat Feb 24 14:45:18 2007
@@ -75,7 +75,7 @@
self.imbuf = self.flu.generate_image()
self.uiState['overlay-xml'] = overlayxml
except Exception:
- self.debug('blah','problem parsing %s' % data)
+ self.debug('problem parsing %s' % data)
def do_stop(self):
self.ilp.stopListening()
Modified: flumotion/branches/newoverlay-1/flumotion/component/converters/overlay/overlay.xml
==============================================================================
--- flumotion/branches/newoverlay-1/flumotion/component/converters/overlay/overlay.xml (original)
+++ flumotion/branches/newoverlay-1/flumotion/component/converters/overlay/overlay.xml Sat Feb 24 14:45:18 2007
@@ -11,22 +11,14 @@
function="Overlay" />
</entries>
<properties>
- <property name="show-text" type="bool"
- description="Whether to show text" />
- <property name="text" type="string"
- description="Text to show" />
-
- <property name="fluendo-logo" type="bool"
- description="Whether to show a Fluendo logo" />
- <property name="cc-logo" type="bool"
- description="Whether to show a Creative Commons logo" />
- <property name="xiph-logo" type="bool"
- description="Whether to show a Xiph logo" />
-
<property name="width" type="int" required="yes"
description="Width of the overlaid image" />
<property name="height" type="int" required="yes"
description="Height of the overlaid image" />
+ <property name="overlay-xml" type="string" required="no"
+ description="XML description of what is to be overlaid" />
+ <property name="overlay-port" type="int" required="no"
+ description="TCP port to listen to for overlay xml changes" />
</properties>
</component>
Modified: flumotion/branches/newoverlay-1/po/ca.po
==============================================================================
--- flumotion/branches/newoverlay-1/po/ca.po (original)
+++ flumotion/branches/newoverlay-1/po/ca.po Sat Feb 24 14:45:18 2007
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: flumotion 0.1.9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-08 15:26+0100\n"
+"POT-Creation-Date: 2007-02-24 14:39+0100\n"
"PO-Revision-Date: 2006-01-10 22:34+0100\n"
"Last-Translator: Noelle Moutte <noelle at moutte.net>\n"
"Language-Team: cat\n"
@@ -418,21 +418,21 @@
msgid "GStreamer error: could not parse component pipeline."
msgstr ""
-#: flumotion/component/base/admin_gtk.py:420
+#: flumotion/component/base/admin_gtk.py:436
msgid "Feeders"
msgstr ""
-#: flumotion/component/base/admin_gtk.py:436
+#: flumotion/component/base/admin_gtk.py:452
#, python-format
msgid "Feeder <b>%s</b>"
msgstr ""
-#: flumotion/component/base/admin_gtk.py:439
+#: flumotion/component/base/admin_gtk.py:455
#, python-format
msgid "Feeding to <b>%s</b>"
msgstr ""
-#: flumotion/component/base/admin_gtk.py:442
+#: flumotion/component/base/admin_gtk.py:458
msgid "Byte"
msgstr ""
@@ -647,11 +647,11 @@
msgid "The component is misconfigured."
msgstr "Cap component seleccionat."
-#: flumotion/manager/manager.py:813
+#: flumotion/manager/manager.py:811
msgid "The component could not be started."
msgstr ""
-#: flumotion/manager/manager.py:843
+#: flumotion/manager/manager.py:841
msgid ""
"Component logged in with stale configuration. Consider stopping this "
"component and restarting the manager."
Modified: flumotion/branches/newoverlay-1/po/es.po
==============================================================================
--- flumotion/branches/newoverlay-1/po/es.po (original)
+++ flumotion/branches/newoverlay-1/po/es.po Sat Feb 24 14:45:18 2007
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: flumotion 0.1.9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-08 15:26+0100\n"
+"POT-Creation-Date: 2007-02-24 14:39+0100\n"
"PO-Revision-Date: 2006-01-10 22:34+0100\n"
"Last-Translator: Noelle Moutte <noelle at moutte.net>\n"
"Language-Team: nl\n"
@@ -416,21 +416,21 @@
msgid "GStreamer error: could not parse component pipeline."
msgstr ""
-#: flumotion/component/base/admin_gtk.py:420
+#: flumotion/component/base/admin_gtk.py:436
msgid "Feeders"
msgstr ""
-#: flumotion/component/base/admin_gtk.py:436
+#: flumotion/component/base/admin_gtk.py:452
#, python-format
msgid "Feeder <b>%s</b>"
msgstr ""
-#: flumotion/component/base/admin_gtk.py:439
+#: flumotion/component/base/admin_gtk.py:455
#, python-format
msgid "Feeding to <b>%s</b>"
msgstr ""
-#: flumotion/component/base/admin_gtk.py:442
+#: flumotion/component/base/admin_gtk.py:458
msgid "Byte"
msgstr ""
@@ -645,11 +645,11 @@
msgid "The component is misconfigured."
msgstr "Ningún componente seleccionado."
-#: flumotion/manager/manager.py:813
+#: flumotion/manager/manager.py:811
msgid "The component could not be started."
msgstr ""
-#: flumotion/manager/manager.py:843
+#: flumotion/manager/manager.py:841
msgid ""
"Component logged in with stale configuration. Consider stopping this "
"component and restarting the manager."
Modified: flumotion/branches/newoverlay-1/po/fr.po
==============================================================================
--- flumotion/branches/newoverlay-1/po/fr.po (original)
+++ flumotion/branches/newoverlay-1/po/fr.po Sat Feb 24 14:45:18 2007
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: flumotion 0.2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-08 15:26+0100\n"
+"POT-Creation-Date: 2007-02-24 14:39+0100\n"
"PO-Revision-Date: 2006-03-03 18:02+0000\n"
"Last-Translator: Edward Hervey <edward at fluendo.com>\n"
"Language-Team: French <gnomefr at traduc.org>\n"
@@ -432,21 +432,21 @@
msgid "GStreamer error: could not parse component pipeline."
msgstr "Erreur GStreamer: impossible d'analyser le tube du component."
-#: flumotion/component/base/admin_gtk.py:420
+#: flumotion/component/base/admin_gtk.py:436
msgid "Feeders"
msgstr ""
-#: flumotion/component/base/admin_gtk.py:436
+#: flumotion/component/base/admin_gtk.py:452
#, python-format
msgid "Feeder <b>%s</b>"
msgstr ""
-#: flumotion/component/base/admin_gtk.py:439
+#: flumotion/component/base/admin_gtk.py:455
#, python-format
msgid "Feeding to <b>%s</b>"
msgstr ""
-#: flumotion/component/base/admin_gtk.py:442
+#: flumotion/component/base/admin_gtk.py:458
msgid "Byte"
msgstr ""
@@ -658,11 +658,11 @@
msgid "The component is misconfigured."
msgstr "Aucun composant sélectionné."
-#: flumotion/manager/manager.py:813
+#: flumotion/manager/manager.py:811
msgid "The component could not be started."
msgstr "Le composant n'a pas pu être démarré."
-#: flumotion/manager/manager.py:843
+#: flumotion/manager/manager.py:841
msgid ""
"Component logged in with stale configuration. Consider stopping this "
"component and restarting the manager."
Modified: flumotion/branches/newoverlay-1/po/nl.po
==============================================================================
--- flumotion/branches/newoverlay-1/po/nl.po (original)
+++ flumotion/branches/newoverlay-1/po/nl.po Sat Feb 24 14:45:18 2007
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: flumotion 0.3.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-08 15:26+0100\n"
+"POT-Creation-Date: 2007-02-24 14:39+0100\n"
"PO-Revision-Date: 2007-01-18 06:17+0100\n"
"Last-Translator: Thomas Vander Stichele <thomas at apestaart.org>\n"
"Language-Team: nl\n"
@@ -434,21 +434,21 @@
msgid "GStreamer error: could not parse component pipeline."
msgstr "GStreamer-fout: kon de component-pijplijn niet verwerken."
-#: flumotion/component/base/admin_gtk.py:420
+#: flumotion/component/base/admin_gtk.py:436
msgid "Feeders"
msgstr "Voeders"
-#: flumotion/component/base/admin_gtk.py:436
+#: flumotion/component/base/admin_gtk.py:452
#, python-format
msgid "Feeder <b>%s</b>"
msgstr "Voeder <b>%s</b>"
-#: flumotion/component/base/admin_gtk.py:439
+#: flumotion/component/base/admin_gtk.py:455
#, python-format
msgid "Feeding to <b>%s</b>"
msgstr "Voedt <b>%s</b>"
-#: flumotion/component/base/admin_gtk.py:442
+#: flumotion/component/base/admin_gtk.py:458
msgid "Byte"
msgstr "Byte"
@@ -655,11 +655,11 @@
msgid "The component is misconfigured."
msgstr "De component is fout geconfigureerd."
-#: flumotion/manager/manager.py:813
+#: flumotion/manager/manager.py:811
msgid "The component could not be started."
msgstr "De component kon niet gestart worden."
-#: flumotion/manager/manager.py:843
+#: flumotion/manager/manager.py:841
msgid ""
"Component logged in with stale configuration. Consider stopping this "
"component and restarting the manager."
Modified: flumotion/branches/newoverlay-1/po/no.po
==============================================================================
--- flumotion/branches/newoverlay-1/po/no.po (original)
+++ flumotion/branches/newoverlay-1/po/no.po Sat Feb 24 14:45:18 2007
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: flumotion 0.1.9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-08 15:26+0100\n"
+"POT-Creation-Date: 2007-02-24 14:39+0100\n"
"PO-Revision-Date: 2005-07-29 01:22+0200\n"
"Last-Translator: Christian Schaller <christian at fluendo dot com>\n"
"Language-Team: nl\n"
@@ -418,21 +418,21 @@
msgid "GStreamer error: could not parse component pipeline."
msgstr ""
-#: flumotion/component/base/admin_gtk.py:420
+#: flumotion/component/base/admin_gtk.py:436
msgid "Feeders"
msgstr ""
-#: flumotion/component/base/admin_gtk.py:436
+#: flumotion/component/base/admin_gtk.py:452
#, python-format
msgid "Feeder <b>%s</b>"
msgstr ""
-#: flumotion/component/base/admin_gtk.py:439
+#: flumotion/component/base/admin_gtk.py:455
#, python-format
msgid "Feeding to <b>%s</b>"
msgstr ""
-#: flumotion/component/base/admin_gtk.py:442
+#: flumotion/component/base/admin_gtk.py:458
msgid "Byte"
msgstr ""
@@ -649,11 +649,11 @@
msgid "The component is misconfigured."
msgstr "Ingen komponent valgt."
-#: flumotion/manager/manager.py:813
+#: flumotion/manager/manager.py:811
msgid "The component could not be started."
msgstr ""
-#: flumotion/manager/manager.py:843
+#: flumotion/manager/manager.py:841
msgid ""
"Component logged in with stale configuration. Consider stopping this "
"component and restarting the manager."
Modified: flumotion/branches/newoverlay-1/po/pt_BR.po
==============================================================================
--- flumotion/branches/newoverlay-1/po/pt_BR.po (original)
+++ flumotion/branches/newoverlay-1/po/pt_BR.po Sat Feb 24 14:45:18 2007
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: flumotion 0.2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-08 15:26+0100\n"
+"POT-Creation-Date: 2007-02-24 14:39+0100\n"
"PO-Revision-Date: 2006-04-21 11:36-0300\n"
"Last-Translator: Pablo Lorenzzoni <spectra at debian.org>\n"
"Language-Team: pt_BR <spectra at debian.org>\n"
@@ -434,21 +434,21 @@
msgid "GStreamer error: could not parse component pipeline."
msgstr "Erro no GStreamer: não pode parsear o pipeline do componente."
-#: flumotion/component/base/admin_gtk.py:420
+#: flumotion/component/base/admin_gtk.py:436
msgid "Feeders"
msgstr ""
-#: flumotion/component/base/admin_gtk.py:436
+#: flumotion/component/base/admin_gtk.py:452
#, python-format
msgid "Feeder <b>%s</b>"
msgstr ""
-#: flumotion/component/base/admin_gtk.py:439
+#: flumotion/component/base/admin_gtk.py:455
#, python-format
msgid "Feeding to <b>%s</b>"
msgstr ""
-#: flumotion/component/base/admin_gtk.py:442
+#: flumotion/component/base/admin_gtk.py:458
msgid "Byte"
msgstr ""
@@ -657,11 +657,11 @@
msgid "The component is misconfigured."
msgstr "O componente crashou.\n"
-#: flumotion/manager/manager.py:813
+#: flumotion/manager/manager.py:811
msgid "The component could not be started."
msgstr "O componente não pode ser iniciado."
-#: flumotion/manager/manager.py:843
+#: flumotion/manager/manager.py:841
msgid ""
"Component logged in with stale configuration. Consider stopping this "
"component and restarting the manager."
More information about the flumotion-commit
mailing list