zaheer - in flumotion/branches/newoverlay-1: . flumotion/component/converters/overlay

[flumotion-commit at lists.fluendo.com]

Author: zaheer
Date: Mon Feb 26 15:23:57 2007
New Revision: 4525

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
Log:
2007-02-26  Zaheer Abbas Merali  <zaheerabbas at merali dot org>

        * flumotion/component/converters/overlay/osdparser.py:
        * flumotion/component/converters/overlay/overlay.py:
        Fix copyrights.  Remove some whitespace. Comment out use of
        API that no longer exists.



Modified: flumotion/branches/newoverlay-1/ChangeLog
==============================================================================
--- flumotion/branches/newoverlay-1/ChangeLog	(original)
+++ flumotion/branches/newoverlay-1/ChangeLog	Mon Feb 26 15:23:57 2007
@@ -1,5 +1,12 @@
 2007-02-26  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
+	* flumotion/component/converters/overlay/osdparser.py:
+	* flumotion/component/converters/overlay/overlay.py:
+	Fix copyrights.  Remove some whitespace. Comment out use of
+	API that no longer exists.
+
+2007-02-26  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+
 	* flumotion/component/converters/overlay/overlay.py:
 	Fix framerate to be a fraction.
 

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	Mon Feb 26 15:23:57 2007
@@ -1,3 +1,24 @@
+# -*- Mode: Python -*-
+# vi:si:et:sw=4:sts=4:ts=4
+#
+# flumotion/component/converters/overlay/osdparser.py: xml parser for overlay
+#
+# Flumotion - a streaming media server
+# Copyright (C) 2004,2005,2006,2007 Fluendo, S.L. (www.fluendo.com). 
+# All rights reserved.
+# This file may be distributed and/or modified under the terms of
+# the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+# This file is distributed without any warranty; without even the implied
+# warranty of merchantability or fitness for a particular purpose.
+# See "LICENSE.GPL" in the source distribution for more information.
+
+# Licensees having purchased or holding a valid Flumotion Advanced
+# Streaming Server license may use this file in accordance with the
+# Flumotion Advanced Streaming Server Commercial License Agreement.
+# See "LICENSE.Flumotion" in the source distribution for more information.
+# Headers in this file shall remain intact.
+
 import os
 
 from PIL import Image
@@ -19,7 +40,6 @@
 class FluOsdStrFileObject:
     def __init__(self):
         self.str = ""
-        
     def write(self,str):
         self.str=self.str + str
         
@@ -51,8 +71,6 @@
             mainlogo = ImageChops.offset(mainlogo, -self.width, y_corr)
             self.image = ImageChops.add_modulo(self.image, mainlogo)
         draw = ImageDraw.Draw(self.image) # inheriting color mode
-        
-        
         root = self.doc.documentElement
         if not root.nodeName == 'fluosd':
             raise Exception, "document not a fluosd document"
@@ -188,7 +206,6 @@
 
     def gen_image_from_textbox(self, textbox):
         # draw just the text
-
         # first work out the size
         font = ImageFont.truetype(fontpath, textbox['fontsize'])
         textsize = font.getsize(textbox['text'])
@@ -220,4 +237,3 @@
     flu.parse('<fluosd><textarea x="44" y="200" fontsize="22" text="blah"/></fluosd>')
     flu.generate_image()
     print flu.get_text_boxes()
-    

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	Mon Feb 26 15:23:57 2007
@@ -4,8 +4,8 @@
 # flumotion/component/converters/overlay/overlay.py: overlay converter
 #
 # Flumotion - a streaming media server
-# Copyright (C) 2007 Fluendo, S.L. (www.fluendo.com). All rights reserved.
-
+# Copyright (C) 2004,2005,2006,2007 Fluendo, S.L. (www.fluendo.com). 
+# All rights reserved.
 # This file may be distributed and/or modified under the terms of
 # the GNU General Public License version 2 as published by
 # the Free Software Foundation.
@@ -35,7 +35,6 @@
         self.ho.newtext(datagram)
 
 class Overlay(feedcomponent.ParseLaunchComponent):
-
     def init(self):
         self.uiState.addKey('overlay-xml', '<fluosd />')
 
@@ -66,7 +65,9 @@
         self.ilp = reactor.listenUDP(port, protocol)
 
     def send_overlay_cb(self, element, arg0, arg1, data=None):
-        arg0.set_buffer_data(self.imbuf)
+        # this api in gst-python no longer exists
+        # arg0.set_buffer_data(self.imbuf)
+        pass
 
     def newtext(self,data):
         try: