msmith - in flumotion/branches/platform-3: . flumotion/component/producers/playlist

[flumotion-commit at lists.fluendo.com]

Author: msmith
Date: Tue May 22 18:45:10 2007
New Revision: 5004

Modified:
   flumotion/branches/platform-3/ChangeLog
   flumotion/branches/platform-3/flumotion/component/producers/playlist/smartscale.py
Log:
        * flumotion/component/producers/playlist/smartscale.py:
          Older versions of gst-python don't have gst.Fraction.__float__, so
          don't use it. Backported.



Modified: flumotion/branches/platform-3/ChangeLog
==============================================================================
--- flumotion/branches/platform-3/ChangeLog	(original)
+++ flumotion/branches/platform-3/ChangeLog	Tue May 22 18:45:10 2007
@@ -1,5 +1,11 @@
 2007-05-22  Michael Smith <msmith at fluendo.com>
 
+	* flumotion/component/producers/playlist/smartscale.py:
+	  Older versions of gst-python don't have gst.Fraction.__float__, so
+	  don't use it. Backported.
+
+2007-05-22  Michael Smith <msmith at fluendo.com>
+
 	* flumotion/component/producers/playlist/Makefile.am:
 	* flumotion/component/producers/playlist/playlist.py:
 	* flumotion/component/producers/playlist/playlist.xml:

Modified: flumotion/branches/platform-3/flumotion/component/producers/playlist/smartscale.py
==============================================================================
--- flumotion/branches/platform-3/flumotion/component/producers/playlist/smartscale.py	(original)
+++ flumotion/branches/platform-3/flumotion/component/producers/playlist/smartscale.py	Tue May 22 18:45:10 2007
@@ -158,7 +158,9 @@
         else:
             par = self.parout
             dar = self.darin
-            if float(self.darin) > float(self.darout):
+            fdarin = float(self.darin.num) / float(self.darin.denom)
+            fdarout = float(self.darout.num) / float(self.darout.denom)
+            if fdarin > fdarout:
                 self.log("incoming DAR is greater that ougoing DAR. Adding top/bottom borders")
                 # width, PAR stays the same as output
                 # calculate newheight = (PAR * widthout) / DAR