# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1191270912 18000
# Node ID ac07c60dba5d8e542cd811d7943de33e93745994
# Parent  a55b1c903628eb669cd10262dd6371fdcebdfaf7# Parent  b6d547a4ca509a01f85437420f291083b3c56773
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

diff -r a55b1c903628 -r ac07c60dba5d src/modplug/modplugbmp.cxx
--- a/src/modplug/modplugbmp.cxx	Mon Oct 01 15:35:02 2007 -0500
+++ b/src/modplug/modplugbmp.cxx	Mon Oct 01 15:35:12 2007 -0500
@@ -506,7 +506,7 @@
 {
 	CSoundFile* lSoundFile;
 	Archive* lArchive;
-	gchar* tmps;
+	const gchar* tmps;
 	
 	//open and mmap the file
         lArchive = OpenArchive(aFilename);
@@ -553,9 +553,9 @@
 	 * an arbitrary module file uses .. typically it is some DOS CP-variant,
 	 * except for true Amiga modules.
 	 */
-	tmps = str_to_utf8(lSoundFile->GetTitle());
-	tuple_associate_string(ti, FIELD_TITLE, NULL, lSoundFile->GetTitle());
-	g_free(tmps);
+	gchar *tmps2 = str_to_utf8(lSoundFile->GetTitle());
+	tuple_associate_string(ti, FIELD_TITLE, NULL, tmps2);
+	g_free(tmps2);
 	
 	//unload the file
 	lSoundFile->Destroy();
diff -r a55b1c903628 -r ac07c60dba5d src/neon/neon.c
--- a/src/neon/neon.c	Mon Oct 01 15:35:02 2007 -0500
+++ b/src/neon/neon.c	Mon Oct 01 15:35:12 2007 -0500
@@ -53,6 +53,23 @@
     neon_vfs_metadata_impl
 };
 
+VFSConstructor neon_https_const = {
+    "https://",
+    neon_vfs_fopen_impl,
+    neon_vfs_fclose_impl,
+    neon_vfs_fread_impl,
+    neon_vfs_fwrite_impl,
+    neon_vfs_getc_impl,
+    neon_vfs_ungetc_impl,
+    neon_vfs_fseek_impl,
+    neon_vfs_rewind_impl,
+    neon_vfs_ftell_impl,
+    neon_vfs_feof_impl,
+    neon_vfs_truncate_impl,
+    neon_vfs_fsize_impl,
+    neon_vfs_metadata_impl
+};
+
 /* bring ne_set_connect_timeout in as a weak reference, not using it
  * unless we have it available (neon 0.27) --nenolod
  */
@@ -150,6 +167,7 @@
 
     if (0 != ne_has_support(NE_FEATURE_SSL)) {
         _DEBUG("neon compiled with thread-safe SSL, enabling https:// transport");
+        vfs_register_transport(&neon_https_const);
     }
 
     _LEAVE;
@@ -1259,7 +1277,7 @@
 
     if (-1 == h->content_length) {
         _DEBUG("Unknown content length");
-        _LEAVE 0;
+        _LEAVE -1;
     }
 
     _LEAVE (h->content_start + h->content_length);
diff -r a55b1c903628 -r ac07c60dba5d 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 15:35:12 2007 -0500
@@ -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