msmith - in flumotion/trunk: . data

[flumotion-commit at lists.fluendo.com]

Author: msmith
Date: Fri Feb  9 17:12:31 2007
New Revision: 4474

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/data/upgrade-to-0.4.1.xsl
Log:
        * data/upgrade-to-0.4.1.xsl:
          Rewrite theora bitrate rule to be more specific and elegent.
          Fixes problem where all other bitrate props were being deleted.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Fri Feb  9 17:12:31 2007
@@ -1,3 +1,9 @@
+2007-02-09  Michael Smith  <msmith at fluendo.com>
+
+	* data/upgrade-to-0.4.1.xsl:
+	  Rewrite theora bitrate rule to be more specific and elegent.
+	  Fixes problem where all other bitrate props were being deleted.
+
 2007-02-08  Andy Wingo  <wingo at pobox.com>
 
 	* common/common.mk (dist-hook): Add a dist hook to remove the

Modified: flumotion/trunk/data/upgrade-to-0.4.1.xsl
==============================================================================
--- flumotion/trunk/data/upgrade-to-0.4.1.xsl	(original)
+++ flumotion/trunk/data/upgrade-to-0.4.1.xsl	Fri Feb  9 17:12:31 2007
@@ -106,10 +106,8 @@
   </xsl:template>
 
   <!-- fix up theora bitrate to be in bps instead of kbps -->
-  <xsl:template match="//planet/*/component/property[@name='bitrate']" priority="9">
-      <xsl:if test="../@type = 'theora-encoder' and number(text()) &lt; 10000">
-        <property name="bitrate"><xsl:value-of select="." />000</property>
-      </xsl:if>
+  <xsl:template match="//planet/*/component[@type='theora-encoder']/property[@name='bitrate' and number(text()) &lt; 10000]/text()" priority="9">
+      <xsl:value-of select="." /><xsl:text>000</xsl:text>
   </xsl:template>
 
   <!-- Copy all the other nodes -->