[Freecol-commits] SF.net SVN: freecol:[6908] freecol/trunk/data

[<jul...@us...>]

Revision: 6908
          http://freecol.svn.sourceforge.net/freecol/?rev=6908&view=rev
Author:   julviala
Date:     2010-05-21 14:11:31 +0000 (Fri, 21 May 2010)

Log Message:
-----------
Propagate audio options changes from main specification.xml to classic and testing

Modified Paths:
--------------
    freecol/trunk/data/classic/specification.xml
    freecol/trunk/data/freecol/specification.xml
    freecol/trunk/data/testing/specification.xml

Modified: freecol/trunk/data/classic/specification.xml
===================================================================
--- freecol/trunk/data/classic/specification.xml	2010-05-21 13:47:49 UTC (rev 6907)
+++ freecol/trunk/data/classic/specification.xml	2010-05-21 14:11:31 UTC (rev 6908)
@@ -2024,6 +2024,11 @@
       <!-- Generate warning of stock exceeds this percentage of capacity. -->
       <integerOption id="model.option.highLevel" defaultValue="90" minimumValue="0" maximumValue="100"/>
     </optionGroup>
+    <optionGroup id="clientOptions.audio">
+      <audioMixerOption id="model.option.audioMixer"/>
+      <percentageOption id="model.option.musicVolume" defaultValue="100" previewEnabled="true"/>
+      <percentageOption id="model.option.sfxVolume" defaultValue="100" previewEnabled="true"/>
+    </optionGroup>
     <optionGroup id="clientOptions.other" >
       <!-- Option for autoload emigrants on saling to america. -->
       <booleanOption id="model.option.autoloadEmigrants" defaultValue="false"/>

Modified: freecol/trunk/data/freecol/specification.xml
===================================================================
--- freecol/trunk/data/freecol/specification.xml	2010-05-21 13:47:49 UTC (rev 6907)
+++ freecol/trunk/data/freecol/specification.xml	2010-05-21 14:11:31 UTC (rev 6908)
@@ -1861,7 +1861,7 @@
     <optionGroup id="clientOptions.audio">
       <audioMixerOption id="model.option.audioMixer"/>
       <percentageOption id="model.option.musicVolume" defaultValue="100" previewEnabled="true"/>
-      <percentageOption id="model.option.sfxVolume" defaultValue="100" previewEnabled="true"/>      
+      <percentageOption id="model.option.sfxVolume" defaultValue="100" previewEnabled="true"/>
     </optionGroup>
     <optionGroup id="clientOptions.other" >
       <!-- Option for autoload emigrants on saling to america. -->

Modified: freecol/trunk/data/testing/specification.xml
===================================================================
--- freecol/trunk/data/testing/specification.xml	2010-05-21 13:47:49 UTC (rev 6907)
+++ freecol/trunk/data/testing/specification.xml	2010-05-21 14:11:31 UTC (rev 6908)
@@ -2170,6 +2170,11 @@
       <!-- Generate warning of stock exceeds this percentage of capacity. -->
       <integerOption id="model.option.highLevel" defaultValue="90" minimumValue="0" maximumValue="100"/>
     </optionGroup>
+    <optionGroup id="clientOptions.audio">
+      <audioMixerOption id="model.option.audioMixer"/>
+      <percentageOption id="model.option.musicVolume" defaultValue="100" previewEnabled="true"/>
+      <percentageOption id="model.option.sfxVolume" defaultValue="100" previewEnabled="true"/>
+    </optionGroup>
     <optionGroup id="clientOptions.other" >
       <!-- Option for autoload emigrants on saling to america. -->
       <booleanOption id="model.option.autoloadEmigrants" defaultValue="false"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.