# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1191245212 -10800
# Node ID b6d547a4ca509a01f85437420f291083b3c56773
# Parent  5638651b7b3d4bf896ff43c46880af213757f9aa# Parent  d8f6fe2ff7da8f298c417cd57de9b1264b8c00ea
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

diff -r 5638651b7b3d -r b6d547a4ca50 src/modplug/modplugbmp.cxx
diff -r 5638651b7b3d -r b6d547a4ca50 src/paranormal/presets/aerdan_-_stonervision.pnv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/paranormal/presets/aerdan_-_stonervision.pnv	Mon Oct 01 16:26:52 2007 +0300
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+
+<paranormal_preset>
+ <container_simple>
+  <container_once>
+   <wave_smooth>
+    <channels> 0 </channels>
+   </wave_smooth>
+   <cmap_dynamic>
+    <low_index> 5 </low_index>
+    <high_index> 250 </high_index>
+    <script> red = red + 0.05; blue = blue + 0.03; green = green + 0.01; </script>
+   </cmap_dynamic>
+  </container_once>
+  <general_blur>
+  </general_blur>
+  <general_fade>
+   <amount> 1 </amount>
+  </general_fade>
+  <wave_radial>
+   <base_radius> -1.00000 </base_radius>
+   <value> 253 </value>
+  </wave_radial>
+  <xform_ripple>
+   <angle> 0.00000 </angle>
+   <ripples> 8.00000 </ripples>
+   <base_speed> 2.00000 </base_speed>
+   <mod_speed> 5.00000 </mod_speed>
+  </xform_ripple>
+  <misc_floater>
+   <value> 256 </value>
+  </misc_floater>
+  <misc_floater>
+   <value> 255 </value>
+  </misc_floater>
+  <misc_floater>
+   <value> 255 </value>
+  </misc_floater>
+  <misc_floater>
+   <value> 255 </value>
+  </misc_floater>
+  <misc_floater>
+   <value> 255 </value>
+  </misc_floater>
+  <misc_floater>
+   <value> 255 </value>
+  </misc_floater>
+  <misc_floater>
+   <value> 255 </value>
+  </misc_floater>
+  <misc_floater>
+   <value> 255 </value>
+  </misc_floater>
+  <misc_floater>
+   <value> 255 </value>
+  </misc_floater>
+  <misc_floater>
+   <value> 255 </value>
+  </misc_floater>
+  <misc_floater>
+   <value> 255 </value>
+  </misc_floater>
+  <misc_floater>
+   <value> 255 </value>
+  </misc_floater>
+  <misc_floater>
+   <value> 255 </value>
+  </misc_floater>
+  <wave_scope>
+   <init_script> n = 800; t = -0.05; </init_script>
+   <frame_script> t = t + 0.05; </frame_script>
+   <sample_script> d = index + value; r = t + index * 3.141952924 * 4; x = cos(r) * d; y = sin(r) * d; </sample_script>
+   <lines> TRUE </lines>
+  </wave_scope>
+ </container_simple>
+</paranormal_preset>
\ No newline at end of file