sid player is now real plugin (dynamically loaded)

ported sid code to new API
moved to different md5 library
added more md5 functions to plugin API

292 files changed, 668 insertions, 1022 deletions

diff --git a/.gitignore b/.gitignore
index a741d25e..bf040115 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ m4
 *.la
 *.lo
 deadbeef.desktop
+.vimrc
diff --git a/Makefile.am b/Makefile.am
index 638c349e..d4458c45 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,7 @@ SUBDIRS = ${MPGMAD_DIR}\
 		  icons\
 		  plugins/hotkeys\
 		  plugins/nullout\
+		  plugins/sid\
 		  ${ALSA_DIR}\
 		  ${LFM_DIR}\
           ${VFS_CURL_DIR}\
@@ -32,7 +33,6 @@ SUBDIRS = ${MPGMAD_DIR}\
 #          ${FFMPEG_DIR}
 
 dumbpath=@top_srcdir@/dumb
-sidpath=@top_srcdir@/sid/sidplay-libs-2.1.0
 gmepath=@top_srcdir@/gme/Game_Music_Emu-0.5.2
 
 bin_PROGRAMS = deadbeef
@@ -47,23 +47,22 @@ deadbeef_SOURCES =\
 	conf.c  conf.h\
 	playback.h\
 	threading_pthread.c threading.h\
-	md5/md5.c md5/md5.h md5/md5_loc.h\
 	volume.c volume.h\
 	session.h session.c \
 	junklib.h junklib.c utf8.c utf8.h\
 	optmath.h\
 	vfs.c vfs.h vfs_stdio.c\
 	timeline.c timeline.h\
-	cgme.c cdumb.c
-#	cgme.c cdumb.c csid.cpp
+	cgme.c cdumb.c\
+	md5/md5.c md5/md5.h
 
 sdkdir = $(pkgincludedir)
 sdk_HEADERS = deadbeef.h
 
-deadbeef_LDADD = $(LDADD) $(DEPS_LIBS) gme/Game_Music_Emu-0.5.2/gme/libgme.a sid/sidplay-libs-2.1.0/libsidplay2.a dumb/libdumb.a -lstdc++
+deadbeef_LDADD = $(LDADD) $(DEPS_LIBS) gme/Game_Music_Emu-0.5.2/gme/libgme.a dumb/libdumb.a -lstdc++
 
 AM_CFLAGS = $(DEPS_CFLAGS) -I$(gmepath) -std=c99
-AM_CPPFLAGS = $(DEPS_CFLAGS) -I$(sidpath)/libsidplay/include -I$(sidpath)/builders/resid-builder/include
+AM_CPPFLAGS = $(DEPS_CFLAGS)
 
 docsdir = $(docdir)
 
diff --git a/about.txt b/about.txt
index ed21c764..305a375c 100644
--- a/about.txt
+++ b/about.txt
@@ -59,11 +59,6 @@ Game_Music_Emu Version 0.5.2
 Copyright © 2003-2006 Shay Green.
 
 
-Functions to compute MD5 message digest of files or memory blocks
-Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-Modified by Gray Watson <http://256.com/gray/>, 1997.
-
-
 libsidplay2 - commodore 64 SID emulation library
 Copyright © Simon White and other authors.
 
diff --git a/configure.ac b/configure.ac
index aabcf152..f15e7401 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,6 +38,9 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
 INSANE_CFLAGS="-Wcomment -Wchar-subscripts -Wunused-function -Wunused-value -Wuninitialized -Wtype-limits -Wbad-function-cast"
 INSANE_CXXFLAGS="-Wcomment -Wchar-subscripts -Wunused-function -Wunused-value -Wuninitialized -Wtype-limits"
 
+AC_SUBST(INSANE_CFLAGS)
+AC_SUBST(INSANE_CXXFLAGS)
+
 CXXFLAGS="$CXXFLAGS $INSANE_CXXFLAGS -D_GNU_SOURCE -DLIBDIR=\\\"$libdir\\\" -DPREFIX=\\\"$prefix\\\" -DDOCDIR=\\\"$docdir\\\""
 CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE -DLIBDIR=\\\"$libdir\\\" -DPREFIX=\\\"$prefix\\\" -DDOCDIR=\\\"$docdir\\\""
 
@@ -217,7 +220,7 @@ pixmaps/Makefile
 icons/Makefile
 gme/Game_Music_Emu-0.5.2/Makefile
 gme/Game_Music_Emu-0.5.2/gme/Makefile
-sid/sidplay-libs-2.1.0/Makefile
+plugins/sid/sidplay-libs/Makefile
 dumb/Makefile
 plugins/alsa/Makefile
 plugins/hotkeys/Makefile
@@ -235,6 +238,7 @@ plugins/nullout/Makefile
 plugins/vtx/Makefile
 plugins/adplug/Makefile
 plugins/ffmpeg/Makefile
+plugins/sid/Makefile
 deadbeef.desktop
 ])
 
diff --git a/deadbeef.h b/deadbeef.h
index 4118a97a..066abd35 100644
--- a/deadbeef.h
+++ b/deadbeef.h
@@ -216,6 +216,11 @@ typedef struct {
     struct DB_vfs_s *vfs;
 } DB_FILE;
 
+// md5 calc control structure (see md5/md5.h)
+typedef struct DB_md5_s {
+    char data[70];
+} DB_md5_t;
+
 // forward decl for plugin struct
 struct DB_plugin_s;
 
@@ -230,6 +235,9 @@ typedef struct {
     // md5sum calc
     void (*md5) (uint8_t sig[16], const char *in, int len);
     void (*md5_to_str) (char *str, const uint8_t sig[16]);
+    void (*md5_init)(DB_md5_t *s);
+    void (*md5_append)(DB_md5_t *s, const uint8_t *data, int nbytes);
+    void (*md5_finish)(DB_md5_t *s, uint8_t digest[16]);
     // playback control
     struct DB_output_s* (*get_output) (void);
     void (*playback_next) (void);
diff --git a/md5/md5.c b/md5/md5.c
index 52e2d07a..c35d96c5 100644
--- a/md5/md5.c
+++ b/md5/md5.c
@@ -1,559 +1,381 @@
 /*
- * Functions to compute MD5 message digest of files or memory blocks
- * according to the definition of MD5 in RFC 1321 from April 1992.
- * Copyright (C) 1995, 1996 Free Software Foundation, Inc.  NOTE: The
- * canonical source of this file is maintained with the GNU C Library.
- * Bugs can be reported to bug-glibc@prep.ai.mit.edu.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
- * Modified by Gray Watson <http://256.com/gray/>, 1997.
- *
- */
-
-/*
- * NOTE: during quick performance tests on a Sun Sparc Ultra 1 and an
- * Alpha 255 300, these functions performed upwards of 3mb/sec
- * including disk I/O time.
- */
-
-/*
- * MD5 Test Suite from RFC1321: http://ds.internic.net:/rfc/rfc1321.txt
- *
- * MD5 ("") = d41d8cd98f00b204e9800998ecf8427e
- * MD5 ("a") = 0cc175b9c0f1b6a831c399e269772661
- * MD5 ("abc") = 900150983cd24fb0d6963f7d28e17f72
- * MD5 ("message digest") = f96b697d7cb7938d525a2f31aaf161d0
- * MD5 ("abcdefghijklmnopqrstuvwxyz") = c3fcd3d76192e4007dfb496cca67e13b
- * MD5 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =
- * d174ab98d277d9f5a5611c2c9f419d9f
- * MD5 ("123456789012345678901234567890123456789012345678901234567890123456
- * 78901234567890") = 57edf4a22be3c955ac49da2e2107b67a
- */
+  Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
 
-#include "md5.h"
-#include "md5_loc.h"
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
 
-/* version id for the library */
-/* static char *version_id = "$MD5Version: 1.0.0 November-19-1997 $"; */
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
 
-/****************************** local routines *******************************/
+  L. Peter Deutsch
+  ghost@aladdin.com
 
-/*
- * process_block
- *
- * DESCRIPTION:
- *
- * Process a block of bytes into a MD5 state structure.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * md5_p - Pointer to MD5 structure from which we are getting the result.
- *
- * buffer - A buffer of bytes whose MD5 signature we are calculating.
- *
- * buf_len - The length of the buffer.
  */
-static	void	process_block(md5_t *md5_p, const void *buffer,
-			      const unsigned int buf_len)
-{
-  md5_uint32	correct[16];
-  const void	*buf_p = buffer, *end_p;
-  unsigned int	words_n;
-  md5_uint32	A, B, C, D;
-
-  words_n = buf_len / sizeof(md5_uint32);
-  end_p = (char *)buf_p + words_n * sizeof(md5_uint32);
-
-  A = md5_p->md_A;
-  B = md5_p->md_B;
-  C = md5_p->md_C;
-  D = md5_p->md_D;
-
-  /*
-   * First increment the byte count.  RFC 1321 specifies the possible
-   * length of the file up to 2^64 bits.  Here we only compute the
-   * number of bytes with a double word increment.  Modified to do
-   * this to better avoid overflows in the lower word -- Gray 10/97.
-   */
-  if (md5_p->md_total[0] > MAX_MD5_UINT32 - buf_len) {
-    md5_p->md_total[1]++;
-    md5_p->md_total[0] -= (MAX_MD5_UINT32 - buf_len);
-  }
-  else {
-    md5_p->md_total[0] += buf_len;
-  }
-
-  /*
-   * Process all bytes in the buffer with MD5_BLOCK bytes in each
-   * round of the loop.
-   */
-  while (buf_p < end_p) {
-    md5_uint32	A_save, B_save, C_save, D_save;
-    md5_uint32	*corr_p = correct;
-
-    A_save = A;
-    B_save = B;
-    C_save = C;
-    D_save = D;
-
-    /*
-     * Before we start, one word to the strange constants.  They are
-     * defined in RFC 1321 as
-     *
-     * T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..MD5_BLOCK
-     */
-
-    /* Round 1. */
-    OP1 (A, B, C, D, buf_p, corr_p,  7, 0xd76aa478);
-    OP1 (D, A, B, C, buf_p, corr_p, 12, 0xe8c7b756);
-    OP1 (C, D, A, B, buf_p, corr_p, 17, 0x242070db);
-    OP1 (B, C, D, A, buf_p, corr_p, 22, 0xc1bdceee);
-    OP1 (A, B, C, D, buf_p, corr_p,  7, 0xf57c0faf);
-    OP1 (D, A, B, C, buf_p, corr_p, 12, 0x4787c62a);
-    OP1 (C, D, A, B, buf_p, corr_p, 17, 0xa8304613);
-    OP1 (B, C, D, A, buf_p, corr_p, 22, 0xfd469501);
-    OP1 (A, B, C, D, buf_p, corr_p,  7, 0x698098d8);
-    OP1 (D, A, B, C, buf_p, corr_p, 12, 0x8b44f7af);
-    OP1 (C, D, A, B, buf_p, corr_p, 17, 0xffff5bb1);
-    OP1 (B, C, D, A, buf_p, corr_p, 22, 0x895cd7be);
-    OP1 (A, B, C, D, buf_p, corr_p,  7, 0x6b901122);
-    OP1 (D, A, B, C, buf_p, corr_p, 12, 0xfd987193);
-    OP1 (C, D, A, B, buf_p, corr_p, 17, 0xa679438e);
-    OP1 (B, C, D, A, buf_p, corr_p, 22, 0x49b40821);
-
-    /* Round 2. */
-    OP234 (FG, A, B, C, D, correct[  1],  5, 0xf61e2562);
-    OP234 (FG, D, A, B, C, correct[  6],  9, 0xc040b340);
-    OP234 (FG, C, D, A, B, correct[ 11], 14, 0x265e5a51);
-    OP234 (FG, B, C, D, A, correct[  0], 20, 0xe9b6c7aa);
-    OP234 (FG, A, B, C, D, correct[  5],  5, 0xd62f105d);
-    OP234 (FG, D, A, B, C, correct[ 10],  9, 0x02441453);
-    OP234 (FG, C, D, A, B, correct[ 15], 14, 0xd8a1e681);
-    OP234 (FG, B, C, D, A, correct[  4], 20, 0xe7d3fbc8);
-    OP234 (FG, A, B, C, D, correct[  9],  5, 0x21e1cde6);
-    OP234 (FG, D, A, B, C, correct[ 14],  9, 0xc33707d6);
-    OP234 (FG, C, D, A, B, correct[  3], 14, 0xf4d50d87);
-    OP234 (FG, B, C, D, A, correct[  8], 20, 0x455a14ed);
-    OP234 (FG, A, B, C, D, correct[ 13],  5, 0xa9e3e905);
-    OP234 (FG, D, A, B, C, correct[  2],  9, 0xfcefa3f8);
-    OP234 (FG, C, D, A, B, correct[  7], 14, 0x676f02d9);
-    OP234 (FG, B, C, D, A, correct[ 12], 20, 0x8d2a4c8a);
-
-    /* Round 3. */
-    OP234 (FH, A, B, C, D, correct[  5],  4, 0xfffa3942);
-    OP234 (FH, D, A, B, C, correct[  8], 11, 0x8771f681);
-    OP234 (FH, C, D, A, B, correct[ 11], 16, 0x6d9d6122);
-    OP234 (FH, B, C, D, A, correct[ 14], 23, 0xfde5380c);
-    OP234 (FH, A, B, C, D, correct[  1],  4, 0xa4beea44);
-    OP234 (FH, D, A, B, C, correct[  4], 11, 0x4bdecfa9);
-    OP234 (FH, C, D, A, B, correct[  7], 16, 0xf6bb4b60);
-    OP234 (FH, B, C, D, A, correct[ 10], 23, 0xbebfbc70);
-    OP234 (FH, A, B, C, D, correct[ 13],  4, 0x289b7ec6);
-    OP234 (FH, D, A, B, C, correct[  0], 11, 0xeaa127fa);
-    OP234 (FH, C, D, A, B, correct[  3], 16, 0xd4ef3085);
-    OP234 (FH, B, C, D, A, correct[  6], 23, 0x04881d05);
-    OP234 (FH, A, B, C, D, correct[  9],  4, 0xd9d4d039);
-    OP234 (FH, D, A, B, C, correct[ 12], 11, 0xe6db99e5);
-    OP234 (FH, C, D, A, B, correct[ 15], 16, 0x1fa27cf8);
-    OP234 (FH, B, C, D, A, correct[  2], 23, 0xc4ac5665);
-
-    /* Round 4. */
-    OP234 (FI, A, B, C, D, correct[  0],  6, 0xf4292244);
-    OP234 (FI, D, A, B, C, correct[  7], 10, 0x432aff97);
-    OP234 (FI, C, D, A, B, correct[ 14], 15, 0xab9423a7);
-    OP234 (FI, B, C, D, A, correct[  5], 21, 0xfc93a039);
-    OP234 (FI, A, B, C, D, correct[ 12],  6, 0x655b59c3);
-    OP234 (FI, D, A, B, C, correct[  3], 10, 0x8f0ccc92);
-    OP234 (FI, C, D, A, B, correct[ 10], 15, 0xffeff47d);
-    OP234 (FI, B, C, D, A, correct[  1], 21, 0x85845dd1);
-    OP234 (FI, A, B, C, D, correct[  8],  6, 0x6fa87e4f);
-    OP234 (FI, D, A, B, C, correct[ 15], 10, 0xfe2ce6e0);
-    OP234 (FI, C, D, A, B, correct[  6], 15, 0xa3014314);
-    OP234 (FI, B, C, D, A, correct[ 13], 21, 0x4e0811a1);
-    OP234 (FI, A, B, C, D, correct[  4],  6, 0xf7537e82);
-    OP234 (FI, D, A, B, C, correct[ 11], 10, 0xbd3af235);
-    OP234 (FI, C, D, A, B, correct[  2], 15, 0x2ad7d2bb);
-    OP234 (FI, B, C, D, A, correct[  9], 21, 0xeb86d391);
-
-    /* Add the starting values of the context. */
-    A += A_save;
-    B += B_save;
-    C += C_save;
-    D += D_save;
-  }
-
-  /* Put checksum in context given as argument. */
-  md5_p->md_A = A;
-  md5_p->md_B = B;
-  md5_p->md_C = C;
-  md5_p->md_D = D;
-}
-
+/* $Id: md5.c,v 1.6 2002/04/13 19:20:28 lpd Exp $ */
 /*
- * md5_get_result
- *
- * DESCRIPTION:
- *
- * Copy the resulting MD5 signature from MD5_P into the first 16 bytes
- * (MD5_SIZE) of the result buffer.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * md5_p - Pointer to MD5 structure from which we are getting the result.
- *
- * result - A 16 byte buffer that will contain the MD5 signature.
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321, whose
+  text is available at
+	http://www.ietf.org/rfc/rfc1321.txt
+  The code is derived from the text of the RFC, including the test suite
+  (section A.5) but excluding the rest of Appendix A.  It does not include
+  any code or documentation that is identified in the RFC as being
+  copyrighted.
+
+  The original and principal author of md5.c is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  2002-04-13 lpd Clarified derivation from RFC 1321; now handles byte order
+	either statically or dynamically; added missing #include <string.h>
+	in library.
+  2002-03-11 lpd Corrected argument list for main(), and added int return
+	type, in test program and T value program.
+  2002-02-21 lpd Added missing #include <stdio.h> in test program.
+  2000-07-03 lpd Patched to eliminate warnings about "constant is
+	unsigned in ANSI C, signed in traditional"; made test program
+	self-checking.
+  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
+  1999-05-03 lpd Original version.
  */
-static	void	md5_get_result(const md5_t *md5_p, void *result)
-{
-  md5_uint32	hold;
-  void		*res_p = result;
-
-  hold = SWAP(md5_p->md_A);
-  memcpy(res_p, &hold, sizeof(md5_uint32));
-  res_p = (char *)res_p + sizeof(md5_uint32);
-
-  hold = SWAP(md5_p->md_B);
-  memcpy(res_p, &hold, sizeof(md5_uint32));
-  res_p = (char *)res_p + sizeof(md5_uint32);
 
-  hold = SWAP(md5_p->md_C);
-  memcpy(res_p, &hold, sizeof(md5_uint32));
-  res_p = (char *)res_p + sizeof(md5_uint32);
-
-  hold = SWAP(md5_p->md_D);
-  memcpy(res_p, &hold, sizeof(md5_uint32));
-}
-
-/***************************** exported routines *****************************/
-
-/*
- * md5_init
- *
- * DESCRIPTION:
- *
- * Initialize structure containing state of MD5 computation. (RFC 1321,
- * 3.3: Step 3).  This is for progressive MD5 calculations only.  If
- * you have the complete string available, md5_buffer should be used.
- * md5_process should be called for each bunch of bytes and after the
- * last process call, md5_finish should be called to get the
- * signature.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * md5_p - Pointer to md5 structure that we are initializing.
- */
-void	md5_init(md5_t *md5_p)
-{
-  md5_p->md_A = 0x67452301;
-  md5_p->md_B = 0xefcdab89;
-  md5_p->md_C = 0x98badcfe;
-  md5_p->md_D = 0x10325476;
-
-  md5_p->md_total[0] = 0;
-  md5_p->md_total[1] = 0;
-  md5_p->md_buf_len = 0;
-}
+#include "md5.h"
+#include <string.h>
 
-/*
- * md5_process
- *
- * DESCRIPTION:
- *
- * This function is used to progressively calculate a MD5 signature some
- * number of bytes at a time.  If you have the complete string
- * available, md5_buffer should be used.  The MD5 structure should
- * have been initialized with md5_init and after the last process
- * call, md5_finish should be called to get the results.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * md5_p - Pointer to MD5 structure which we are progressively updating.
- *
- * buffer - A buffer of bytes whose MD5 signature we are calculating.
- *
- * buf_len - The length of the buffer.
- */
-void	md5_process(md5_t *md5_p, const void *buffer,
-		    const unsigned int buf_len)
+#undef BYTE_ORDER	/* 1 = big-endian, -1 = little-endian, 0 = unknown */
+#ifdef ARCH_IS_BIG_ENDIAN
+#  define BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1)
+#else
+#  define BYTE_ORDER 0
+#endif
+
+#define T_MASK ((md5_word_t)~0)
+#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87)
+#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9)
+#define T3    0x242070db
+#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111)
+#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050)
+#define T6    0x4787c62a
+#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec)
+#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe)
+#define T9    0x698098d8
+#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850)
+#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e)
+#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841)
+#define T13    0x6b901122
+#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c)
+#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71)
+#define T16    0x49b40821
+#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d)
+#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf)
+#define T19    0x265e5a51
+#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855)
+#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2)
+#define T22    0x02441453
+#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e)
+#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437)
+#define T25    0x21e1cde6
+#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829)
+#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278)
+#define T28    0x455a14ed
+#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa)
+#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07)
+#define T31    0x676f02d9
+#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375)
+#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd)
+#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e)
+#define T35    0x6d9d6122
+#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3)
+#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb)
+#define T38    0x4bdecfa9
+#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f)
+#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f)
+#define T41    0x289b7ec6
+#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805)
+#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a)
+#define T44    0x04881d05
+#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6)
+#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a)
+#define T47    0x1fa27cf8
+#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a)
+#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb)
+#define T50    0x432aff97
+#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58)
+#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6)
+#define T53    0x655b59c3
+#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d)
+#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82)
+#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e)
+#define T57    0x6fa87e4f
+#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f)
+#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb)
+#define T60    0x4e0811a1
+#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d)
+#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca)
+#define T63    0x2ad7d2bb
+#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e)
+
+
+static void
+md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
 {
-  unsigned int	len = buf_len;
-  unsigned int	in_block, add;
-
-  /*
-   * When we already have some bytes in our internal buffer, copy some
-   * from the user to fill the block.
-   */
-  if (md5_p->md_buf_len > 0) {
-    
-    in_block = md5_p->md_buf_len;
-    if (in_block + len > sizeof(md5_p->md_buffer)) {
-      add = sizeof(md5_p->md_buffer) - in_block;
-    }
-    else {
-      add = len;
+    md5_word_t
+	a = pms->abcd[0], b = pms->abcd[1],
+	c = pms->abcd[2], d = pms->abcd[3];
+    md5_word_t t;
+#if BYTE_ORDER > 0
+    /* Define storage only for big-endian CPUs. */
+    md5_word_t X[16];
+#else
+    /* Define storage for little-endian or both types of CPUs. */
+    md5_word_t xbuf[16];
+    const md5_word_t *X;
+#endif
+
+    {
+#if BYTE_ORDER == 0
+	/*
+	 * Determine dynamically whether this is a big-endian or
+	 * little-endian machine, since we can use a more efficient
+	 * algorithm on the latter.
+	 */
+	static const int w = 1;
+
+	if (*((const md5_byte_t *)&w)) /* dynamic little-endian */
+#endif
+#if BYTE_ORDER <= 0		/* little-endian */
+	{
+	    /*
+	     * On little-endian machines, we can process properly aligned
+	     * data without copying it.
+	     */
+	    if (!((data - (const md5_byte_t *)0) & 3)) {
+		/* data are properly aligned */
+		X = (const md5_word_t *)data;
+	    } else {
+		/* not aligned */
+		memcpy(xbuf, data, 64);
+		X = xbuf;
+	    }
+	}
+#endif
+#if BYTE_ORDER == 0
+	else			/* dynamic big-endian */
+#endif
+#if BYTE_ORDER >= 0		/* big-endian */
+	{
+	    /*
+	     * On big-endian machines, we must arrange the bytes in the
+	     * right order.
+	     */
+	    const md5_byte_t *xp = data;
+	    int i;
+
+#  if BYTE_ORDER == 0
+	    X = xbuf;		/* (dynamic only) */
+#  else
+#    define xbuf X		/* (static only) */
+#  endif
+	    for (i = 0; i < 16; ++i, xp += 4)
+		xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
+	}
+#endif
     }
 
-    memcpy (md5_p->md_buffer + in_block, buffer, add);
-    md5_p->md_buf_len += add;
-    in_block += add;
-
-    if (in_block > MD5_BLOCK_SIZE) {
-      process_block (md5_p, md5_p->md_buffer, in_block & ~BLOCK_SIZE_MASK);
-      /* the regions in the following copy operation will not overlap. */
-      memcpy (md5_p->md_buffer,
-	      md5_p->md_buffer + (in_block & ~BLOCK_SIZE_MASK),
-	      in_block & BLOCK_SIZE_MASK);
-      md5_p->md_buf_len = in_block & BLOCK_SIZE_MASK;
-    }
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
 
-    buffer = (const char *)buffer + add;
-    len -= add;
-  }
-
-  /* process available complete blocks right from the user buffer */
-  if (len > MD5_BLOCK_SIZE) {
-    process_block (md5_p, buffer, len & ~BLOCK_SIZE_MASK);
-    buffer = (const char *) buffer + (len & ~BLOCK_SIZE_MASK);
-    len &= BLOCK_SIZE_MASK;
-  }
-
-  /* copy remaining bytes into the internal buffer */
-  if (len > 0) {
-    memcpy (md5_p->md_buffer, buffer, len);
-    md5_p->md_buf_len = len;
-  }
+    /* Round 1. */
+    /* Let [abcd k s i] denote the operation
+       a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
+#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + F(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+    /* Do the following 16 operations. */
+    SET(a, b, c, d,  0,  7,  T1);
+    SET(d, a, b, c,  1, 12,  T2);
+    SET(c, d, a, b,  2, 17,  T3);
+    SET(b, c, d, a,  3, 22,  T4);
+    SET(a, b, c, d,  4,  7,  T5);
+    SET(d, a, b, c,  5, 12,  T6);
+    SET(c, d, a, b,  6, 17,  T7);
+    SET(b, c, d, a,  7, 22,  T8);
+    SET(a, b, c, d,  8,  7,  T9);
+    SET(d, a, b, c,  9, 12, T10);
+    SET(c, d, a, b, 10, 17, T11);
+    SET(b, c, d, a, 11, 22, T12);
+    SET(a, b, c, d, 12,  7, T13);
+    SET(d, a, b, c, 13, 12, T14);
+    SET(c, d, a, b, 14, 17, T15);
+    SET(b, c, d, a, 15, 22, T16);
+#undef SET
+
+     /* Round 2. */
+     /* Let [abcd k s i] denote the operation
+          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
+#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + G(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  1,  5, T17);
+    SET(d, a, b, c,  6,  9, T18);
+    SET(c, d, a, b, 11, 14, T19);
+    SET(b, c, d, a,  0, 20, T20);
+    SET(a, b, c, d,  5,  5, T21);
+    SET(d, a, b, c, 10,  9, T22);
+    SET(c, d, a, b, 15, 14, T23);
+    SET(b, c, d, a,  4, 20, T24);
+    SET(a, b, c, d,  9,  5, T25);
+    SET(d, a, b, c, 14,  9, T26);
+    SET(c, d, a, b,  3, 14, T27);
+    SET(b, c, d, a,  8, 20, T28);
+    SET(a, b, c, d, 13,  5, T29);
+    SET(d, a, b, c,  2,  9, T30);
+    SET(c, d, a, b,  7, 14, T31);
+    SET(b, c, d, a, 12, 20, T32);
+#undef SET
+
+     /* Round 3. */
+     /* Let [abcd k s t] denote the operation
+          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + H(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  5,  4, T33);
+    SET(d, a, b, c,  8, 11, T34);
+    SET(c, d, a, b, 11, 16, T35);
+    SET(b, c, d, a, 14, 23, T36);
+    SET(a, b, c, d,  1,  4, T37);
+    SET(d, a, b, c,  4, 11, T38);
+    SET(c, d, a, b,  7, 16, T39);
+    SET(b, c, d, a, 10, 23, T40);
+    SET(a, b, c, d, 13,  4, T41);
+    SET(d, a, b, c,  0, 11, T42);
+    SET(c, d, a, b,  3, 16, T43);
+    SET(b, c, d, a,  6, 23, T44);
+    SET(a, b, c, d,  9,  4, T45);
+    SET(d, a, b, c, 12, 11, T46);
+    SET(c, d, a, b, 15, 16, T47);
+    SET(b, c, d, a,  2, 23, T48);
+#undef SET
+
+     /* Round 4. */
+     /* Let [abcd k s t] denote the operation
+          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
+#define I(x, y, z) ((y) ^ ((x) | ~(z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + I(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  0,  6, T49);
+    SET(d, a, b, c,  7, 10, T50);
+    SET(c, d, a, b, 14, 15, T51);
+    SET(b, c, d, a,  5, 21, T52);
+    SET(a, b, c, d, 12,  6, T53);
+    SET(d, a, b, c,  3, 10, T54);
+    SET(c, d, a, b, 10, 15, T55);
+    SET(b, c, d, a,  1, 21, T56);
+    SET(a, b, c, d,  8,  6, T57);
+    SET(d, a, b, c, 15, 10, T58);
+    SET(c, d, a, b,  6, 15, T59);
+    SET(b, c, d, a, 13, 21, T60);
+    SET(a, b, c, d,  4,  6, T61);
+    SET(d, a, b, c, 11, 10, T62);
+    SET(c, d, a, b,  2, 15, T63);
+    SET(b, c, d, a,  9, 21, T64);
+#undef SET
+
+     /* Then perform the following additions. (That is increment each
+        of the four registers by the value it had before this block
+        was started.) */
+    pms->abcd[0] += a;
+    pms->abcd[1] += b;
+    pms->abcd[2] += c;
+    pms->abcd[3] += d;
 }
 
-/*
- * md5_finish
- *
- * DESCRIPTION:
- *
- * Finish a progressing MD5 calculation and copy the resulting MD5
- * signature into the result buffer which should be 16 bytes
- * (MD5_SIZE).  After this call, the MD5 structure is invalid.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * md5_p - Pointer to MD5 structure which we are finishing.
- *
- * signature - A 16 byte buffer that will contain the MD5 signature.
- */
-void	md5_finish(md5_t *md5_p, void *signature)
+void
+md5_init(md5_state_t *pms)
 {
-  md5_uint32	bytes, hold;
-  int		pad;
-
-  /* take yet unprocessed bytes into account */
-  bytes = md5_p->md_buf_len;
-
-  /*
-   * Count remaining bytes.  Modified to do this to better avoid
-   * overflows in the lower word -- Gray 10/97.
-   */
-  if (md5_p->md_total[0] > MAX_MD5_UINT32 - bytes) {
-    md5_p->md_total[1]++;
-    md5_p->md_total[0] -= (MAX_MD5_UINT32 - bytes);
-  }
-  else {
-    md5_p->md_total[0] += bytes;
-  }
-
-  /*
-   * Pad the buffer to the next MD5_BLOCK-byte boundary.  (RFC 1321,
-   * 3.1: Step 1).  We need enough room for two size words and the
-   * bytes left in the buffer.  For some reason even if we are equal
-   * to the block-size, we add an addition block of pad bytes.
-   */
-  pad = MD5_BLOCK_SIZE - (sizeof(md5_uint32) * 2) - bytes;
-  if (pad <= 0) {
-    pad += MD5_BLOCK_SIZE;
-  }
-
-  /*
-   * Modified from a fixed array to this assignment and memset to be
-   * more flexible with block-sizes -- Gray 10/97.
-   */
-  if (pad > 0) {
-    /* some sort of padding start byte */
-    md5_p->md_buffer[bytes] = (unsigned char)0x80;
-    if (pad > 1) {
-      memset (md5_p->md_buffer + bytes + 1, 0, pad - 1);
-    }
-    bytes += pad;
-  }
-
-  /* put the 64-bit file length in _bits_ (i.e. *8) at the end of the buffer */
-  hold = SWAP(md5_p->md_total[0] << 3);
-  memcpy(md5_p->md_buffer + bytes, &hold, sizeof(md5_uint32));
-  bytes += sizeof(md5_uint32);
-
-  /* shift the high word over by 3 and add in the top 3 bits from the low */
-  hold = SWAP((md5_p->md_total[1] << 3) | (md5_p->md_total[0] >> 29));
-  memcpy(md5_p->md_buffer + bytes, &hold, sizeof(md5_uint32));
-  bytes += sizeof(md5_uint32);
-
-  /* process last bytes, the padding chars, and size words */
-  process_block(md5_p, md5_p->md_buffer, bytes);
-  md5_get_result(md5_p, signature);
+    pms->count[0] = pms->count[1] = 0;
+    pms->abcd[0] = 0x67452301;
+    pms->abcd[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476;
+    pms->abcd[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301;
+    pms->abcd[3] = 0x10325476;
 }
 
-/*
- * md5_buffer
- *
- * DESCRIPTION:
- *
- * This function is used to calculate a MD5 signature for a buffer of
- * bytes.  If you only have part of a buffer that you want to process
- * then md5_init, md5_process, and md5_finish should be used.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * buffer - A buffer of bytes whose MD5 signature we are calculating.
- *
- * buf_len - The length of the buffer.
- *
- * signature - A 16 byte buffer that will contain the MD5 signature.
- */
-void	md5_buffer(const char *buffer, const unsigned int buf_len,
-		   void *signature)
+void
+md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
 {
-  md5_t		md5;
-
-  /* initialize the computation context */
-  md5_init(&md5);
-
-  /* process whole buffer but last buf_len % MD5_BLOCK bytes */
-  md5_process(&md5, buffer, buf_len);
+    const md5_byte_t *p = data;
+    int left = nbytes;
+    int offset = (pms->count[0] >> 3) & 63;
+    md5_word_t nbits = (md5_word_t)(nbytes << 3);
+
+    if (nbytes <= 0)
+	return;
+
+    /* Update the message length. */
+    pms->count[1] += nbytes >> 29;
+    pms->count[0] += nbits;
+    if (pms->count[0] < nbits)
+	pms->count[1]++;
+
+    /* Process an initial partial block. */
+    if (offset) {
+	int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
+
+	memcpy(pms->buf + offset, p, copy);
+	if (offset + copy < 64)
+	    return;
+	p += copy;
+	left -= copy;
+	md5_process(pms, pms->buf);
+    }
 
-  /* put result in desired memory area */
-  md5_finish(&md5, signature);
-}
+    /* Process full blocks. */
+    for (; left >= 64; p += 64, left -= 64)
+	md5_process(pms, p);
 
-/*
- * md5_sig_to_string
- *
- * DESCRIPTION:
- *
- * Convert a MD5 signature in a 16 byte buffer into a hexadecimal string
- * representation.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * signature - a 16 byte buffer that contains the MD5 signature.
- *
- * str - a string of charactes which should be at least 33 bytes long (2
- * characters per MD5 byte and 1 for the \0).
- *
- * str_len - the length of the string.
- */
-void	md5_sig_to_string(void *signature, char *str, const int str_len)
-{
-  unsigned char	*sig_p;
-  char		*str_p, *max_p;
-  unsigned int	high, low;
-  
-  str_p = str;
-  max_p = str + str_len;
-  
-  for (sig_p = (unsigned char *)signature;
-       sig_p < (unsigned char *)signature + MD5_SIZE;
-       sig_p++) {
-    high = *sig_p / 16;
-    low = *sig_p % 16;
-    /* account for 2 chars */
-    if (str_p + 1 >= max_p) {
-      break;
-    }
-    *str_p++ = HEX_STRING[high];
-    *str_p++ = HEX_STRING[low];
-  }
-  /* account for 2 chars */
-  if (str_p < max_p) {
-    *str_p++ = '\0';
-  }
+    /* Process a final partial block. */
+    if (left)
+	memcpy(pms->buf, p, left);
 }
 
-/*
- * md5_sig_from_string
- *
- * DESCRIPTION:
- *
- * Convert a MD5 signature from a hexadecimal string representation into
- * a 16 byte buffer.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * signature - A 16 byte buffer that will contain the MD5 signature.
- *
- * str - A string of charactes which _must_ be at least 32 bytes long (2
- * characters per MD5 byte).
- */
-void	md5_sig_from_string(void *signature, const char *str)
+void
+md5_finish(md5_state_t *pms, md5_byte_t digest[16])
 {
-  unsigned char	*sig_p;
-  const char	*str_p;
-  char		*hex;
-  unsigned int	high, low, val;
-  
-  hex = HEX_STRING;
-  sig_p = signature;
-  
-  for (str_p = str; str_p < str + MD5_SIZE * 2; str_p += 2) {
-    high = strchr(hex, *str_p) - hex;
-    low = strchr(hex, *(str_p + 1)) - hex;
-    val = high * 16 + low;
-    *sig_p++ = val;
-  }
+    static const md5_byte_t pad[64] = {
+	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    };
+    md5_byte_t data[8];
+    int i;
+
+    /* Save the length before padding. */
+    for (i = 0; i < 8; ++i)
+	data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
+    /* Pad to 56 bytes mod 64. */
+    md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
+    /* Append the length. */
+    md5_append(pms, data, 8);
+    for (i = 0; i < 16; ++i)
+	digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
 }
diff --git a/md5/md5.h b/md5/md5.h
index de5ddf39..698c995d 100644
--- a/md5/md5.h
+++ b/md5/md5.h
@@ -1,217 +1,91 @@
 /*
- * Declaration of functions and data types used for MD5 sum computing
- * library functions.  Copyright (C) 1995, 1996 Free Software
- * Foundation, Inc.  NOTE: The canonical source of this file is
- * maintained with the GNU C Library.  Bugs can be reported to
- * bug-glibc@prep.ai.mit.edu.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- */
+  Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
 
-/*
- * NOTE: during quick performance tests on a sun ultra and an alpha
- * 255 300, the md5 libraries performed upwards of 3mb/sec.  That
- * included disk i/o on bobcat and panther.
- */
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
 
-#ifndef __MD5_H__
-#define __MD5_H__
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
 
-/*
- * Size of a standard MD5 signature in bytes.  This definition is for
- * external programs only.  The MD5 routines themselves reference the
- * signature as 4 unsigned 32-bit integers.
- */
-#define MD5_SIZE	16
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
 
-/*
- * NOTE: the following is assumed to generate a 32-bit unsigned data
- * type.
- */
-typedef unsigned int		md5_uint32;
-#define MAX_MD5_UINT32		((md5_uint32)4294967295U)
+  L. Peter Deutsch
+  ghost@aladdin.com
 
-/*
- * The MD5 algorithm works on blocks of characters of 64 bytes.  This
- * is an internal value only and is not necessary for external use.
  */
-#define MD5_BLOCK_SIZE		64
-
+/* $Id: md5.h,v 1.4 2002/04/13 19:20:28 lpd Exp $ */
 /*
- * Structure to save state of computation between the single steps.
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321, whose
+  text is available at
+	http://www.ietf.org/rfc/rfc1321.txt
+  The code is derived from the text of the RFC, including the test suite
+  (section A.5) but excluding the rest of Appendix A.  It does not include
+  any code or documentation that is identified in the RFC as being
+  copyrighted.
+
+  The original and principal author of md5.h is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  2002-04-13 lpd Removed support for non-ANSI compilers; removed
+	references to Ghostscript; clarified derivation from RFC 1321;
+	now handles byte order either statically or dynamically.
+  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
+	added conditionalization for C++ compilation from Martin
+	Purschke <purschke@bnl.gov>.
+  1999-05-03 lpd Original version.
  */
-typedef struct
-{
-  md5_uint32	md_A;			/* accumulater 1 */
-  md5_uint32	md_B;			/* accumulater 2 */
-  md5_uint32	md_C;			/* accumulater 3 */
-  md5_uint32	md_D;			/* accumulater 4 */
-
-  md5_uint32	md_total[2];		/* totaling storage */
-  md5_uint32	md_buf_len;		/* length of the storage buffer */
-  char		md_buffer[MD5_BLOCK_SIZE * 2];	/* character storage buffer */
-} md5_t;
 
-/*<<<<<<<<<<  The below prototypes are auto-generated by fillproto */
+#ifndef md5_INCLUDED
+#  define md5_INCLUDED
 
 /*
- * md5_init
- *
- * DESCRIPTION:
- *
- * Initialize structure containing state of MD5 computation. (RFC 1321,
- * 3.3: Step 3).  This is for progressive MD5 calculations only.  If
- * you have the complete string available, md5_buffer should be used.
- * md5_process should be called for each bunch of bytes and after the
- * last process call, md5_finish should be called to get the
- * signature.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * md5_p - Pointer to md5 structure that we are initializing.
+ * This package supports both compile-time and run-time determination of CPU
+ * byte order.  If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
+ * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is
+ * defined as non-zero, the code will be compiled to run only on big-endian
+ * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to
+ * run on either big- or little-endian CPUs, but will run slightly less
+ * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
  */
-extern
-void	md5_init(md5_t *md5_p);
 
-/*
- * md5_process
- *
- * DESCRIPTION:
- *
- * This function is used to progressively calculate a MD5 signature some
- * number of bytes at a time.  If you have the complete string
- * available, md5_buffer should be used.  The MD5 structure should
- * have been initialized with md5_init and after the last process
- * call, md5_finish should be called to get the results.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * md5_p - Pointer to MD5 structure which we are progressively updating.
- *
- * buffer - A buffer of bytes whose MD5 signature we are calculating.
- *
- * buf_len - The length of the buffer.
- */
-extern
-void	md5_process(md5_t *md5_p, const void *buffer,
-		    const unsigned int buf_len);
+typedef unsigned char md5_byte_t; /* 8-bit byte */
+typedef unsigned int md5_word_t; /* 32-bit word */
 
-/*
- * md5_finish
- *
- * DESCRIPTION:
- *
- * Finish a progressing MD5 calculation and copy the resulting MD5
- * signature into the result buffer which should be 16 bytes
- * (MD5_SIZE).  After this call, the MD5 structure is invalid.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * md5_p - Pointer to MD5 structure which we are finishing.
- *
- * signature - A 16 byte buffer that will contain the MD5 signature.
- */
-extern
-void	md5_finish(md5_t *md5_p, void *signature);
+/* Define the state of the MD5 Algorithm. */
+typedef struct md5_state_s {
+    md5_word_t count[2];	/* message length in bits, lsw first */
+    md5_word_t abcd[4];		/* digest buffer */
+    md5_byte_t buf[64];		/* accumulate block */
+} md5_state_t;
 
-/*
- * md5_buffer
- *
- * DESCRIPTION:
- *
- * This function is used to calculate a MD5 signature for a buffer of
- * bytes.  If you only have part of a buffer that you want to process
- * then md5_init, md5_process, and md5_finish should be used.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * buffer - A buffer of bytes whose MD5 signature we are calculating.
- *
- * buf_len - The length of the buffer.
- *
- * signature - A 16 byte buffer that will contain the MD5 signature.
- */
-extern
-void	md5_buffer(const char *buffer, const unsigned int buf_len,
-		   void *signature);
+#ifdef __cplusplus
+extern "C" 
+{
+#endif
 
-/*
- * md5_sig_to_string
- *
- * DESCRIPTION:
- *
- * Convert a MD5 signature in a 16 byte buffer into a hexadecimal string
- * representation.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * signature - a 16 byte buffer that contains the MD5 signature.
- *
- * str - a string of charactes which should be at least 33 bytes long (2
- * characters per MD5 byte and 1 for the \0).
- *
- * str_len - the length of the string.
- */
-extern
-void	md5_sig_to_string(void *signature, char *str, const int str_len);
+/* Initialize the algorithm. */
+void md5_init(md5_state_t *pms);
 
-/*
- * md5_sig_from_string
- *
- * DESCRIPTION:
- *
- * Convert a MD5 signature from a hexadecimal string representation into
- * a 16 byte buffer.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * signature - A 16 byte buffer that will contain the MD5 signature.
- *
- * str - A string of charactes which _must_ be at least 32 bytes long (2
- * characters per MD5 byte).
- */
-extern
-void	md5_sig_from_string(void *signature, const char *str);
+/* Append a string to the message. */
+void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
 
-/*<<<<<<<<<<   This is end of the auto-generated output from fillproto. */
+/* Finish the message and return the digest. */
+void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
 
-#endif /* ! __MD5_H__ */
+#ifdef __cplusplus
+}  /* end extern "C" */
+#endif
 
+#endif /* md5_INCLUDED */
diff --git a/md5/md5_loc.h b/md5/md5_loc.h
deleted file mode 100644
index c70d965a..00000000
--- a/md5/md5_loc.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Local defines for the md5 functions.
- *
- */
-
-/*
- * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
- * rights reserved.
- *
- * License to copy and use this software is granted provided that it is
- * identified as the "RSA Data Security, Inc. MD5 Message-Digest
- * Algorithm" in all material mentioning or referencing this software
- * or this function.
- *
- * License is also granted to make and use derivative works provided that
- * such works are identified as "derived from the RSA Data Security,
- * Inc. MD5 Message-Digest Algorithm" in all material mentioning or
- * referencing the derived work.
- *
- * RSA Data Security, Inc. makes no representations concerning either the
- * merchantability of this software or the suitability of this
- * software for any particular purpose. It is provided "as is" without
- * express or implied warranty of any kind.
- *
- * These notices must be retained in any copies of any part of this
- * documentation and/or software.
- */
-
-#ifndef __MD5_LOC_H__
-#define __MD5_LOC_H__
-
-#define HEX_STRING	"0123456789abcdef"	/* to convert to hex */
-#define BLOCK_SIZE_MASK	(MD5_BLOCK_SIZE - 1)
-
-
-//#include <config.h>
-
-/*
- * Define my endian-ness.  Could not do in a portable manner using the
- * include files -- grumble.
- */
-#ifdef WORDS_BIGENDIAN
-/*
- * big endian - big is better
- */
-#define SWAP(n)	\
-    (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
-#else
-/*
-	+ * little endian
-	+ */
-#define SWAP(n)    (n)
-#endif
-
-/*
- * These are the four functions used in the four steps of the MD5
- * algorithm and defined in the RFC 1321.  The first function is a
- * little bit optimized (as found in Colin Plumbs public domain
- * implementation).
- */
-/* #define FF(b, c, d) ((b & c) | (~b & d)) */
-#define FF(b, c, d)	(d ^ (b & (c ^ d)))
-#define FG(b, c, d)	FF(d, b, c)
-#define FH(b, c, d)	(b ^ c ^ d)
-#define FI(b, c, d)	(c ^ (b | ~d))
-
-/*
- * It is unfortunate that C does not provide an operator for cyclic
- * rotation.  Hope the C compiler is smart enough.  -- Modified to
- * remove the w = at the front - Gray 2/97
- */
-#define CYCLIC(w, s)	((w << s) | (w >> (32 - s)))
-
-/*
- * First Round: using the given function, the context and a constant
- * the next context is computed.  Because the algorithms processing
- * unit is a 32-bit word and it is determined to work on words in
- * little endian byte order we perhaps have to change the byte order
- * before the computation.  To reduce the work for the next steps we
- * store the swapped words in the array CORRECT_WORDS. -- Modified to
- * fix the handling of unaligned buffer spaces - Gray 7/97
- */
-#define OP1(a, b, c, d, b_p, c_p, s, T)				\
-     do {							\
-       memcpy(c_p, b_p, sizeof(md5_uint32));       		\
-       *c_p = SWAP(*c_p);					\
-       a += FF (b, c, d) + *c_p + T;				\
-       a = CYCLIC (a, s);					\
-       a += b;							\
-       b_p = (char *)b_p + sizeof(md5_uint32);			\
-       c_p++;							\
-    } while (0)
-
-/*
- * Second to Fourth Round: we have the possibly swapped words in
- * CORRECT_WORDS.  Redefine the macro to take an additional first
- * argument specifying the function to use.
- */
-#define OP234(FUNC, a, b, c, d, k, s, T)		\
-    do { 						\
-      a += FUNC (b, c, d) + k + T;			\
-      a = CYCLIC (a, s);				\
-      a += b;						\
-    } while (0)
-
-#endif /* ! __MD5_LOC_H__ */
diff --git a/moduleconf.h b/moduleconf.h
index cc1df308..6f9ca732 100644
--- a/moduleconf.h
+++ b/moduleconf.h
@@ -1,4 +1,3 @@
 PLUG(gme)
 PLUG(dumb)
-//PLUG(sid)
 PLUG(stdio)
diff --git a/plugins.c b/plugins.c
index de3bcf67..b39876dd 100644
--- a/plugins.c
+++ b/plugins.c
@@ -51,6 +51,9 @@ static DB_functions_t deadbeef_api = {
     .ev_unsubscribe = plug_ev_unsubscribe,
     .md5 = plug_md5,
     .md5_to_str = plug_md5_to_str,
+    .md5_init = (void (*)(DB_md5_t *s))md5_init,
+    .md5_append = (void (*)(DB_md5_t *s, const uint8_t *daya, int nbytes))md5_append,
+    .md5_finish = (void (*)(DB_md5_t *s, uint8_t digest[16]))md5_finish,
     .get_output = plug_get_output,
     .playback_next = plug_playback_next,
     .playback_prev = plug_playback_prev,
@@ -211,12 +214,21 @@ DB_output_t *output_plugin = NULL;
 
 void
 plug_md5 (uint8_t sig[16], const char *in, int len) {
-    md5_buffer (in, len, sig);
+    md5_state_t st;
+    md5_init (&st);
+    md5_append (&st, in, len);
+    md5_finish (&st, sig);
 }
 
 void
 plug_md5_to_str (char *str, const uint8_t sig[16]) {
-    md5_sig_to_string ((char *)sig, str, 33);
+    int i = 0;
+    static const char hex[] = "0123456789abcdef";
+    for (i = 0; i < 16; i++) {
+        *str++ = hex[(sig[i]&0xf0)>>4];
+        *str++ = hex[sig[i]&0xf];
+    }
+    *str = 0;
 }
 
 // event handlers
diff --git a/plugins/sid/Makefile.am b/plugins/sid/Makefile.am
new file mode 100644
index 00000000..b7d35943
--- /dev/null
+++ b/plugins/sid/Makefile.am
@@ -0,0 +1,12 @@
+sidpath=@top_srcdir@/plugins/sid/sidplay-libs
+SUBDIRS = sidplay-libs
+
+pkglib_LTLIBRARIES = sid.la
+sid_la_SOURCES = plugin.c csid.cpp csid.h
+	
+sid_la_LIBADD =  $(sidpath)/libsidplay2.a -lstdc++
+sid_la_LDFLAGS = -module
+
+AM_CFLAGS = $(CFLAGS) -std=c99 -I$(sidpath)/libsidplay/include -I$(sidpath)/builders/resid-builder/include -fPIC
+AM_CPPFLAGS = $(CXXFLAGS) -I$(sidpath)/libsidplay/include -I$(sidpath)/builders/resid-builder/include -fPIC
+
diff --git a/csid.cpp b/plugins/sid/csid.cpp
index b0e4d6e4..bb0d4655 100644
--- a/csid.cpp
+++ b/plugins/sid/csid.cpp
@@ -24,85 +24,32 @@
 #endif
 #include "sidplay/sidplay2.h"
 #include "sidplay/builders/resid.h"
-// #include "md5/MD5.h" // include those 2 files if you want to use md5 impl from libsidplay2
+//#include "md5.h"
 // #include "sidplay/sidendian.h"
 
 #include "deadbeef.h"
+#include "csid.h"
+
+extern DB_decoder_t sid_plugin;
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
 
-extern "C" {
-#include "md5/md5.h"
-#include "conf.h"
-}
-
-// forward decls
-extern "C" {
-    int csid_init (DB_playItem_t *it);
-    void csid_free (void);
-    int csid_read (char *bytes, int size);
-    int csid_seek (float time);
-    DB_playItem_t *csid_insert (DB_playItem_t *after, const char *fname);
-    int csid_numvoices (void);
-    void csid_mutevoice (int voice, int mute);
-    int csid_stop (void);
-}
-
-static const char *exts[] = { "sid",NULL };
-const char *filetypes[] = { "SID", NULL };
-
-static const char settings_dlg[] =
-    "property \"Enable HVSC\" checkbox hvsc_enable 0;\n"
-    "property \"HVSC path\" file hvsc_path \"\";\n"
-;
-
-// define plugin interface
-static DB_decoder_t plugin = {
-    { // plugin
-        // C macro won't work here, so do it by hand
-        /* .plugin.type = */DB_PLUGIN_DECODER,
-        /* .api_vmajor = */DB_API_VERSION_MAJOR,
-        /* .api_vminor = */DB_API_VERSION_MINOR,
-        /* .plugin.version_major = */0,
-        /* .plugin.version_minor = */1,
-        /* .inactive = */0,
-        /* .plugin.nostop = */0,
-        /* .plugin.name = */"SID decoder",
-        /* .plugin.descr = */"SID player based on libsidplay2",
-        /* .plugin.author = */"Alexey Yakovenko",
-        /* .plugin.email = */"waker@users.sourceforge.net",
-        /* .plugin.website = */"http://deadbeef.sf.net",
-        /* .plugin.start = */NULL,
-        /* .plugin.stop = */csid_stop,
-        /* .plugin.exec_cmdline = */NULL,
-        /* .plugin.configdialog = */settings_dlg,
-    },
-    { // info
-        /* .info.bps = */0,
-        /* .info.channels = */0,
-        /* .info.samplerate = */0,
-        /* .info.readpos = */0,
-    },
-    /* .init = */csid_init,
-    /* .free = */csid_free,
-    /* .read_int16 = */csid_read,
-    /* .read_float32 = */NULL,
-    /* .seek = */csid_seek,
-    /* .seek_sample = */NULL,
-    /* .insert = */csid_insert,
-    /* .numvoices = */csid_numvoices,
-    /* .mutevoice = */csid_mutevoice,
-    /* .exts = */exts,
-    /* .filetypes = */filetypes,
-    /* .id = */"stdsid"
-};
-
 static DB_functions_t *deadbeef;
 
 #define min(x,y) ((x)<(y)?(x):(y))
 #define max(x,y) ((x)>(y)?(x):(y))
 
+typedef struct {
+    DB_fileinfo_t info;
+    sidplay2 *sidplay;
+    ReSIDBuilder *resid;
+    SidTune *tune;
+    float duration; // of the current song
+} sid_info_t;
+
+static uint32_t csid_voicemask;
+
 static inline void
 le_int16 (int16_t in, unsigned char *out) {
     char *pin = (char *)&in;
@@ -115,12 +62,6 @@ le_int16 (int16_t in, unsigned char *out) {
 #endif
 }
 
-static sidplay2 *sidplay;
-static ReSIDBuilder *resid;
-static SidTune *tune;
-static float duration; // of the current song
-static uint32_t csid_voicemask = 0;
-
 // SLDB support costs ~1M!!!
 // current hvsc sldb size is ~35k songs
 #define SLDB_MAX_SONGS 40000
@@ -137,18 +78,19 @@ static int sldb_loaded;
 static sldb_t *sldb;
 static int sldb_disable;
 
-static void sldb_load()
+static void
+sldb_load()
 {
     if (sldb_disable) {
         return;
     }
     trace ("sldb_load\n");
-    int conf_hvsc_enable = conf_get_int ("hvsc_enable", 0);
+    int conf_hvsc_enable = deadbeef->conf_get_int ("hvsc_enable", 0);
     if (sldb_loaded || !conf_hvsc_enable) {
         sldb_disable = 1;
         return;
     }
-    const char *conf_hvsc_path = conf_get_str ("hvsc_path", NULL);
+    const char *conf_hvsc_path = deadbeef->conf_get_str ("hvsc_path", NULL);
     if (!conf_hvsc_path) {
         sldb_disable = 1;
         return;
@@ -329,42 +271,53 @@ sldb_find (const uint8_t *digest) {
     return -1;
 }
 
-extern "C" int
+DB_fileinfo_t *
 csid_init (DB_playItem_t *it) {
+    DB_fileinfo_t *_info = (DB_fileinfo_t *)malloc (sizeof (sid_info_t));
+    memset (_info, 0, sizeof (sid_info_t));
+    sid_info_t *info = (sid_info_t *)_info;
+    
     // libsidplay crashes if file doesn't exist
     // so i have to check it here
     FILE *fp = fopen (it->fname, "rb");
     if (!fp ){
-        return -1;
+        return NULL;
     }
     fclose (fp);
-    sidplay = new sidplay2;
-    resid = new ReSIDBuilder ("wtf");
-    resid->create (sidplay->info ().maxsids);
+
+    info->sidplay = new sidplay2;
+    info->resid = new ReSIDBuilder ("wtf");
+    info->resid->create (info->sidplay->info ().maxsids);
 //    resid->create (1);
-    resid->filter (true);
-    resid->sampling (deadbeef->get_output ()->samplerate ());
-    duration = deadbeef->pl_get_item_duration (it);
-    tune = new SidTune (it->fname);
+    info->resid->filter (true);
+
+    int samplerate = deadbeef->get_output ()->samplerate ();
+    int bps = deadbeef->get_output ()->bitspersample ();
+
+    info->resid->sampling (samplerate);
+    info->duration = deadbeef->pl_get_item_duration (it);
+    info->tune = new SidTune (it->fname);
 
-    tune->selectSong (it->tracknum+1);
-    plugin.info.channels = tune->isStereo () ? 2 : 1;
+    info->tune->selectSong (it->tracknum+1);
     sid2_config_t conf;
-    conf = sidplay->config ();
-    conf.frequency = deadbeef->get_output ()->samplerate ();
-    conf.precision = 16;
-    conf.playback = plugin.info.channels == 2 ? sid2_stereo : sid2_mono;
-    conf.sidEmulation = resid;
+    conf = info->sidplay->config ();
+    conf.frequency = samplerate;
+    conf.precision = bps;
+    conf.playback = info->tune->isStereo () ? sid2_stereo : sid2_mono;
+    conf.sidEmulation = info->resid;
     conf.optimisation = 0;
-    sidplay->config (conf);
-    sidplay->load (tune);
-    plugin.info.bps = 16;
-    plugin.info.samplerate = conf.frequency;
-    plugin.info.readpos = 0;
+    info->sidplay->config (conf);
+    info->sidplay->load (info->tune);
 
-    int maxsids = sidplay->info ().maxsids;
+    _info->plugin = &sid_plugin;
+    _info->channels = info->tune->isStereo () ? 2 : 1;
+    _info->bps = bps;
+    _info->samplerate = conf.frequency;
+    _info->readpos = 0;
+
+    int maxsids = info->sidplay->info ().maxsids;
     for (int k = 0; k < maxsids; k++) {
-        sidemu *emu = resid->getsidemu (k);
+        sidemu *emu = info->resid->getsidemu (k);
         if (emu) {
             for (int i = 0; i < 3; i++) {
                 bool mute = csid_voicemask & (1 << i) ? true : false;
@@ -372,30 +325,32 @@ csid_init (DB_playItem_t *it) {
             }
         }
     }
-    return 0;
+    return _info;
 }
 
-extern "C" void
-csid_free (void) {
-    delete sidplay;
-    sidplay = 0;
-    delete resid;
-    resid = 0;
-    delete tune;
-    tune = 0;
+void
+csid_free (DB_fileinfo_t *_info) {
+    sid_info_t *info = (sid_info_t *)_info;
+    if (info) {
+        delete info->sidplay;
+        delete info->resid;
+        delete info->tune;
+        free (info);
+    }
 }
 
-extern "C" int
-csid_read (char *bytes, int size) {
-    if (plugin.info.readpos > duration) {
+int
+csid_read (DB_fileinfo_t *_info, char *bytes, int size) {
+    sid_info_t *info = (sid_info_t *)_info;
+    if (_info->readpos > info->duration) {
         return 0;
     }
-    int rd = sidplay->play (bytes, size/plugin.info.channels);
-    plugin.info.readpos += size/plugin.info.channels/2 / (float)plugin.info.samplerate;
+    int rd = info->sidplay->play (bytes, size/_info->channels);
+    _info->readpos += size/_info->channels/2 / (float)_info->samplerate;
 
 #if WORDS_BIGENDIAN
     // convert samples from le to be
-    int n = rd * plugin.info.channels/2;
+    int n = rd * _info->channels/2;
     int16_t *ptr = (int16_t *)bytes;
     while (n > 0) {
         int16_t out;
@@ -405,34 +360,35 @@ csid_read (char *bytes, int size) {
         n--;
     }
 #endif
-    return rd * plugin.info.channels;
+    return rd * _info->channels;
 }
 
-extern "C" int
-csid_seek (float time) {
+int
+csid_seek (DB_fileinfo_t *_info, float time) {
+    sid_info_t *info = (sid_info_t *)_info;
     float t = time;
-    if (t < plugin.info.readpos) {
+    if (t < _info->readpos) {
         // reinit
-        sidplay->load (tune);
+        info->sidplay->load (info->tune);
     }
     else {
-        t -= plugin.info.readpos;
+        t -= _info->readpos;
     }
-    resid->filter (false);
-    int samples = t * plugin.info.samplerate;
-    samples *= 2 * plugin.info.channels;
-    uint16_t buffer[4096 * plugin.info.channels];
+    info->resid->filter (false);
+    int samples = t * _info->samplerate;
+    samples *= 2 * _info->channels;
+    uint16_t buffer[2048 * _info->channels];
     while (samples > 0) {
-        int n = min (samples, 4096) * plugin.info.channels;
-        int done = sidplay->play (buffer, n);
+        int n = min (samples, 2048) * _info->channels;
+        int done = info->sidplay->play (buffer, n);
         if (done < n) {
             trace ("sid seek failure\n");
             return -1;
         }
         samples -= done;
     }
-    resid->filter (true);
-    plugin.info.readpos = time;
+    info->resid->filter (true);
+    _info->readpos = time;
 
     return 0;
 }
@@ -467,26 +423,27 @@ csid_insert (DB_playItem_t *after, const char *fname) {
     int tunes = tune->getInfo ().songs;
     uint8_t sig[16];
     unsigned char tmp[2];
-    md5_t md5;
-    md5_init (&md5);
-    md5_process (&md5, (const char *)tune->cache.get () + tune->fileOffset, tune->getInfo ().c64dataLen);
+#if 1
+    DB_md5_t md5;
+    deadbeef->md5_init (&md5);
+    deadbeef->md5_append (&md5, (const uint8_t *)tune->cache.get () + tune->fileOffset, tune->getInfo ().c64dataLen);
     le_int16 (tune->getInfo ().initAddr, tmp);
-    md5_process (&md5, tmp, 2);
+    deadbeef->md5_append (&md5, tmp, 2);
     le_int16 (tune->getInfo ().playAddr, tmp);
-    md5_process (&md5, tmp, 2);
+    deadbeef->md5_append (&md5, tmp, 2);
     le_int16 (tune->getInfo ().songs, tmp);
-    md5_process (&md5, tmp, 2);
+    deadbeef->md5_append (&md5, tmp, 2);
     for (int s = 1; s <= tunes; s++)
     {
         tune->selectSong (s);
         // songspeed is uint8_t, so no need for byteswap
-        md5_process (&md5, &tune->getInfo ().songSpeed, 1);
+        deadbeef->md5_append (&md5, &tune->getInfo ().songSpeed, 1);
     }
     if (tune->getInfo ().clockSpeed == SIDTUNE_CLOCK_NTSC) {
-        md5_process (&md5, &tune->getInfo ().clockSpeed, sizeof (tune->getInfo ().clockSpeed));
+        deadbeef->md5_append (&md5, &tune->getInfo ().clockSpeed, sizeof (tune->getInfo ().clockSpeed));
     }
-    md5_finish (&md5, sig);
-#if 0
+    deadbeef->md5_finish (&md5, sig);
+#else
     // md5 calc from libsidplay2
     MD5 myMD5;
     myMD5.append ((const char *)tune->cache.get() + tune->fileOffset, tune->getInfo ().c64dataLen);
@@ -528,7 +485,7 @@ csid_insert (DB_playItem_t *after, const char *fname) {
     for (int s = 0; s < tunes; s++) {
         if (tune->selectSong (s+1)) {
             DB_playItem_t *it = deadbeef->pl_item_alloc ();
-            it->decoder_id = deadbeef->plug_get_decoder_id (plugin.id);
+            it->decoder_id = deadbeef->plug_get_decoder_id (sid_plugin.plugin.id);
             it->fname = strdup (fname);
             it->tracknum = s;
             SidTuneInfo sidinfo;
@@ -590,18 +547,19 @@ csid_insert (DB_playItem_t *after, const char *fname) {
 }
 
 int
-csid_numvoices (void) {
+csid_numvoices (DB_fileinfo_t *_info) {
     return 3;
 }
 
 void
-csid_mutevoice (int voice, int mute) {
+csid_mutevoice (DB_fileinfo_t *_info, int voice, int mute) {
+    sid_info_t *info = (sid_info_t *)_info;
     csid_voicemask &= ~ (1<<voice);
     csid_voicemask |= ((mute ? 1 : 0) << voice);
-    if (resid) {
-        int maxsids = sidplay->info ().maxsids;
+    if (info->resid) {
+        int maxsids = info->sidplay->info ().maxsids;
         for (int k = 0; k < maxsids; k++) {
-            sidemu *emu = resid->getsidemu (k);
+            sidemu *emu = info->resid->getsidemu (k);
             if (emu) {
                 for (int i = 0; i < 3; i++) {
                     bool mute = csid_voicemask & (1 << i) ? true : false;
@@ -625,5 +583,6 @@ csid_stop (void) {
 extern "C" DB_plugin_t *
 sid_load (DB_functions_t *api) {
     deadbeef = api;
-    return DB_PLUGIN (&plugin);
+    return DB_PLUGIN (&sid_plugin);
 }
+
diff --git a/plugins/sid/csid.h b/plugins/sid/csid.h
new file mode 100644
index 00000000..8ef8ecc5
--- /dev/null
+++ b/plugins/sid/csid.h
@@ -0,0 +1,39 @@
+/*
+    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    Copyright (C) 2009-2010 Alexey Yakovenko <waker@users.sourceforge.net>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __CSID_H
+#define __CSID_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+DB_fileinfo_t *csid_init (DB_playItem_t *it);
+void csid_free (DB_fileinfo_t *);
+int csid_read (DB_fileinfo_t *, char *bytes, int size);
+int csid_seek (DB_fileinfo_t *, float time);
+DB_playItem_t *csid_insert (DB_playItem_t *after, const char *fname);
+int csid_numvoices (DB_fileinfo_t *);
+void csid_mutevoice (DB_fileinfo_t *, int voice, int mute);
+int csid_stop (void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/plugins/sid/plugin.c b/plugins/sid/plugin.c
new file mode 100644
index 00000000..8fd6854e
--- /dev/null
+++ b/plugins/sid/plugin.c
@@ -0,0 +1,54 @@
+/*
+    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    Copyright (C) 2009-2010 Alexey Yakovenko <waker@users.sourceforge.net>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "../../deadbeef.h"
+#include "csid.h"
+
+static const char *exts[] = { "sid",NULL };
+const char *filetypes[] = { "SID", NULL };
+
+static const char settings_dlg[] =
+    "property \"Enable HVSC\" checkbox hvsc_enable 0;\n"
+    "property \"HVSC path\" file hvsc_path \"\";\n"
+;
+
+// define plugin interface
+DB_decoder_t sid_plugin = {
+    DB_PLUGIN_SET_API_VERSION
+    .plugin.type = DB_PLUGIN_DECODER,
+    .plugin.version_major = 0,
+    .plugin.version_minor = 1,
+    .plugin.name = "SID decoder",
+    .plugin.descr = "SID player based on libsidplay2",
+    .plugin.author = "Alexey Yakovenko",
+    .plugin.email = "waker@users.sourceforge.net",
+    .plugin.website = "http://deadbeef.sf.net",
+    .plugin.start = NULL,
+    .plugin.stop = csid_stop,
+    .plugin.configdialog = settings_dlg,
+    .plugin.id = "stdsid",
+    .init = csid_init,
+    .free = csid_free,
+    .read_int16 = csid_read,
+    .seek = csid_seek,
+    .seek_sample = NULL,
+    .insert = csid_insert,
+    .numvoices = csid_numvoices,
+    .mutevoice = csid_mutevoice,
+    .exts = exts,
+    .filetypes = filetypes,
+};
diff --git a/sid/sidplay-libs-2.1.0/Makefile.am b/plugins/sid/sidplay-libs/Makefile.am
index d6bdcf94..7f4ea0b7 100644
--- a/sid/sidplay-libs-2.1.0/Makefile.am
+++ b/plugins/sid/sidplay-libs/Makefile.am
@@ -1,13 +1,13 @@
 noinst_LIBRARIES = libsidplay2.a
 
-sidpath=@top_srcdir@/sid/sidplay-libs-2.1.0
+sidpath=@top_srcdir@/plugins/sid/sidplay-libs
 
 EXTRA_DIST = \
 	$(sidpath)/libsidutils/README $(sidpath)/libsidplay/README $(sidpath)/resid/README\
 	$(sidpath)/libsidutils/COPYING $(sidpath)/libsidplay/COPYING $(sidpath)/resid/COPYING\
 	$(sidpath)/libsidutils/AUTHORS $(sidpath)/libsidplay/AUTHORS $(sidpath)/resid/AUTHORS
 
-AM_CPPFLAGS = $(CXXFLAGS) -DHAVEUNIX -DHAVE_STRNCASECMP -DHAVE_STRCASECMP -I$(sidpath)/libsidplay -I$(sidpath)/libsidplay/include -I$(sidpath)/libsidplay/include/sidplay -I$(sidpath)/libsidutils/include/sidplay/utils -I$(sidpath)/builders/resid-builder/include/sidplay/builders -I$(sidpath)/builders/resid-builder/include
+AM_CPPFLAGS = $(INSANE_CXXFLAGS) -DHAVE_UNIX -I$(sidpath)/unix -I$(sidpath)/libsidplay -I$(sidpath)/libsidplay/include -I$(sidpath)/libsidplay/include/sidplay -I$(sidpath)/libsidutils/include/sidplay/utils -I$(sidpath)/builders/resid-builder/include/sidplay/builders -I$(sidpath)/builders/resid-builder/include -fPIC
 
 libsidplay2_a_SOURCES = \
 libsidplay/src/mixer.cpp\
@@ -105,29 +105,3 @@ libsidplay/src/mos6510/cycle_based/sid6510c.i\
 libsidplay/src/kernal.bin\
 libsidplay/src/psiddrv.bin\
 libsidplay/src/poweron.bin
-
-
-#libsidutils/win/VC/config.h
-#libsidutils/src/ini/keys.h
-#libsidutils/src/ini/list.h
-#libsidutils/src/ini/ini.h
-#libsidutils/src/ini/headings.h
-#libsidutils/src/MD5/MD5_Defs.h
-#libsidutils/src/MD5/MD5.h
-#libsidutils/src/smm0.h
-#libsidutils/include/sidplay/utils/SidTuneMod.h
-#libsidutils/include/sidplay/utils/libini.h
-#libsidutils/include/sidplay/utils/SidFilter.h
-#libsidutils/include/sidplay/utils/SidDatabase.h
-#libsidutils/include/sidplay/utils/SidUsage.h
-#libsidutils/include/config.h
-#libsidutils/src/SidDatabase.cpp
-#libsidutils/src/SidFilter.cpp
-#libsidutils/src/SidTuneMod.cpp
-#libsidutils/src/MD5/MD5.cpp
-#libsidutils/src/SidUsage.cpp
-#libsidutils/src/ini/ini.cpp
-#libsidutils/src/ini/headings.i
-#libsidutils/src/ini/list.i
-#libsidutils/src/ini/keys.i
-#libsidutils/src/ini/types.i
diff --git a/sid/sidplay-libs-2.1.0/aclocal.m4 b/plugins/sid/sidplay-libs/aclocal.m4
index 1821b632..1821b632 100644
--- a/sid/sidplay-libs-2.1.0/aclocal.m4
+++ b/plugins/sid/sidplay-libs/aclocal.m4
diff --git a/sid/sidplay-libs-2.1.0/builders/Makefile.am b/plugins/sid/sidplay-libs/builders/Makefile.am
index 5ba945a7..5ba945a7 100644
--- a/sid/sidplay-libs-2.1.0/builders/Makefile.am
+++ b/plugins/sid/sidplay-libs/builders/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/builders/Makefile.in b/plugins/sid/sidplay-libs/builders/Makefile.in
index d5047fcf..d5047fcf 100644
--- a/sid/sidplay-libs-2.1.0/builders/Makefile.in
+++ b/plugins/sid/sidplay-libs/builders/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/Makefile.am b/plugins/sid/sidplay-libs/builders/resid-builder/Makefile.am
index bc2fe8f8..bc2fe8f8 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/Makefile.am
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/Makefile.in b/plugins/sid/sidplay-libs/builders/resid-builder/Makefile.in
index a77bf557..a77bf557 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/Makefile.in
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/acinclude.m4 b/plugins/sid/sidplay-libs/builders/resid-builder/acinclude.m4
index 5fcfce10..5fcfce10 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/acinclude.m4
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/acinclude.m4
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/aclocal.m4 b/plugins/sid/sidplay-libs/builders/resid-builder/aclocal.m4
index 225a39e4..225a39e4 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/aclocal.m4
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/aclocal.m4
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/configure b/plugins/sid/sidplay-libs/builders/resid-builder/configure
index 974f641c..974f641c 100755
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/configure
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/configure
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/configure.ac b/plugins/sid/sidplay-libs/builders/resid-builder/configure.ac
index 79fc8301..79fc8301 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/configure.ac
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/configure.ac
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/include/Makefile.am b/plugins/sid/sidplay-libs/builders/resid-builder/include/Makefile.am
index 1c58b3b9..1c58b3b9 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/include/Makefile.am
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/include/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/include/Makefile.in b/plugins/sid/sidplay-libs/builders/resid-builder/include/Makefile.in
index 0d13e311..0d13e311 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/include/Makefile.in
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/include/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/include/config.h b/plugins/sid/sidplay-libs/builders/resid-builder/include/config.h
index ebe9c82f..ebe9c82f 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/include/config.h
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/include/config.h
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/Makefile.am b/plugins/sid/sidplay-libs/builders/resid-builder/include/sidplay/Makefile.am
index 82b48e43..82b48e43 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/Makefile.am
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/include/sidplay/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/Makefile.in b/plugins/sid/sidplay-libs/builders/resid-builder/include/sidplay/Makefile.in
index 49d409e8..49d409e8 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/Makefile.in
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/include/sidplay/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/builders/Makefile.am b/plugins/sid/sidplay-libs/builders/resid-builder/include/sidplay/builders/Makefile.am
index 4a35e9a7..4a35e9a7 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/builders/Makefile.am
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/include/sidplay/builders/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/builders/Makefile.in b/plugins/sid/sidplay-libs/builders/resid-builder/include/sidplay/builders/Makefile.in
index 17314249..17314249 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/builders/Makefile.in
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/include/sidplay/builders/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/builders/resid.h b/plugins/sid/sidplay-libs/builders/resid-builder/include/sidplay/builders/resid.h
index aa6ccffa..aa6ccffa 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/builders/resid.h
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/include/sidplay/builders/resid.h
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/src/Makefile.am b/plugins/sid/sidplay-libs/builders/resid-builder/src/Makefile.am
index 74272c4f..74272c4f 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/src/Makefile.am
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/src/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/src/Makefile.in b/plugins/sid/sidplay-libs/builders/resid-builder/src/Makefile.in
index 9debbaf3..9debbaf3 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/src/Makefile.in
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/src/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/src/resid-builder.cpp b/plugins/sid/sidplay-libs/builders/resid-builder/src/resid-builder.cpp
index 4c7650f6..4c7650f6 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/src/resid-builder.cpp
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/src/resid-builder.cpp
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/src/resid-emu.h b/plugins/sid/sidplay-libs/builders/resid-builder/src/resid-emu.h
index fc4e25bc..fc4e25bc 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/src/resid-emu.h
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/src/resid-emu.h
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/src/resid.cpp b/plugins/sid/sidplay-libs/builders/resid-builder/src/resid.cpp
index 41cbdc39..41cbdc39 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/src/resid.cpp
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/src/resid.cpp
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/Makefile.am b/plugins/sid/sidplay-libs/builders/resid-builder/unix/Makefile.am
index dcb940b2..dcb940b2 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/Makefile.am
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/unix/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/Makefile.in b/plugins/sid/sidplay-libs/builders/resid-builder/unix/Makefile.in
index d655acf8..d655acf8 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/Makefile.in
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/unix/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/config.guess b/plugins/sid/sidplay-libs/builders/resid-builder/unix/config.guess
index f1657bbc..f1657bbc 100755
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/config.guess
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/unix/config.guess
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/config.h.in b/plugins/sid/sidplay-libs/builders/resid-builder/unix/config.h.in
index 8c158a66..8c158a66 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/config.h.in
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/unix/config.h.in
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/config.sub b/plugins/sid/sidplay-libs/builders/resid-builder/unix/config.sub
index 1dea9b79..1dea9b79 100755
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/config.sub
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/unix/config.sub
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/depcomp b/plugins/sid/sidplay-libs/builders/resid-builder/unix/depcomp
index 807b991f..807b991f 100755
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/depcomp
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/unix/depcomp
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/install-sh b/plugins/sid/sidplay-libs/builders/resid-builder/unix/install-sh
index 11870f1b..11870f1b 100755
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/install-sh
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/unix/install-sh
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/ltmain.sh b/plugins/sid/sidplay-libs/builders/resid-builder/unix/ltmain.sh
index c4538260..c4538260 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/ltmain.sh
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/unix/ltmain.sh
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/missing b/plugins/sid/sidplay-libs/builders/resid-builder/unix/missing
index 6a37006e..6a37006e 100755
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/missing
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/unix/missing
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/mkinstalldirs b/plugins/sid/sidplay-libs/builders/resid-builder/unix/mkinstalldirs
index d2d5f21b..d2d5f21b 100755
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/mkinstalldirs
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/unix/mkinstalldirs
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/my_macros.m4 b/plugins/sid/sidplay-libs/builders/resid-builder/unix/my_macros.m4
index bd607f73..bd607f73 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/my_macros.m4
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/unix/my_macros.m4
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/sidplay2.m4 b/plugins/sid/sidplay-libs/builders/resid-builder/unix/sidplay2.m4
index 123575c6..123575c6 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/sidplay2.m4
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/unix/sidplay2.m4
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/win/VC/config.h b/plugins/sid/sidplay-libs/builders/resid-builder/win/VC/config.h
index 87d75e5c..87d75e5c 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/win/VC/config.h
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/win/VC/config.h
diff --git a/sid/sidplay-libs-2.1.0/builders/resid-builder/win/VC/resid_builder.dsp b/plugins/sid/sidplay-libs/builders/resid-builder/win/VC/resid_builder.dsp
index 7ee15fad..7ee15fad 100644
--- a/sid/sidplay-libs-2.1.0/builders/resid-builder/win/VC/resid_builder.dsp
+++ b/plugins/sid/sidplay-libs/builders/resid-builder/win/VC/resid_builder.dsp
diff --git a/sid/sidplay-libs-2.1.0/configure b/plugins/sid/sidplay-libs/configure
index 72305412..72305412 100755
--- a/sid/sidplay-libs-2.1.0/configure
+++ b/plugins/sid/sidplay-libs/configure
diff --git a/sid/sidplay-libs-2.1.0/configure.ac b/plugins/sid/sidplay-libs/configure.ac
index e85773a6..e85773a6 100644
--- a/sid/sidplay-libs-2.1.0/configure.ac
+++ b/plugins/sid/sidplay-libs/configure.ac
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/AUTHORS b/plugins/sid/sidplay-libs/libsidplay/AUTHORS
index e2fbdfba..e2fbdfba 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/AUTHORS
+++ b/plugins/sid/sidplay-libs/libsidplay/AUTHORS
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/COPYING b/plugins/sid/sidplay-libs/libsidplay/COPYING
index eeb586b3..eeb586b3 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/COPYING
+++ b/plugins/sid/sidplay-libs/libsidplay/COPYING
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/ChangeLog b/plugins/sid/sidplay-libs/libsidplay/ChangeLog
index 7a11e01a..7a11e01a 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/ChangeLog
+++ b/plugins/sid/sidplay-libs/libsidplay/ChangeLog
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/INSTALL b/plugins/sid/sidplay-libs/libsidplay/INSTALL
index 02a4a074..02a4a074 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/INSTALL
+++ b/plugins/sid/sidplay-libs/libsidplay/INSTALL
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/Makefile.am b/plugins/sid/sidplay-libs/libsidplay/Makefile.am
index bc2fe8f8..bc2fe8f8 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/Makefile.am
+++ b/plugins/sid/sidplay-libs/libsidplay/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/Makefile.in b/plugins/sid/sidplay-libs/libsidplay/Makefile.in
index ad6c5db8..ad6c5db8 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/Makefile.in
+++ b/plugins/sid/sidplay-libs/libsidplay/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/README b/plugins/sid/sidplay-libs/libsidplay/README
index afea8f07..afea8f07 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/README
+++ b/plugins/sid/sidplay-libs/libsidplay/README
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/TODO b/plugins/sid/sidplay-libs/libsidplay/TODO
index 6de32a74..6de32a74 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/TODO
+++ b/plugins/sid/sidplay-libs/libsidplay/TODO
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/aclocal.m4 b/plugins/sid/sidplay-libs/libsidplay/aclocal.m4
index c5b8eaad..c5b8eaad 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/aclocal.m4
+++ b/plugins/sid/sidplay-libs/libsidplay/aclocal.m4
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/configure b/plugins/sid/sidplay-libs/libsidplay/configure
index 631d3a38..631d3a38 100755
--- a/sid/sidplay-libs-2.1.0/libsidplay/configure
+++ b/plugins/sid/sidplay-libs/libsidplay/configure
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/configure.ac b/plugins/sid/sidplay-libs/libsidplay/configure.ac
index 0667bf55..0667bf55 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/configure.ac
+++ b/plugins/sid/sidplay-libs/libsidplay/configure.ac
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/Makefile.am b/plugins/sid/sidplay-libs/libsidplay/include/Makefile.am
index 9ccc23eb..9ccc23eb 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/Makefile.am
+++ b/plugins/sid/sidplay-libs/libsidplay/include/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/Makefile.in b/plugins/sid/sidplay-libs/libsidplay/include/Makefile.in
index 16cc3cde..16cc3cde 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/Makefile.in
+++ b/plugins/sid/sidplay-libs/libsidplay/include/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/config.h b/plugins/sid/sidplay-libs/libsidplay/include/config.h
index 2e5c8ba4..2e5c8ba4 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/config.h
+++ b/plugins/sid/sidplay-libs/libsidplay/include/config.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/sidenv.h b/plugins/sid/sidplay-libs/libsidplay/include/sidenv.h
index 0f02e31c..0f02e31c 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/sidenv.h
+++ b/plugins/sid/sidplay-libs/libsidplay/include/sidenv.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/Buffer.h b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/Buffer.h
index 8e766e1c..8e766e1c 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/Buffer.h
+++ b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/Buffer.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/Makefile.am b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/Makefile.am
index adb87b6a..adb87b6a 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/Makefile.am
+++ b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/Makefile.in b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/Makefile.in
index f19799ca..f19799ca 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/Makefile.in
+++ b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/SidTune.h b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/SidTune.h
index f544afb6..f544afb6 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/SidTune.h
+++ b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/SidTune.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/SmartPtr.h b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/SmartPtr.h
index 0cc7c046..0cc7c046 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/SmartPtr.h
+++ b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/SmartPtr.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/c64env.h b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/c64env.h
index 044dd0d0..044dd0d0 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/c64env.h
+++ b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/c64env.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/component.h b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/component.h
index ee8a76c1..ee8a76c1 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/component.h
+++ b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/component.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/event.h b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/event.h
index b89af24e..b89af24e 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/event.h
+++ b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/event.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sid2types.h b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sid2types.h
index 55cbe75c..55cbe75c 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sid2types.h
+++ b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sid2types.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidbuilder.h b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidbuilder.h
index 8dde0548..8dde0548 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidbuilder.h
+++ b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidbuilder.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidconfig.h b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidconfig.h
index f158dc9a..f158dc9a 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidconfig.h
+++ b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidconfig.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidendian.h b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h
index 9fa8582d..9fa8582d 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidendian.h
+++ b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidint.h b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidint.h
index 7f26ccea..7f26ccea 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidint.h
+++ b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidint.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidplay2.h b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidplay2.h
index ccb54bca..ccb54bca 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidplay2.h
+++ b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidplay2.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidtypes.h b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidtypes.h
index 788c21ab..788c21ab 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidtypes.h
+++ b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidtypes.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidusage.h b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidusage.h
index 7d35e676..7d35e676 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidusage.h
+++ b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidusage.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/Makefile.am b/plugins/sid/sidplay-libs/libsidplay/src/Makefile.am
index 8c586b8b..8c586b8b 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/Makefile.am
+++ b/plugins/sid/sidplay-libs/libsidplay/src/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/Makefile.in b/plugins/sid/sidplay-libs/libsidplay/src/Makefile.in
index 5475c200..5475c200 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/Makefile.in
+++ b/plugins/sid/sidplay-libs/libsidplay/src/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/c64/Makefile.am b/plugins/sid/sidplay-libs/libsidplay/src/c64/Makefile.am
index 94d8e182..94d8e182 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/c64/Makefile.am
+++ b/plugins/sid/sidplay-libs/libsidplay/src/c64/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/c64/Makefile.in b/plugins/sid/sidplay-libs/libsidplay/src/c64/Makefile.in
index a9a93154..a9a93154 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/c64/Makefile.in
+++ b/plugins/sid/sidplay-libs/libsidplay/src/c64/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/c64/c64cia.h b/plugins/sid/sidplay-libs/libsidplay/src/c64/c64cia.h
index b9626405..b9626405 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/c64/c64cia.h
+++ b/plugins/sid/sidplay-libs/libsidplay/src/c64/c64cia.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/c64/c64vic.h b/plugins/sid/sidplay-libs/libsidplay/src/c64/c64vic.h
index d9b2f934..d9b2f934 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/c64/c64vic.h
+++ b/plugins/sid/sidplay-libs/libsidplay/src/c64/c64vic.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/c64/c64xsid.h b/plugins/sid/sidplay-libs/libsidplay/src/c64/c64xsid.h
index e8385adb..e8385adb 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/c64/c64xsid.h
+++ b/plugins/sid/sidplay-libs/libsidplay/src/c64/c64xsid.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/config.cpp b/plugins/sid/sidplay-libs/libsidplay/src/config.cpp
index 0b4a71da..0b4a71da 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/config.cpp
+++ b/plugins/sid/sidplay-libs/libsidplay/src/config.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/event.cpp b/plugins/sid/sidplay-libs/libsidplay/src/event.cpp
index ced11c38..ced11c38 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/event.cpp
+++ b/plugins/sid/sidplay-libs/libsidplay/src/event.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/kernal.bin b/plugins/sid/sidplay-libs/libsidplay/src/kernal.bin
index 301badb1..301badb1 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/kernal.bin
+++ b/plugins/sid/sidplay-libs/libsidplay/src/kernal.bin
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/mixer.cpp b/plugins/sid/sidplay-libs/libsidplay/src/mixer.cpp
index c7703dc1..c7703dc1 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/mixer.cpp
+++ b/plugins/sid/sidplay-libs/libsidplay/src/mixer.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/Makefile.am b/plugins/sid/sidplay-libs/libsidplay/src/mos6510/Makefile.am
index 27acc569..27acc569 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/Makefile.am
+++ b/plugins/sid/sidplay-libs/libsidplay/src/mos6510/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/Makefile.in b/plugins/sid/sidplay-libs/libsidplay/src/mos6510/Makefile.in
index 9af93a74..9af93a74 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/Makefile.in
+++ b/plugins/sid/sidplay-libs/libsidplay/src/mos6510/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/conf6510.h b/plugins/sid/sidplay-libs/libsidplay/src/mos6510/conf6510.h
index 6a1ea0bd..6a1ea0bd 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/conf6510.h
+++ b/plugins/sid/sidplay-libs/libsidplay/src/mos6510/conf6510.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/mos6510c.h b/plugins/sid/sidplay-libs/libsidplay/src/mos6510/cycle_based/mos6510c.h
index 9a046d2e..9a046d2e 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/mos6510c.h
+++ b/plugins/sid/sidplay-libs/libsidplay/src/mos6510/cycle_based/mos6510c.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/mos6510c.i b/plugins/sid/sidplay-libs/libsidplay/src/mos6510/cycle_based/mos6510c.i
index 78d57ba6..78d57ba6 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/mos6510c.i
+++ b/plugins/sid/sidplay-libs/libsidplay/src/mos6510/cycle_based/mos6510c.i
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/sid6510c.h b/plugins/sid/sidplay-libs/libsidplay/src/mos6510/cycle_based/sid6510c.h
index 49d96dd6..49d96dd6 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/sid6510c.h
+++ b/plugins/sid/sidplay-libs/libsidplay/src/mos6510/cycle_based/sid6510c.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/sid6510c.i b/plugins/sid/sidplay-libs/libsidplay/src/mos6510/cycle_based/sid6510c.i
index bc573d3b..bc573d3b 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/sid6510c.i
+++ b/plugins/sid/sidplay-libs/libsidplay/src/mos6510/cycle_based/sid6510c.i
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/mos6510.cpp b/plugins/sid/sidplay-libs/libsidplay/src/mos6510/mos6510.cpp
index 74b09c95..74b09c95 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/mos6510.cpp
+++ b/plugins/sid/sidplay-libs/libsidplay/src/mos6510/mos6510.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/mos6510.h b/plugins/sid/sidplay-libs/libsidplay/src/mos6510/mos6510.h
index e7ad1a3f..e7ad1a3f 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/mos6510.h
+++ b/plugins/sid/sidplay-libs/libsidplay/src/mos6510/mos6510.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/opcodes.h b/plugins/sid/sidplay-libs/libsidplay/src/mos6510/opcodes.h
index e4d44acd..e4d44acd 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/opcodes.h
+++ b/plugins/sid/sidplay-libs/libsidplay/src/mos6510/opcodes.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6526/Makefile.am b/plugins/sid/sidplay-libs/libsidplay/src/mos6526/Makefile.am
index e5029df5..e5029df5 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6526/Makefile.am
+++ b/plugins/sid/sidplay-libs/libsidplay/src/mos6526/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6526/Makefile.in b/plugins/sid/sidplay-libs/libsidplay/src/mos6526/Makefile.in
index 8f1667ec..8f1667ec 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6526/Makefile.in
+++ b/plugins/sid/sidplay-libs/libsidplay/src/mos6526/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6526/mos6526.cpp b/plugins/sid/sidplay-libs/libsidplay/src/mos6526/mos6526.cpp
index 32b6f1f2..32b6f1f2 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6526/mos6526.cpp
+++ b/plugins/sid/sidplay-libs/libsidplay/src/mos6526/mos6526.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6526/mos6526.h b/plugins/sid/sidplay-libs/libsidplay/src/mos6526/mos6526.h
index 5fa11bcf..5fa11bcf 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/mos6526/mos6526.h
+++ b/plugins/sid/sidplay-libs/libsidplay/src/mos6526/mos6526.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/mos656x/Makefile.am b/plugins/sid/sidplay-libs/libsidplay/src/mos656x/Makefile.am
index 7a228bca..7a228bca 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/mos656x/Makefile.am
+++ b/plugins/sid/sidplay-libs/libsidplay/src/mos656x/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/mos656x/Makefile.in b/plugins/sid/sidplay-libs/libsidplay/src/mos656x/Makefile.in
index eeeea606..eeeea606 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/mos656x/Makefile.in
+++ b/plugins/sid/sidplay-libs/libsidplay/src/mos656x/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/mos656x/mos656x.cpp b/plugins/sid/sidplay-libs/libsidplay/src/mos656x/mos656x.cpp
index a7e03642..a7e03642 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/mos656x/mos656x.cpp
+++ b/plugins/sid/sidplay-libs/libsidplay/src/mos656x/mos656x.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/mos656x/mos656x.h b/plugins/sid/sidplay-libs/libsidplay/src/mos656x/mos656x.h
index 7cf9867e..7cf9867e 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/mos656x/mos656x.h
+++ b/plugins/sid/sidplay-libs/libsidplay/src/mos656x/mos656x.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/nullsid.h b/plugins/sid/sidplay-libs/libsidplay/src/nullsid.h
index 7865d9e9..7865d9e9 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/nullsid.h
+++ b/plugins/sid/sidplay-libs/libsidplay/src/nullsid.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/player.cpp b/plugins/sid/sidplay-libs/libsidplay/src/player.cpp
index 38b612c0..38b612c0 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/player.cpp
+++ b/plugins/sid/sidplay-libs/libsidplay/src/player.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/player.h b/plugins/sid/sidplay-libs/libsidplay/src/player.h
index 7c0a024c..7c0a024c 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/player.h
+++ b/plugins/sid/sidplay-libs/libsidplay/src/player.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/poweron.bin b/plugins/sid/sidplay-libs/libsidplay/src/poweron.bin
index b5850151..b5850151 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/poweron.bin
+++ b/plugins/sid/sidplay-libs/libsidplay/src/poweron.bin
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/psiddrv.a65 b/plugins/sid/sidplay-libs/libsidplay/src/psiddrv.a65
index 8d269662..8d269662 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/psiddrv.a65
+++ b/plugins/sid/sidplay-libs/libsidplay/src/psiddrv.a65
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/psiddrv.bin b/plugins/sid/sidplay-libs/libsidplay/src/psiddrv.bin
index a7e8ae05..a7e8ae05 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/psiddrv.bin
+++ b/plugins/sid/sidplay-libs/libsidplay/src/psiddrv.bin
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/psiddrv.cpp b/plugins/sid/sidplay-libs/libsidplay/src/psiddrv.cpp
index 5a8cf894..5a8cf894 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/psiddrv.cpp
+++ b/plugins/sid/sidplay-libs/libsidplay/src/psiddrv.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/reloc65.c b/plugins/sid/sidplay-libs/libsidplay/src/reloc65.c
index 3c732a39..3c732a39 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/reloc65.c
+++ b/plugins/sid/sidplay-libs/libsidplay/src/reloc65.c
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/sid6526/Makefile.am b/plugins/sid/sidplay-libs/libsidplay/src/sid6526/Makefile.am
index 8b282820..8b282820 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/sid6526/Makefile.am
+++ b/plugins/sid/sidplay-libs/libsidplay/src/sid6526/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/sid6526/Makefile.in b/plugins/sid/sidplay-libs/libsidplay/src/sid6526/Makefile.in
index ef5bdb03..ef5bdb03 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/sid6526/Makefile.in
+++ b/plugins/sid/sidplay-libs/libsidplay/src/sid6526/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/sid6526/sid6526.cpp b/plugins/sid/sidplay-libs/libsidplay/src/sid6526/sid6526.cpp
index 8737f7f0..8737f7f0 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/sid6526/sid6526.cpp
+++ b/plugins/sid/sidplay-libs/libsidplay/src/sid6526/sid6526.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/sid6526/sid6526.h b/plugins/sid/sidplay-libs/libsidplay/src/sid6526/sid6526.h
index d92c230c..d92c230c 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/sid6526/sid6526.h
+++ b/plugins/sid/sidplay-libs/libsidplay/src/sid6526/sid6526.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/sidplay2.cpp b/plugins/sid/sidplay-libs/libsidplay/src/sidplay2.cpp
index e3535ddb..e3535ddb 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/sidplay2.cpp
+++ b/plugins/sid/sidplay-libs/libsidplay/src/sidplay2.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/IconInfo.cpp b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp
index 30df20b4..30df20b4 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/IconInfo.cpp
+++ b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/InfoFile.cpp b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp
index 0c03b23c..0c03b23c 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/InfoFile.cpp
+++ b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/MUS.cpp b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/MUS.cpp
index 16ea8fe9..16ea8fe9 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/MUS.cpp
+++ b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/MUS.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/Makefile.am b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/Makefile.am
index e1c06822..e1c06822 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/Makefile.am
+++ b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/Makefile.in b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/Makefile.in
index bb5a7c27..bb5a7c27 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/Makefile.in
+++ b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/PP20.cpp b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/PP20.cpp
index 8bec5cfe..8bec5cfe 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/PP20.cpp
+++ b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/PP20.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/PP20.h b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/PP20.h
index 74e7f5f7..74e7f5f7 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/PP20.h
+++ b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/PP20.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/PP20_Defs.h b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/PP20_Defs.h
index 9e3b345b..9e3b345b 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/PP20_Defs.h
+++ b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/PP20_Defs.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/PSID.cpp b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/PSID.cpp
index 0cc96969..0cc96969 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/PSID.cpp
+++ b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/PSID.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTune.cpp b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/SidTune.cpp
index 29638775..29638775 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTune.cpp
+++ b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/SidTune.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTuneCfg.h b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/SidTuneCfg.h
index 088c906e..088c906e 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTuneCfg.h
+++ b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/SidTuneCfg.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTuneTools.cpp b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp
index 450795b9..450795b9 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTuneTools.cpp
+++ b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTuneTools.h b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/SidTuneTools.h
index 5a06046b..5a06046b 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTuneTools.h
+++ b/plugins/sid/sidplay-libs/libsidplay/src/sidtune/SidTuneTools.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/xsid/Makefile.am b/plugins/sid/sidplay-libs/libsidplay/src/xsid/Makefile.am
index 4c7caf6a..4c7caf6a 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/xsid/Makefile.am
+++ b/plugins/sid/sidplay-libs/libsidplay/src/xsid/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/xsid/Makefile.in b/plugins/sid/sidplay-libs/libsidplay/src/xsid/Makefile.in
index aafad807..aafad807 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/xsid/Makefile.in
+++ b/plugins/sid/sidplay-libs/libsidplay/src/xsid/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/xsid/xsid.cpp b/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp
index 29b5c909..29b5c909 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/xsid/xsid.cpp
+++ b/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/src/xsid/xsid.h b/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h
index 98171d73..98171d73 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/src/xsid/xsid.h
+++ b/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/unix/Makefile.am b/plugins/sid/sidplay-libs/libsidplay/unix/Makefile.am
index 804c3d38..804c3d38 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/unix/Makefile.am
+++ b/plugins/sid/sidplay-libs/libsidplay/unix/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/unix/Makefile.in b/plugins/sid/sidplay-libs/libsidplay/unix/Makefile.in
index 6102c2f7..6102c2f7 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/unix/Makefile.in
+++ b/plugins/sid/sidplay-libs/libsidplay/unix/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/unix/ac_compile_check_sizeof.m4 b/plugins/sid/sidplay-libs/libsidplay/unix/ac_compile_check_sizeof.m4
index 8ada30a5..8ada30a5 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/unix/ac_compile_check_sizeof.m4
+++ b/plugins/sid/sidplay-libs/libsidplay/unix/ac_compile_check_sizeof.m4
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/unix/ac_create_stdint_h.m4 b/plugins/sid/sidplay-libs/libsidplay/unix/ac_create_stdint_h.m4
index 0e807324..0e807324 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/unix/ac_create_stdint_h.m4
+++ b/plugins/sid/sidplay-libs/libsidplay/unix/ac_create_stdint_h.m4
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/unix/config.guess b/plugins/sid/sidplay-libs/libsidplay/unix/config.guess
index f1657bbc..f1657bbc 100755
--- a/sid/sidplay-libs-2.1.0/libsidplay/unix/config.guess
+++ b/plugins/sid/sidplay-libs/libsidplay/unix/config.guess
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/unix/config.h.in b/plugins/sid/sidplay-libs/libsidplay/unix/config.h.in
index 1f42ded5..1f42ded5 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/unix/config.h.in
+++ b/plugins/sid/sidplay-libs/libsidplay/unix/config.h.in
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/unix/config.sub b/plugins/sid/sidplay-libs/libsidplay/unix/config.sub
index 1dea9b79..1dea9b79 100755
--- a/sid/sidplay-libs-2.1.0/libsidplay/unix/config.sub
+++ b/plugins/sid/sidplay-libs/libsidplay/unix/config.sub
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/unix/depcomp b/plugins/sid/sidplay-libs/libsidplay/unix/depcomp
index 807b991f..807b991f 100755
--- a/sid/sidplay-libs-2.1.0/libsidplay/unix/depcomp
+++ b/plugins/sid/sidplay-libs/libsidplay/unix/depcomp
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/unix/install-sh b/plugins/sid/sidplay-libs/libsidplay/unix/install-sh
index 11870f1b..11870f1b 100755
--- a/sid/sidplay-libs-2.1.0/libsidplay/unix/install-sh
+++ b/plugins/sid/sidplay-libs/libsidplay/unix/install-sh
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/unix/libsidplay2.pc.in b/plugins/sid/sidplay-libs/libsidplay/unix/libsidplay2.pc.in
index 33596988..33596988 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/unix/libsidplay2.pc.in
+++ b/plugins/sid/sidplay-libs/libsidplay/unix/libsidplay2.pc.in
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/unix/libsidplay2.spec b/plugins/sid/sidplay-libs/libsidplay/unix/libsidplay2.spec
index 7f6859f4..7f6859f4 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/unix/libsidplay2.spec
+++ b/plugins/sid/sidplay-libs/libsidplay/unix/libsidplay2.spec
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/unix/libsidplay2.spec.in b/plugins/sid/sidplay-libs/libsidplay/unix/libsidplay2.spec.in
index 518c9973..518c9973 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/unix/libsidplay2.spec.in
+++ b/plugins/sid/sidplay-libs/libsidplay/unix/libsidplay2.spec.in
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/unix/ltmain.sh b/plugins/sid/sidplay-libs/libsidplay/unix/ltmain.sh
index c4538260..c4538260 100755
--- a/sid/sidplay-libs-2.1.0/libsidplay/unix/ltmain.sh
+++ b/plugins/sid/sidplay-libs/libsidplay/unix/ltmain.sh
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/unix/missing b/plugins/sid/sidplay-libs/libsidplay/unix/missing
index 6a37006e..6a37006e 100755
--- a/sid/sidplay-libs-2.1.0/libsidplay/unix/missing
+++ b/plugins/sid/sidplay-libs/libsidplay/unix/missing
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/unix/mkinstalldirs b/plugins/sid/sidplay-libs/libsidplay/unix/mkinstalldirs
index e6826388..e6826388 100755
--- a/sid/sidplay-libs-2.1.0/libsidplay/unix/mkinstalldirs
+++ b/plugins/sid/sidplay-libs/libsidplay/unix/mkinstalldirs
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/unix/my_macros.m4 b/plugins/sid/sidplay-libs/libsidplay/unix/my_macros.m4
index bd607f73..bd607f73 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/unix/my_macros.m4
+++ b/plugins/sid/sidplay-libs/libsidplay/unix/my_macros.m4
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/unix/sidconfig.h b/plugins/sid/sidplay-libs/libsidplay/unix/sidconfig.h
index 6a111853..6a111853 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/unix/sidconfig.h
+++ b/plugins/sid/sidplay-libs/libsidplay/unix/sidconfig.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/unix/sidconfig.h.in b/plugins/sid/sidplay-libs/libsidplay/unix/sidconfig.h.in
index b9c82441..b9c82441 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/unix/sidconfig.h.in
+++ b/plugins/sid/sidplay-libs/libsidplay/unix/sidconfig.h.in
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/unix/sidint.h b/plugins/sid/sidplay-libs/libsidplay/unix/sidint.h
index 9110ca49..9110ca49 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/unix/sidint.h
+++ b/plugins/sid/sidplay-libs/libsidplay/unix/sidint.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/win/VC/config.h b/plugins/sid/sidplay-libs/libsidplay/win/VC/config.h
index 553737ed..553737ed 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/win/VC/config.h
+++ b/plugins/sid/sidplay-libs/libsidplay/win/VC/config.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/win/VC/libsidplay.dsp b/plugins/sid/sidplay-libs/libsidplay/win/VC/libsidplay.dsp
index 7722eb4c..7722eb4c 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/win/VC/libsidplay.dsp
+++ b/plugins/sid/sidplay-libs/libsidplay/win/VC/libsidplay.dsp
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/win/VC/sidconfig.h b/plugins/sid/sidplay-libs/libsidplay/win/VC/sidconfig.h
index 024aeeac..024aeeac 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/win/VC/sidconfig.h
+++ b/plugins/sid/sidplay-libs/libsidplay/win/VC/sidconfig.h
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/win/VC/sidint.h b/plugins/sid/sidplay-libs/libsidplay/win/VC/sidint.h
index b0776d16..b0776d16 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/win/VC/sidint.h
+++ b/plugins/sid/sidplay-libs/libsidplay/win/VC/sidint.h
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/AUTHORS b/plugins/sid/sidplay-libs/libsidutils/AUTHORS
index 86de71c6..86de71c6 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/AUTHORS
+++ b/plugins/sid/sidplay-libs/libsidutils/AUTHORS
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/COPYING b/plugins/sid/sidplay-libs/libsidutils/COPYING
index aa0aea5b..aa0aea5b 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/COPYING
+++ b/plugins/sid/sidplay-libs/libsidutils/COPYING
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/ChangeLog b/plugins/sid/sidplay-libs/libsidutils/ChangeLog
index 555ef0b9..555ef0b9 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/ChangeLog
+++ b/plugins/sid/sidplay-libs/libsidutils/ChangeLog
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/INSTALL b/plugins/sid/sidplay-libs/libsidutils/INSTALL
index 02a4a074..02a4a074 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/INSTALL
+++ b/plugins/sid/sidplay-libs/libsidutils/INSTALL
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/Makefile.am b/plugins/sid/sidplay-libs/libsidutils/Makefile.am
index bc2fe8f8..bc2fe8f8 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/Makefile.am
+++ b/plugins/sid/sidplay-libs/libsidutils/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/Makefile.in b/plugins/sid/sidplay-libs/libsidutils/Makefile.in
index e39aed30..e39aed30 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/Makefile.in
+++ b/plugins/sid/sidplay-libs/libsidutils/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/README b/plugins/sid/sidplay-libs/libsidutils/README
index b23614bd..b23614bd 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/README
+++ b/plugins/sid/sidplay-libs/libsidutils/README
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/TODO b/plugins/sid/sidplay-libs/libsidutils/TODO
index 688b0746..688b0746 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/TODO
+++ b/plugins/sid/sidplay-libs/libsidutils/TODO
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/aclocal.m4 b/plugins/sid/sidplay-libs/libsidutils/aclocal.m4
index 7b718771..7b718771 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/aclocal.m4
+++ b/plugins/sid/sidplay-libs/libsidutils/aclocal.m4
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/configure b/plugins/sid/sidplay-libs/libsidutils/configure
index 7c226169..7c226169 100755
--- a/sid/sidplay-libs-2.1.0/libsidutils/configure
+++ b/plugins/sid/sidplay-libs/libsidutils/configure
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/configure.ac b/plugins/sid/sidplay-libs/libsidutils/configure.ac
index 845c2630..845c2630 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/configure.ac
+++ b/plugins/sid/sidplay-libs/libsidutils/configure.ac
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/include/Makefile.am b/plugins/sid/sidplay-libs/libsidutils/include/Makefile.am
index 1c58b3b9..1c58b3b9 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/include/Makefile.am
+++ b/plugins/sid/sidplay-libs/libsidutils/include/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/include/Makefile.in b/plugins/sid/sidplay-libs/libsidutils/include/Makefile.in
index 20bc9137..20bc9137 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/include/Makefile.in
+++ b/plugins/sid/sidplay-libs/libsidutils/include/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/include/config.h b/plugins/sid/sidplay-libs/libsidutils/include/config.h
index 21653356..21653356 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/include/config.h
+++ b/plugins/sid/sidplay-libs/libsidutils/include/config.h
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/Makefile.am b/plugins/sid/sidplay-libs/libsidutils/include/sidplay/Makefile.am
index 97b7b2b3..97b7b2b3 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/Makefile.am
+++ b/plugins/sid/sidplay-libs/libsidutils/include/sidplay/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/Makefile.in b/plugins/sid/sidplay-libs/libsidutils/include/sidplay/Makefile.in
index bcb71602..bcb71602 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/Makefile.in
+++ b/plugins/sid/sidplay-libs/libsidutils/include/sidplay/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/Makefile.am b/plugins/sid/sidplay-libs/libsidutils/include/sidplay/utils/Makefile.am
index 5337a9a2..5337a9a2 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/Makefile.am
+++ b/plugins/sid/sidplay-libs/libsidutils/include/sidplay/utils/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/Makefile.in b/plugins/sid/sidplay-libs/libsidutils/include/sidplay/utils/Makefile.in
index 223aada3..223aada3 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/Makefile.in
+++ b/plugins/sid/sidplay-libs/libsidutils/include/sidplay/utils/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidDatabase.h b/plugins/sid/sidplay-libs/libsidutils/include/sidplay/utils/SidDatabase.h
index e16932a2..e16932a2 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidDatabase.h
+++ b/plugins/sid/sidplay-libs/libsidutils/include/sidplay/utils/SidDatabase.h
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidFilter.h b/plugins/sid/sidplay-libs/libsidutils/include/sidplay/utils/SidFilter.h
index db52aa01..db52aa01 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidFilter.h
+++ b/plugins/sid/sidplay-libs/libsidutils/include/sidplay/utils/SidFilter.h
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidTuneMod.h b/plugins/sid/sidplay-libs/libsidutils/include/sidplay/utils/SidTuneMod.h
index 4355f3a0..4355f3a0 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidTuneMod.h
+++ b/plugins/sid/sidplay-libs/libsidutils/include/sidplay/utils/SidTuneMod.h
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidUsage.h b/plugins/sid/sidplay-libs/libsidutils/include/sidplay/utils/SidUsage.h
index 77e63708..77e63708 100755
--- a/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidUsage.h
+++ b/plugins/sid/sidplay-libs/libsidutils/include/sidplay/utils/SidUsage.h
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/libini.h b/plugins/sid/sidplay-libs/libsidutils/include/sidplay/utils/libini.h
index 798dfe8e..798dfe8e 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/libini.h
+++ b/plugins/sid/sidplay-libs/libsidutils/include/sidplay/utils/libini.h
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/MD5/MD5.cpp b/plugins/sid/sidplay-libs/libsidutils/src/MD5/MD5.cpp
index acb7e42f..acb7e42f 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/MD5/MD5.cpp
+++ b/plugins/sid/sidplay-libs/libsidutils/src/MD5/MD5.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/MD5/MD5.h b/plugins/sid/sidplay-libs/libsidutils/src/MD5/MD5.h
index 7ced54f7..7ced54f7 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/MD5/MD5.h
+++ b/plugins/sid/sidplay-libs/libsidutils/src/MD5/MD5.h
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/MD5/MD5_Defs.h b/plugins/sid/sidplay-libs/libsidutils/src/MD5/MD5_Defs.h
index 77dca881..77dca881 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/MD5/MD5_Defs.h
+++ b/plugins/sid/sidplay-libs/libsidutils/src/MD5/MD5_Defs.h
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/MD5/Makefile.am b/plugins/sid/sidplay-libs/libsidutils/src/MD5/Makefile.am
index 010f6f79..010f6f79 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/MD5/Makefile.am
+++ b/plugins/sid/sidplay-libs/libsidutils/src/MD5/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/MD5/Makefile.in b/plugins/sid/sidplay-libs/libsidutils/src/MD5/Makefile.in
index c72e248b..c72e248b 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/MD5/Makefile.in
+++ b/plugins/sid/sidplay-libs/libsidutils/src/MD5/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/Makefile.am b/plugins/sid/sidplay-libs/libsidutils/src/Makefile.am
index 448412ed..448412ed 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/Makefile.am
+++ b/plugins/sid/sidplay-libs/libsidutils/src/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/Makefile.in b/plugins/sid/sidplay-libs/libsidutils/src/Makefile.in
index 5e35304b..5e35304b 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/Makefile.in
+++ b/plugins/sid/sidplay-libs/libsidutils/src/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/SidDatabase.cpp b/plugins/sid/sidplay-libs/libsidutils/src/SidDatabase.cpp
index 20dd20b3..20dd20b3 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/SidDatabase.cpp
+++ b/plugins/sid/sidplay-libs/libsidutils/src/SidDatabase.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/SidFilter.cpp b/plugins/sid/sidplay-libs/libsidutils/src/SidFilter.cpp
index 1d9b35ea..1d9b35ea 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/SidFilter.cpp
+++ b/plugins/sid/sidplay-libs/libsidutils/src/SidFilter.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/SidTuneMod.cpp b/plugins/sid/sidplay-libs/libsidutils/src/SidTuneMod.cpp
index 6af33350..6af33350 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/SidTuneMod.cpp
+++ b/plugins/sid/sidplay-libs/libsidutils/src/SidTuneMod.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/SidUsage.cpp b/plugins/sid/sidplay-libs/libsidutils/src/SidUsage.cpp
index abeb085d..abeb085d 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/SidUsage.cpp
+++ b/plugins/sid/sidplay-libs/libsidutils/src/SidUsage.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/Makefile.am b/plugins/sid/sidplay-libs/libsidutils/src/ini/Makefile.am
index 9afbd7db..9afbd7db 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/Makefile.am
+++ b/plugins/sid/sidplay-libs/libsidutils/src/ini/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/Makefile.in b/plugins/sid/sidplay-libs/libsidutils/src/ini/Makefile.in
index a7e5247f..a7e5247f 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/Makefile.in
+++ b/plugins/sid/sidplay-libs/libsidutils/src/ini/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/headings.h b/plugins/sid/sidplay-libs/libsidutils/src/ini/headings.h
index 2f7fcf74..2f7fcf74 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/headings.h
+++ b/plugins/sid/sidplay-libs/libsidutils/src/ini/headings.h
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/headings.i b/plugins/sid/sidplay-libs/libsidutils/src/ini/headings.i
index 11833a99..11833a99 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/headings.i
+++ b/plugins/sid/sidplay-libs/libsidutils/src/ini/headings.i
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/ini.cpp b/plugins/sid/sidplay-libs/libsidutils/src/ini/ini.cpp
index b7d39362..b7d39362 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/ini.cpp
+++ b/plugins/sid/sidplay-libs/libsidutils/src/ini/ini.cpp
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/ini.h b/plugins/sid/sidplay-libs/libsidutils/src/ini/ini.h
index bc622cba..bc622cba 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/ini.h
+++ b/plugins/sid/sidplay-libs/libsidutils/src/ini/ini.h
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/keys.h b/plugins/sid/sidplay-libs/libsidutils/src/ini/keys.h
index 2bef0ff4..2bef0ff4 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/keys.h
+++ b/plugins/sid/sidplay-libs/libsidutils/src/ini/keys.h
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/keys.i b/plugins/sid/sidplay-libs/libsidutils/src/ini/keys.i
index 5507b95d..5507b95d 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/keys.i
+++ b/plugins/sid/sidplay-libs/libsidutils/src/ini/keys.i
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/list.h b/plugins/sid/sidplay-libs/libsidutils/src/ini/list.h
index 9e7f88e4..9e7f88e4 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/list.h
+++ b/plugins/sid/sidplay-libs/libsidutils/src/ini/list.h
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/list.i b/plugins/sid/sidplay-libs/libsidutils/src/ini/list.i
index 57f6011d..57f6011d 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/list.i
+++ b/plugins/sid/sidplay-libs/libsidutils/src/ini/list.i
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/types.i b/plugins/sid/sidplay-libs/libsidutils/src/ini/types.i
index a59d0dbf..a59d0dbf 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/ini/types.i
+++ b/plugins/sid/sidplay-libs/libsidutils/src/ini/types.i
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/src/smm0.h b/plugins/sid/sidplay-libs/libsidutils/src/smm0.h
index fca61092..fca61092 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/src/smm0.h
+++ b/plugins/sid/sidplay-libs/libsidutils/src/smm0.h
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/unix/Makefile.am b/plugins/sid/sidplay-libs/libsidutils/unix/Makefile.am
index 0297d7f8..0297d7f8 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/unix/Makefile.am
+++ b/plugins/sid/sidplay-libs/libsidutils/unix/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/unix/Makefile.in b/plugins/sid/sidplay-libs/libsidutils/unix/Makefile.in
index 69c47c44..69c47c44 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/unix/Makefile.in
+++ b/plugins/sid/sidplay-libs/libsidutils/unix/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/unix/config.guess b/plugins/sid/sidplay-libs/libsidutils/unix/config.guess
index f1657bbc..f1657bbc 100755
--- a/sid/sidplay-libs-2.1.0/libsidutils/unix/config.guess
+++ b/plugins/sid/sidplay-libs/libsidutils/unix/config.guess
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/unix/config.h.in b/plugins/sid/sidplay-libs/libsidutils/unix/config.h.in
index 5e123d10..5e123d10 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/unix/config.h.in
+++ b/plugins/sid/sidplay-libs/libsidutils/unix/config.h.in
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/unix/config.sub b/plugins/sid/sidplay-libs/libsidutils/unix/config.sub
index 1dea9b79..1dea9b79 100755
--- a/sid/sidplay-libs-2.1.0/libsidutils/unix/config.sub
+++ b/plugins/sid/sidplay-libs/libsidutils/unix/config.sub
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/unix/depcomp b/plugins/sid/sidplay-libs/libsidutils/unix/depcomp
index 807b991f..807b991f 100755
--- a/sid/sidplay-libs-2.1.0/libsidutils/unix/depcomp
+++ b/plugins/sid/sidplay-libs/libsidutils/unix/depcomp
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/unix/install-sh b/plugins/sid/sidplay-libs/libsidutils/unix/install-sh
index 11870f1b..11870f1b 100755
--- a/sid/sidplay-libs-2.1.0/libsidutils/unix/install-sh
+++ b/plugins/sid/sidplay-libs/libsidutils/unix/install-sh
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/unix/libsidutils.pc.in b/plugins/sid/sidplay-libs/libsidutils/unix/libsidutils.pc.in
index bb2fed73..bb2fed73 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/unix/libsidutils.pc.in
+++ b/plugins/sid/sidplay-libs/libsidutils/unix/libsidutils.pc.in
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/unix/libsidutils.spec b/plugins/sid/sidplay-libs/libsidutils/unix/libsidutils.spec
index 4337cd46..4337cd46 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/unix/libsidutils.spec
+++ b/plugins/sid/sidplay-libs/libsidutils/unix/libsidutils.spec
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/unix/libsidutils.spec.in b/plugins/sid/sidplay-libs/libsidutils/unix/libsidutils.spec.in
index 7ce8b921..7ce8b921 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/unix/libsidutils.spec.in
+++ b/plugins/sid/sidplay-libs/libsidutils/unix/libsidutils.spec.in
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/unix/ltmain.sh b/plugins/sid/sidplay-libs/libsidutils/unix/ltmain.sh
index c4538260..c4538260 100755
--- a/sid/sidplay-libs-2.1.0/libsidutils/unix/ltmain.sh
+++ b/plugins/sid/sidplay-libs/libsidutils/unix/ltmain.sh
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/unix/missing b/plugins/sid/sidplay-libs/libsidutils/unix/missing
index 6a37006e..6a37006e 100755
--- a/sid/sidplay-libs-2.1.0/libsidutils/unix/missing
+++ b/plugins/sid/sidplay-libs/libsidutils/unix/missing
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/unix/mkinstalldirs b/plugins/sid/sidplay-libs/libsidutils/unix/mkinstalldirs
index d2d5f21b..d2d5f21b 100755
--- a/sid/sidplay-libs-2.1.0/libsidutils/unix/mkinstalldirs
+++ b/plugins/sid/sidplay-libs/libsidutils/unix/mkinstalldirs
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/unix/my_macros.m4 b/plugins/sid/sidplay-libs/libsidutils/unix/my_macros.m4
index bd607f73..bd607f73 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/unix/my_macros.m4
+++ b/plugins/sid/sidplay-libs/libsidutils/unix/my_macros.m4
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/unix/sidplay2.m4 b/plugins/sid/sidplay-libs/libsidutils/unix/sidplay2.m4
index 123575c6..123575c6 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/unix/sidplay2.m4
+++ b/plugins/sid/sidplay-libs/libsidutils/unix/sidplay2.m4
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/win/VC/config.h b/plugins/sid/sidplay-libs/libsidutils/win/VC/config.h
index be69c2bc..be69c2bc 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/win/VC/config.h
+++ b/plugins/sid/sidplay-libs/libsidutils/win/VC/config.h
diff --git a/sid/sidplay-libs-2.1.0/libsidutils/win/VC/libsidutils.dsp b/plugins/sid/sidplay-libs/libsidutils/win/VC/libsidutils.dsp
index ae408746..ae408746 100644
--- a/sid/sidplay-libs-2.1.0/libsidutils/win/VC/libsidutils.dsp
+++ b/plugins/sid/sidplay-libs/libsidutils/win/VC/libsidutils.dsp
diff --git a/sid/sidplay-libs-2.1.0/resid/AUTHORS b/plugins/sid/sidplay-libs/resid/AUTHORS
index d22e33d5..d22e33d5 100644
--- a/sid/sidplay-libs-2.1.0/resid/AUTHORS
+++ b/plugins/sid/sidplay-libs/resid/AUTHORS
diff --git a/sid/sidplay-libs-2.1.0/resid/COPYING b/plugins/sid/sidplay-libs/resid/COPYING
index eeb586b3..eeb586b3 100644
--- a/sid/sidplay-libs-2.1.0/resid/COPYING
+++ b/plugins/sid/sidplay-libs/resid/COPYING
diff --git a/sid/sidplay-libs-2.1.0/resid/ChangeLog b/plugins/sid/sidplay-libs/resid/ChangeLog
index c1735aaf..c1735aaf 100644
--- a/sid/sidplay-libs-2.1.0/resid/ChangeLog
+++ b/plugins/sid/sidplay-libs/resid/ChangeLog
diff --git a/sid/sidplay-libs-2.1.0/resid/INSTALL b/plugins/sid/sidplay-libs/resid/INSTALL
index 9f743ca4..9f743ca4 100644
--- a/sid/sidplay-libs-2.1.0/resid/INSTALL
+++ b/plugins/sid/sidplay-libs/resid/INSTALL
diff --git a/sid/sidplay-libs-2.1.0/resid/Makefile.am b/plugins/sid/sidplay-libs/resid/Makefile.am
index f83377a0..f83377a0 100644
--- a/sid/sidplay-libs-2.1.0/resid/Makefile.am
+++ b/plugins/sid/sidplay-libs/resid/Makefile.am
diff --git a/sid/sidplay-libs-2.1.0/resid/Makefile.in b/plugins/sid/sidplay-libs/resid/Makefile.in
index 6c6001f6..6c6001f6 100644
--- a/sid/sidplay-libs-2.1.0/resid/Makefile.in
+++ b/plugins/sid/sidplay-libs/resid/Makefile.in
diff --git a/sid/sidplay-libs-2.1.0/resid/NEWS b/plugins/sid/sidplay-libs/resid/NEWS
index 2f9f3c42..2f9f3c42 100644
--- a/sid/sidplay-libs-2.1.0/resid/NEWS
+++ b/plugins/sid/sidplay-libs/resid/NEWS
diff --git a/sid/sidplay-libs-2.1.0/resid/README b/plugins/sid/sidplay-libs/resid/README
index 8967f5d2..8967f5d2 100644
--- a/sid/sidplay-libs-2.1.0/resid/README
+++ b/plugins/sid/sidplay-libs/resid/README
diff --git a/sid/sidplay-libs-2.1.0/resid/THANKS b/plugins/sid/sidplay-libs/resid/THANKS
index f65a075f..f65a075f 100644
--- a/sid/sidplay-libs-2.1.0/resid/THANKS
+++ b/plugins/sid/sidplay-libs/resid/THANKS
diff --git a/sid/sidplay-libs-2.1.0/resid/TODO b/plugins/sid/sidplay-libs/resid/TODO
index 4527dfa5..4527dfa5 100644
--- a/sid/sidplay-libs-2.1.0/resid/TODO
+++ b/plugins/sid/sidplay-libs/resid/TODO
diff --git a/sid/sidplay-libs-2.1.0/resid/aclocal.m4 b/plugins/sid/sidplay-libs/resid/aclocal.m4
index 7a0844fe..7a0844fe 100644
--- a/sid/sidplay-libs-2.1.0/resid/aclocal.m4
+++ b/plugins/sid/sidplay-libs/resid/aclocal.m4
diff --git a/sid/sidplay-libs-2.1.0/resid/config.guess b/plugins/sid/sidplay-libs/resid/config.guess
index ba661651..ba661651 100755
--- a/sid/sidplay-libs-2.1.0/resid/config.guess
+++ b/plugins/sid/sidplay-libs/resid/config.guess
diff --git a/sid/sidplay-libs-2.1.0/resid/config.sub b/plugins/sid/sidplay-libs/resid/config.sub
index a06a480a..a06a480a 100755
--- a/sid/sidplay-libs-2.1.0/resid/config.sub
+++ b/plugins/sid/sidplay-libs/resid/config.sub
diff --git a/sid/sidplay-libs-2.1.0/resid/configure b/plugins/sid/sidplay-libs/resid/configure
index 769ba94b..769ba94b 100755
--- a/sid/sidplay-libs-2.1.0/resid/configure
+++ b/plugins/sid/sidplay-libs/resid/configure
diff --git a/sid/sidplay-libs-2.1.0/resid/configure.in b/plugins/sid/sidplay-libs/resid/configure.in
index 2d3413be..2d3413be 100644
--- a/sid/sidplay-libs-2.1.0/resid/configure.in
+++ b/plugins/sid/sidplay-libs/resid/configure.in
diff --git a/sid/sidplay-libs-2.1.0/resid/depcomp b/plugins/sid/sidplay-libs/resid/depcomp
index 65899658..65899658 100644
--- a/sid/sidplay-libs-2.1.0/resid/depcomp
+++ b/plugins/sid/sidplay-libs/resid/depcomp
diff --git a/sid/sidplay-libs-2.1.0/resid/envelope.cc b/plugins/sid/sidplay-libs/resid/envelope.cc
index a4bbd511..a4bbd511 100644
--- a/sid/sidplay-libs-2.1.0/resid/envelope.cc
+++ b/plugins/sid/sidplay-libs/resid/envelope.cc
diff --git a/sid/sidplay-libs-2.1.0/resid/envelope.h b/plugins/sid/sidplay-libs/resid/envelope.h
index d0b528ff..d0b528ff 100644
--- a/sid/sidplay-libs-2.1.0/resid/envelope.h
+++ b/plugins/sid/sidplay-libs/resid/envelope.h
diff --git a/sid/sidplay-libs-2.1.0/resid/extfilt.cc b/plugins/sid/sidplay-libs/resid/extfilt.cc
index 461cdaf7..461cdaf7 100644
--- a/sid/sidplay-libs-2.1.0/resid/extfilt.cc
+++ b/plugins/sid/sidplay-libs/resid/extfilt.cc
diff --git a/sid/sidplay-libs-2.1.0/resid/extfilt.h b/plugins/sid/sidplay-libs/resid/extfilt.h
index 84c204ef..84c204ef 100644
--- a/sid/sidplay-libs-2.1.0/resid/extfilt.h
+++ b/plugins/sid/sidplay-libs/resid/extfilt.h
diff --git a/sid/sidplay-libs-2.1.0/resid/filter.cc b/plugins/sid/sidplay-libs/resid/filter.cc
index 9ca793e0..9ca793e0 100644
--- a/sid/sidplay-libs-2.1.0/resid/filter.cc
+++ b/plugins/sid/sidplay-libs/resid/filter.cc
diff --git a/sid/sidplay-libs-2.1.0/resid/filter.h b/plugins/sid/sidplay-libs/resid/filter.h
index 7db4f31c..7db4f31c 100644
--- a/sid/sidplay-libs-2.1.0/resid/filter.h
+++ b/plugins/sid/sidplay-libs/resid/filter.h
diff --git a/sid/sidplay-libs-2.1.0/resid/install-sh b/plugins/sid/sidplay-libs/resid/install-sh
index e9de2384..e9de2384 100755
--- a/sid/sidplay-libs-2.1.0/resid/install-sh
+++ b/plugins/sid/sidplay-libs/resid/install-sh
diff --git a/sid/sidplay-libs-2.1.0/resid/ltmain.sh b/plugins/sid/sidplay-libs/resid/ltmain.sh
index 2393e14d..2393e14d 100644
--- a/sid/sidplay-libs-2.1.0/resid/ltmain.sh
+++ b/plugins/sid/sidplay-libs/resid/ltmain.sh
diff --git a/sid/sidplay-libs-2.1.0/resid/missing b/plugins/sid/sidplay-libs/resid/missing
index d46f79f6..d46f79f6 100755
--- a/sid/sidplay-libs-2.1.0/resid/missing
+++ b/plugins/sid/sidplay-libs/resid/missing
diff --git a/sid/sidplay-libs-2.1.0/resid/mkinstalldirs b/plugins/sid/sidplay-libs/resid/mkinstalldirs
index 4f58503e..4f58503e 100755
--- a/sid/sidplay-libs-2.1.0/resid/mkinstalldirs
+++ b/plugins/sid/sidplay-libs/resid/mkinstalldirs
diff --git a/sid/sidplay-libs-2.1.0/resid/pot.cc b/plugins/sid/sidplay-libs/resid/pot.cc
index 805f9a7c..805f9a7c 100644
--- a/sid/sidplay-libs-2.1.0/resid/pot.cc
+++ b/plugins/sid/sidplay-libs/resid/pot.cc
diff --git a/sid/sidplay-libs-2.1.0/resid/pot.h b/plugins/sid/sidplay-libs/resid/pot.h
index e61c2238..e61c2238 100644
--- a/sid/sidplay-libs-2.1.0/resid/pot.h
+++ b/plugins/sid/sidplay-libs/resid/pot.h
diff --git a/sid/sidplay-libs-2.1.0/resid/samp2src.pl b/plugins/sid/sidplay-libs/resid/samp2src.pl
index 0313e1df..0313e1df 100755
--- a/sid/sidplay-libs-2.1.0/resid/samp2src.pl
+++ b/plugins/sid/sidplay-libs/resid/samp2src.pl
diff --git a/sid/sidplay-libs-2.1.0/resid/sid.cc b/plugins/sid/sidplay-libs/resid/sid.cc
index f3cd02a3..f3cd02a3 100644
--- a/sid/sidplay-libs-2.1.0/resid/sid.cc
+++ b/plugins/sid/sidplay-libs/resid/sid.cc
diff --git a/sid/sidplay-libs-2.1.0/resid/sid.h b/plugins/sid/sidplay-libs/resid/sid.h
index 33754547..33754547 100644
--- a/sid/sidplay-libs-2.1.0/resid/sid.h
+++ b/plugins/sid/sidplay-libs/resid/sid.h
diff --git a/sid/sidplay-libs-2.1.0/resid/siddefs.h b/plugins/sid/sidplay-libs/resid/siddefs.h
index c4eaea6e..c4eaea6e 100644
--- a/sid/sidplay-libs-2.1.0/resid/siddefs.h
+++ b/plugins/sid/sidplay-libs/resid/siddefs.h
diff --git a/sid/sidplay-libs-2.1.0/resid/siddefs.h.in b/plugins/sid/sidplay-libs/resid/siddefs.h.in
index e5634924..e5634924 100644
--- a/sid/sidplay-libs-2.1.0/resid/siddefs.h.in
+++ b/plugins/sid/sidplay-libs/resid/siddefs.h.in
diff --git a/sid/sidplay-libs-2.1.0/resid/spline.h b/plugins/sid/sidplay-libs/resid/spline.h
index a4871a3c..a4871a3c 100644
--- a/sid/sidplay-libs-2.1.0/resid/spline.h
+++ b/plugins/sid/sidplay-libs/resid/spline.h
diff --git a/sid/sidplay-libs-2.1.0/resid/version.cc b/plugins/sid/sidplay-libs/resid/version.cc
index ebb0e607..ebb0e607 100644
--- a/sid/sidplay-libs-2.1.0/resid/version.cc
+++ b/plugins/sid/sidplay-libs/resid/version.cc
diff --git a/sid/sidplay-libs-2.1.0/resid/voice.cc b/plugins/sid/sidplay-libs/resid/voice.cc
index 049e0530..049e0530 100644
--- a/sid/sidplay-libs-2.1.0/resid/voice.cc
+++ b/plugins/sid/sidplay-libs/resid/voice.cc
diff --git a/sid/sidplay-libs-2.1.0/resid/voice.h b/plugins/sid/sidplay-libs/resid/voice.h
index 77f8b443..77f8b443 100644
--- a/sid/sidplay-libs-2.1.0/resid/voice.h
+++ b/plugins/sid/sidplay-libs/resid/voice.h
diff --git a/sid/sidplay-libs-2.1.0/resid/wave.cc b/plugins/sid/sidplay-libs/resid/wave.cc
index 6f5ec5dd..6f5ec5dd 100644
--- a/sid/sidplay-libs-2.1.0/resid/wave.cc
+++ b/plugins/sid/sidplay-libs/resid/wave.cc
diff --git a/sid/sidplay-libs-2.1.0/resid/wave.h b/plugins/sid/sidplay-libs/resid/wave.h
index 6d4f90ed..6d4f90ed 100644
--- a/sid/sidplay-libs-2.1.0/resid/wave.h
+++ b/plugins/sid/sidplay-libs/resid/wave.h
diff --git a/sid/sidplay-libs-2.1.0/resid/wave6581_PST.cc b/plugins/sid/sidplay-libs/resid/wave6581_PST.cc
index 37b54734..37b54734 100644
--- a/sid/sidplay-libs-2.1.0/resid/wave6581_PST.cc
+++ b/plugins/sid/sidplay-libs/resid/wave6581_PST.cc
diff --git a/sid/sidplay-libs-2.1.0/resid/wave6581_PST.dat b/plugins/sid/sidplay-libs/resid/wave6581_PST.dat
index 5afe75e2..5afe75e2 100644
--- a/sid/sidplay-libs-2.1.0/resid/wave6581_PST.dat
+++ b/plugins/sid/sidplay-libs/resid/wave6581_PST.dat
diff --git a/sid/sidplay-libs-2.1.0/resid/wave6581_PS_.cc b/plugins/sid/sidplay-libs/resid/wave6581_PS_.cc
index 9304df8c..9304df8c 100644
--- a/sid/sidplay-libs-2.1.0/resid/wave6581_PS_.cc
+++ b/plugins/sid/sidplay-libs/resid/wave6581_PS_.cc
diff --git a/sid/sidplay-libs-2.1.0/resid/wave6581_PS_.dat b/plugins/sid/sidplay-libs/resid/wave6581_PS_.dat
index ea2fb9c5..ea2fb9c5 100644
--- a/sid/sidplay-libs-2.1.0/resid/wave6581_PS_.dat
+++ b/plugins/sid/sidplay-libs/resid/wave6581_PS_.dat
diff --git a/sid/sidplay-libs-2.1.0/resid/wave6581_P_T.cc b/plugins/sid/sidplay-libs/resid/wave6581_P_T.cc
index 35a246af..35a246af 100644
--- a/sid/sidplay-libs-2.1.0/resid/wave6581_P_T.cc
+++ b/plugins/sid/sidplay-libs/resid/wave6581_P_T.cc
diff --git a/sid/sidplay-libs-2.1.0/resid/wave6581_P_T.dat b/plugins/sid/sidplay-libs/resid/wave6581_P_T.dat
index 1cc8874d..1cc8874d 100644
--- a/sid/sidplay-libs-2.1.0/resid/wave6581_P_T.dat
+++ b/plugins/sid/sidplay-libs/resid/wave6581_P_T.dat
diff --git a/sid/sidplay-libs-2.1.0/resid/wave6581__ST.cc b/plugins/sid/sidplay-libs/resid/wave6581__ST.cc
index 55ec36b7..55ec36b7 100644
--- a/sid/sidplay-libs-2.1.0/resid/wave6581__ST.cc
+++ b/plugins/sid/sidplay-libs/resid/wave6581__ST.cc
diff --git a/sid/sidplay-libs-2.1.0/resid/wave6581__ST.dat b/plugins/sid/sidplay-libs/resid/wave6581__ST.dat
index 2e5d9872..2e5d9872 100644
--- a/sid/sidplay-libs-2.1.0/resid/wave6581__ST.dat
+++ b/plugins/sid/sidplay-libs/resid/wave6581__ST.dat
diff --git a/sid/sidplay-libs-2.1.0/resid/wave8580_PST.cc b/plugins/sid/sidplay-libs/resid/wave8580_PST.cc
index 5141f0f7..5141f0f7 100644
--- a/sid/sidplay-libs-2.1.0/resid/wave8580_PST.cc
+++ b/plugins/sid/sidplay-libs/resid/wave8580_PST.cc
diff --git a/sid/sidplay-libs-2.1.0/resid/wave8580_PST.dat b/plugins/sid/sidplay-libs/resid/wave8580_PST.dat
index 22706cf2..22706cf2 100644
--- a/sid/sidplay-libs-2.1.0/resid/wave8580_PST.dat
+++ b/plugins/sid/sidplay-libs/resid/wave8580_PST.dat
diff --git a/sid/sidplay-libs-2.1.0/resid/wave8580_PS_.cc b/plugins/sid/sidplay-libs/resid/wave8580_PS_.cc
index 15de9f9a..15de9f9a 100644
--- a/sid/sidplay-libs-2.1.0/resid/wave8580_PS_.cc
+++ b/plugins/sid/sidplay-libs/resid/wave8580_PS_.cc
diff --git a/sid/sidplay-libs-2.1.0/resid/wave8580_PS_.dat b/plugins/sid/sidplay-libs/resid/wave8580_PS_.dat
index 9a20a9ee..9a20a9ee 100644
--- a/sid/sidplay-libs-2.1.0/resid/wave8580_PS_.dat
+++ b/plugins/sid/sidplay-libs/resid/wave8580_PS_.dat
diff --git a/sid/sidplay-libs-2.1.0/resid/wave8580_P_T.cc b/plugins/sid/sidplay-libs/resid/wave8580_P_T.cc
index f3a3d835..f3a3d835 100644
--- a/sid/sidplay-libs-2.1.0/resid/wave8580_P_T.cc
+++ b/plugins/sid/sidplay-libs/resid/wave8580_P_T.cc
diff --git a/sid/sidplay-libs-2.1.0/resid/wave8580_P_T.dat b/plugins/sid/sidplay-libs/resid/wave8580_P_T.dat
index 5423dd9a..5423dd9a 100644
--- a/sid/sidplay-libs-2.1.0/resid/wave8580_P_T.dat
+++ b/plugins/sid/sidplay-libs/resid/wave8580_P_T.dat
diff --git a/sid/sidplay-libs-2.1.0/resid/wave8580__ST.cc b/plugins/sid/sidplay-libs/resid/wave8580__ST.cc
index 08e7c5a8..08e7c5a8 100644
--- a/sid/sidplay-libs-2.1.0/resid/wave8580__ST.cc
+++ b/plugins/sid/sidplay-libs/resid/wave8580__ST.cc
diff --git a/sid/sidplay-libs-2.1.0/resid/wave8580__ST.dat b/plugins/sid/sidplay-libs/resid/wave8580__ST.dat
index f30002ce..f30002ce 100644
--- a/sid/sidplay-libs-2.1.0/resid/wave8580__ST.dat
+++ b/plugins/sid/sidplay-libs/resid/wave8580__ST.dat
diff --git a/sid/sidplay-libs-2.1.0/unix/config.guess b/plugins/sid/sidplay-libs/unix/config.guess
index f1657bbc..f1657bbc 100755
--- a/sid/sidplay-libs-2.1.0/unix/config.guess
+++ b/plugins/sid/sidplay-libs/unix/config.guess
diff --git a/sid/sidplay-libs-2.1.0/unix/config.h b/plugins/sid/sidplay-libs/unix/config.h
index ee1de9e8..ee1de9e8 100644
--- a/sid/sidplay-libs-2.1.0/unix/config.h
+++ b/plugins/sid/sidplay-libs/unix/config.h
diff --git a/sid/sidplay-libs-2.1.0/unix/config.sub b/plugins/sid/sidplay-libs/unix/config.sub
index 1dea9b79..1dea9b79 100755
--- a/sid/sidplay-libs-2.1.0/unix/config.sub
+++ b/plugins/sid/sidplay-libs/unix/config.sub
diff --git a/sid/sidplay-libs-2.1.0/unix/depcomp b/plugins/sid/sidplay-libs/unix/depcomp
index 807b991f..807b991f 100755
--- a/sid/sidplay-libs-2.1.0/unix/depcomp
+++ b/plugins/sid/sidplay-libs/unix/depcomp
diff --git a/sid/sidplay-libs-2.1.0/unix/install-sh b/plugins/sid/sidplay-libs/unix/install-sh
index 11870f1b..11870f1b 100755
--- a/sid/sidplay-libs-2.1.0/unix/install-sh
+++ b/plugins/sid/sidplay-libs/unix/install-sh
diff --git a/sid/sidplay-libs-2.1.0/unix/ltmain.sh b/plugins/sid/sidplay-libs/unix/ltmain.sh
index c4538260..c4538260 100755
--- a/sid/sidplay-libs-2.1.0/unix/ltmain.sh
+++ b/plugins/sid/sidplay-libs/unix/ltmain.sh
diff --git a/sid/sidplay-libs-2.1.0/unix/missing b/plugins/sid/sidplay-libs/unix/missing
index 6a37006e..6a37006e 100755
--- a/sid/sidplay-libs-2.1.0/unix/missing
+++ b/plugins/sid/sidplay-libs/unix/missing
diff --git a/sid/sidplay-libs-2.1.0/unix/mkinstalldirs b/plugins/sid/sidplay-libs/unix/mkinstalldirs
index e6826388..e6826388 100755
--- a/sid/sidplay-libs-2.1.0/unix/mkinstalldirs
+++ b/plugins/sid/sidplay-libs/unix/mkinstalldirs