passed make distcheck; 0.1.0 release

290 files changed, 360 insertions, 86 deletions

diff --git a/Makefile.am b/Makefile.am
index 3de7de5c..f7d0e74a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,10 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = gme/Game_Music_Emu-0.5.2/gme libsidplay2/sidplay-libs-2.1.0 dumb
+SUBDIRS = gme/Game_Music_Emu-0.5.2/gme sid/sidplay-libs-2.1.0 dumb pixmaps
+
+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
 
@@ -8,30 +12,37 @@ deadbeef_SOURCES = callbacks.c csid.cpp interface.c playlist.c streamer.c\
 	cdumb.c cmp3.c cvorbis.c main.c progress.c support.c\
 	cflac.c codec.c messagepump.c\
 	cgme.c conf.c gtkplaylist.c palsa.c search.c threading_pthread.c\
-	md5/md5.c
-
-deadbeef_LDADD = $(LDADD) $(DEPS_LIBS) gme/Game_Music_Emu-0.5.2/gme/libgme.a libsidplay2/sidplay-libs-2.1.0/libsidplay2.a dumb/libdumb.a
-AM_CFLAGS = $(DEPS_CFLAGS) -Igme/Game_Music_Emu-0.5.2 -std=c99
-AM_CPPFLAGS = $(DEPS_CFLAGS) -Ilibsidplay2/sidplay-libs-2.1.0/libsidplay/include -Ilibsidplay2/sidplay-libs-2.1.0/builders/resid-builder/include
-
-install-data-local:
-	@$(NORMAL_INSTALL)
-	if test -d $(srcdir)/pixmaps; then \
-	  $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \
-	  for pixmap in $(srcdir)/pixmaps/*; do \
-	    if test -f $$pixmap; then \
-	      $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/pixmaps; \
-	    fi \
-	  done \
-	fi
-
-dist-hook:
-	if test -d pixmaps; then \
-	  mkdir $(distdir)/pixmaps; \
-	  for pixmap in pixmaps/*; do \
-	    if test -f $$pixmap; then \
-	      cp -p $$pixmap $(distdir)/pixmaps; \
-	    fi \
-	  done \
-	fi
+	md5/md5.c\
+	callbacks.h cmod.h conf.h messages.h progress.h support.h\
+	cdumb.h cmp3.h gtkplaylist.h palsa.h threading.h\
+	cflac.h codec.h csid.h interface.h playback.h search.h\
+	cgme.h common.h cvorbis.h messagepump.h playlist.h streamer.h\
+	md5/md5.h md5/md5_loc.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
+
+AM_CFLAGS = $(DEPS_CFLAGS) -I$(gmepath) -std=c99
+AM_CPPFLAGS = $(DEPS_CFLAGS) -I$(sidpath)/libsidplay/include -I$(sidpath)/builders/resid-builder/include
 
+#install-data-local:
+#	@$(NORMAL_INSTALL)
+#	if test -d $(srcdir)/pixmaps; then \
+#	  $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \
+#	  for pixmap in $(srcdir)/pixmaps/*; do \
+#	    if test -f $$pixmap; then \
+#	      $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/pixmaps; \
+#	    fi \
+#	  done \
+#	fi
+#
+#dist-hook:
+#	if test -d pixmaps; then \
+#	  mkdir $(distdir)/pixmaps; \
+#	  for pixmap in pixmaps/*; do \
+#	    if test -f $$pixmap; then \
+#	      cp -p $$pixmap $(distdir)/pixmaps; \
+#	    fi \
+#	  done \
+#	fi
+#
diff --git a/README b/README
index e69de29b..30a94190 100644
--- a/README
+++ b/README
@@ -0,0 +1,12 @@
+dependencies:
+    libmad
+    libogg
+    libvorbis
+    libvorbisfile
+    gtk+ 2.x (and gthread, and glib)
+    libsamplerate
+    libalsa
+
+if you want to build from git - install automake, and run ./bootstrap.sh before compiling
+also it's convenient to use jam to build instead of ./configure && make && make install
+
diff --git a/callbacks.c b/callbacks.c
index 92158dc1..cc88b0cb 100644
--- a/callbacks.c
+++ b/callbacks.c
@@ -42,7 +42,6 @@
 #include "streamer.h"
 #include "progress.h"
 
-#include "cwav.h"
 #include "cvorbis.h"
 #include "cdumb.h"
 #include "cmp3.h"
diff --git a/configure.in b/configure.in
index 158a35f5..f3ed587e 100644
--- a/configure.in
+++ b/configure.in
@@ -25,8 +25,9 @@ AC_SUBST(DEPS_LIBS)
 
 AC_OUTPUT([
 Makefile
+pixmaps/Makefile
 gme/Game_Music_Emu-0.5.2/gme/Makefile
-libsidplay2/sidplay-libs-2.1.0/Makefile
+sid/sidplay-libs-2.1.0/Makefile
 dumb/Makefile
 ])
 
diff --git a/deadbeef.glade b/deadbeef.glade
index 25736428..c81cad8a 100644
--- a/deadbeef.glade
+++ b/deadbeef.glade
@@ -14,6 +14,7 @@
   <property name="default_height">300</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="icon">play_24.png</property>
   <property name="icon_name"></property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
diff --git a/dumb/Makefile.am b/dumb/Makefile.am
index 6e5150cf..1fb7bb1f 100644
--- a/dumb/Makefile.am
+++ b/dumb/Makefile.am
@@ -1,6 +1,8 @@
 noinst_LIBRARIES = libdumb.a
 
-AM_CFLAGS = $(CFLAGS) -Idumb-kode54/include
+dumbpath=@top_srcdir@/dumb
+
+AM_CFLAGS = $(CFLAGS) -I$(dumbpath)/dumb-kode54/include
 
 libdumb_a_SOURCES = dumb-kode54/src/it/readam.c\
 dumb-kode54/src/it/readstm.c\
@@ -71,4 +73,28 @@ dumb-kode54/src/helpers/resample.c\
 dumb-kode54/src/helpers/riff.c\
 dumb-kode54/src/helpers/memfile.c\
 dumb-kode54/src/helpers/sampbuf.c\
-dumb-kode54/src/helpers/barray.c
+dumb-kode54/src/helpers/barray.c\
+dumb-kode54/studio/include/guitop.h\
+dumb-kode54/studio/include/dumbgui.h\
+dumb-kode54/studio/include/options.h\
+dumb-kode54/studio/include/subclip.h\
+dumb-kode54/studio/include/main.h\
+dumb-kode54/studio/include/guiproc.h\
+dumb-kode54/studio/include/dumbmenu.h\
+dumb-kode54/studio/include/dumbdesk.h\
+dumb-kode54/src/tools/it/modulus.h\
+dumb-kode54/include/internal/it.h\
+dumb-kode54/include/internal/dumb.h\
+dumb-kode54/include/internal/barray.h\
+dumb-kode54/include/internal/riff.h\
+dumb-kode54/include/internal/aldumb.h\
+dumb-kode54/include/dumb.h\
+dumb-kode54/include/aldumb.h\
+dumb-kode54/winamp/in_duh.h\
+dumb-kode54/winamp/in2.h\
+dumb-kode54/winamp/resource.h\
+dumb-kode54/winamp/out.h\
+dumb-kode54/winamp/gui.h\
+dumb-kode54/src/helpers/resample.inc\
+dumb-kode54/src/helpers/resamp2.inc\
+dumb-kode54/src/helpers/resamp3.inc
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Makefile.am b/gme/Game_Music_Emu-0.5.2/gme/Makefile.am
index 3b2198e7..75d377cd 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Makefile.am
+++ b/gme/Game_Music_Emu-0.5.2/gme/Makefile.am
@@ -7,5 +7,58 @@ Classic_Emu.cpp     gme.cpp       M3u_Playlist.cpp  Nsfe_Emu.cpp       Spc_Emu.c
 Data_Reader.cpp     Gme_File.cpp  Multi_Buffer.cpp  Nsf_Emu.cpp        Vgm_Emu.cpp\
 Dual_Resampler.cpp  Gym_Emu.cpp   Music_Emu.cpp     Sap_Apu.cpp        Vgm_Emu_Impl.cpp\
 Effects_Buffer.cpp  Hes_Apu.cpp   Nes_Apu.cpp       Sap_Cpu.cpp        Ym2413_Emu.cpp\
-Fir_Resampler.cpp   Hes_Cpu.cpp   Nes_Cpu.cpp       Sap_Emu.cpp        Ym2612_Emu.cpp
-
+Fir_Resampler.cpp   Hes_Cpu.cpp   Nes_Cpu.cpp       Sap_Emu.cpp        Ym2612_Emu.cpp\
+Ay_Apu.h\
+Ay_Cpu.h\
+Ay_Emu.h\
+blargg_common.h\
+blargg_config.h\
+blargg_endian.h\
+blargg_source.h\
+Blip_Buffer.h\
+Classic_Emu.h\
+Data_Reader.h\
+Dual_Resampler.h\
+Effects_Buffer.h\
+Fir_Resampler.h\
+Gb_Apu.h\
+Gb_Cpu.h\
+gb_cpu_io.h\
+Gb_Oscs.h\
+Gbs_Emu.h\
+Gme_File.h\
+gme.h\
+Gym_Emu.h\
+Hes_Apu.h\
+Hes_Cpu.h\
+hes_cpu_io.h\
+Hes_Emu.h\
+Kss_Cpu.h\
+Kss_Emu.h\
+Kss_Scc_Apu.h\
+M3u_Playlist.h\
+Multi_Buffer.h\
+Music_Emu.h\
+Nes_Apu.h\
+Nes_Cpu.h\
+nes_cpu_io.h\
+Nes_Fme7_Apu.h\
+Nes_Namco_Apu.h\
+Nes_Oscs.h\
+Nes_Vrc6_Apu.h\
+Nsfe_Emu.h\
+Nsf_Emu.h\
+Sap_Apu.h\
+Sap_Cpu.h\
+sap_cpu_io.h\
+Sap_Emu.h\
+Sms_Apu.h\
+Sms_Oscs.h\
+Snes_Spc.h\
+Spc_Cpu.h\
+Spc_Dsp.h\
+Spc_Emu.h\
+Vgm_Emu.h\
+Vgm_Emu_Impl.h\
+Ym2413_Emu.h\
+Ym2612_Emu.h
diff --git a/interface.c b/interface.c
index 75acf1b9..265cb976 100644
--- a/interface.c
+++ b/interface.c
@@ -30,6 +30,7 @@ GtkWidget*
 create_mainwin (void)
 {
   GtkWidget *mainwin;
+  GdkPixbuf *mainwin_icon_pixbuf;
   GtkWidget *vbox1;
   GtkWidget *menubar1;
   GtkWidget *menuitem1;
@@ -97,6 +98,12 @@ create_mainwin (void)
   gtk_widget_set_events (mainwin, GDK_KEY_PRESS_MASK);
   gtk_window_set_title (GTK_WINDOW (mainwin), "DeaDBeeF");
   gtk_window_set_default_size (GTK_WINDOW (mainwin), 500, 300);
+  mainwin_icon_pixbuf = create_pixbuf ("play_24.png");
+  if (mainwin_icon_pixbuf)
+    {
+      gtk_window_set_icon (GTK_WINDOW (mainwin), mainwin_icon_pixbuf);
+      gdk_pixbuf_unref (mainwin_icon_pixbuf);
+    }
 
   vbox1 = gtk_vbox_new (FALSE, 0);
   gtk_widget_show (vbox1);
diff --git a/libsidplay2/sidplay-libs-2.1.0/Makefile.am b/libsidplay2/sidplay-libs-2.1.0/Makefile.am
deleted file mode 100644
index f29b4068..00000000
--- a/libsidplay2/sidplay-libs-2.1.0/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-noinst_LIBRARIES = libsidplay2.a
-
-AM_CPPFLAGS = $(CPPFLAGS) -DVERSION=\"2.1.0\" -DHAVE_STRNCASECMP -DHAVE_STRCASECMP -Ilibsidplay -Ilibsidplay/include -Ilibsidplay/include/sidplay -Ilibsidutils/include/sidplay/utils -Ibuilders/resid-builder/include/sidplay/builders -Ibuilders/resid-builder/include -I../include -I ../include
-
-libsidplay2_a_SOURCES = 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\
-libsidplay/src/mixer.cpp\
-libsidplay/src/player.cpp\
-libsidplay/src/mos656x/mos656x.cpp\
-libsidplay/src/mos6510/mos6510.cpp\
-libsidplay/src/sid6526/sid6526.cpp\
-libsidplay/src/sidtune/MUS.cpp\
-libsidplay/src/sidtune/SidTuneTools.cpp\
-libsidplay/src/sidtune/InfoFile.cpp\
-libsidplay/src/sidtune/SidTune.cpp\
-libsidplay/src/sidtune/PSID.cpp\
-libsidplay/src/sidtune/PP20.cpp\
-libsidplay/src/sidtune/IconInfo.cpp\
-libsidplay/src/event.cpp\
-libsidplay/src/psiddrv.cpp\
-libsidplay/src/config.cpp\
-libsidplay/src/sidplay2.cpp\
-libsidplay/src/xsid/xsid.cpp\
-libsidplay/src/mos6526/mos6526.cpp\
-builders/resid-builder/src/resid.cpp\
-builders/resid-builder/src/resid-builder.cpp\
-resid/wave8580_PS_.cc\
-resid/filter.cc\
-resid/pot.cc\
-resid/wave.cc\
-resid/version.cc\
-resid/wave6581__ST.cc\
-resid/extfilt.cc\
-resid/wave8580_PST.cc\
-resid/wave6581_PST.cc\
-resid/wave6581_P_T.cc\
-resid/wave6581_PS_.cc\
-resid/envelope.cc\
-resid/voice.cc\
-resid/sid.cc\
-resid/wave8580__ST.cc\
-resid/wave8580_P_T.cc\
-libsidplay/src/reloc65.c
diff --git a/playlist.c b/playlist.c
index 21dc0c71..bc9f574f 100644
--- a/playlist.c
+++ b/playlist.c
@@ -32,7 +32,6 @@
 #include "messages.h"
 #include "playback.h"
 
-#include "cwav.h"
 #include "cvorbis.h"
 #include "cdumb.h"
 #include "cmp3.h"
diff --git a/libsidplay2/sidplay-libs-2.1.0/Jamfile b/sid/sidplay-libs-2.1.0/Jamfile
index 2244829d..2244829d 100644
--- a/libsidplay2/sidplay-libs-2.1.0/Jamfile
+++ b/sid/sidplay-libs-2.1.0/Jamfile
diff --git a/sid/sidplay-libs-2.1.0/Makefile.am b/sid/sidplay-libs-2.1.0/Makefile.am
new file mode 100644
index 00000000..c081280d
--- /dev/null
+++ b/sid/sidplay-libs-2.1.0/Makefile.am
@@ -0,0 +1,130 @@
+noinst_LIBRARIES = libsidplay2.a
+
+sidpath=@top_srcdir@/sid/sidplay-libs-2.1.0
+
+dist_pkgdata_SIDFILES = \
+	$(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 = $(CPPFLAGS) -DVERSION=\"2.1.0\" -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
+
+libsidplay2_a_SOURCES = 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\
+libsidplay/src/mixer.cpp\
+libsidplay/src/player.cpp\
+libsidplay/src/mos656x/mos656x.cpp\
+libsidplay/src/mos6510/mos6510.cpp\
+libsidplay/src/sid6526/sid6526.cpp\
+libsidplay/src/sidtune/MUS.cpp\
+libsidplay/src/sidtune/SidTuneTools.cpp\
+libsidplay/src/sidtune/InfoFile.cpp\
+libsidplay/src/sidtune/SidTune.cpp\
+libsidplay/src/sidtune/PSID.cpp\
+libsidplay/src/sidtune/PP20.cpp\
+libsidplay/src/sidtune/IconInfo.cpp\
+libsidplay/src/event.cpp\
+libsidplay/src/psiddrv.cpp\
+libsidplay/src/config.cpp\
+libsidplay/src/sidplay2.cpp\
+libsidplay/src/xsid/xsid.cpp\
+libsidplay/src/mos6526/mos6526.cpp\
+builders/resid-builder/src/resid.cpp\
+builders/resid-builder/src/resid-builder.cpp\
+resid/wave8580_PS_.cc\
+resid/filter.cc\
+resid/pot.cc\
+resid/wave.cc\
+resid/version.cc\
+resid/wave6581__ST.cc\
+resid/extfilt.cc\
+resid/wave8580_PST.cc\
+resid/wave6581_PST.cc\
+resid/wave6581_P_T.cc\
+resid/wave6581_PS_.cc\
+resid/envelope.cc\
+resid/voice.cc\
+resid/sid.cc\
+resid/wave8580__ST.cc\
+resid/wave8580_P_T.cc\
+libsidplay/src/reloc65.c\
+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\
+unix/config.h\
+libsidplay/win/VC/sidconfig.h\
+libsidplay/win/VC/sidint.h\
+libsidplay/win/VC/config.h\
+libsidplay/unix/sidconfig.h\
+libsidplay/unix/sidint.h\
+libsidplay/src/xsid/xsid.h\
+libsidplay/src/mos6526/mos6526.h\
+libsidplay/src/sid6526/sid6526.h\
+libsidplay/src/mos656x/mos656x.h\
+libsidplay/src/c64/c64xsid.h\
+libsidplay/src/c64/c64cia.h\
+libsidplay/src/c64/c64vic.h\
+libsidplay/src/nullsid.h\
+libsidplay/src/sidtune/PP20_Defs.h\
+libsidplay/src/sidtune/SidTuneTools.h\
+libsidplay/src/sidtune/SidTuneCfg.h\
+libsidplay/src/sidtune/PP20.h\
+libsidplay/src/mos6510/cycle_based/sid6510c.h\
+libsidplay/src/mos6510/cycle_based/mos6510c.h\
+libsidplay/src/mos6510/mos6510.h\
+libsidplay/src/mos6510/conf6510.h\
+libsidplay/src/mos6510/opcodes.h\
+libsidplay/src/player.h\
+libsidplay/include/sidplay/SmartPtr.h\
+libsidplay/include/sidplay/sidusage.h\
+libsidplay/include/sidplay/sidtypes.h\
+libsidplay/include/sidplay/sidplay2.h\
+libsidplay/include/sidplay/sidconfig.h\
+libsidplay/include/sidplay/SidTune.h\
+libsidplay/include/sidplay/sid2types.h\
+libsidplay/include/sidplay/c64env.h\
+libsidplay/include/sidplay/sidbuilder.h\
+libsidplay/include/sidplay/sidint.h\
+libsidplay/include/sidplay/component.h\
+libsidplay/include/sidplay/event.h\
+libsidplay/include/sidplay/sidendian.h\
+libsidplay/include/sidplay/Buffer.h\
+libsidplay/include/sidenv.h\
+libsidplay/include/config.h\
+builders/resid-builder/win/VC/config.h\
+builders/resid-builder/src/resid-emu.h\
+builders/resid-builder/include/sidplay/builders/resid.h\
+builders/resid-builder/include/config.h\
+resid/voice.h\
+resid/siddefs.h\
+resid/wave.h\
+resid/sid.h\
+resid/filter.h\
+resid/envelope.h\
+resid/spline.h\
+resid/pot.h\
+resid/extfilt.h\
+libsidutils/src/ini/headings.i\
+libsidutils/src/ini/list.i\
+libsidutils/src/ini/keys.i\
+libsidutils/src/ini/types.i\
+libsidplay/src/mos6510/cycle_based/mos6510c.i\
+libsidplay/src/mos6510/cycle_based/sid6510c.i\
+libsidplay/src/kernal.bin\
+libsidplay/src/psiddrv.bin\
+libsidplay/src/poweron.bin
diff --git a/libsidplay2/sidplay-libs-2.1.0/Makefile.in b/sid/sidplay-libs-2.1.0/Makefile.in
index c6cb9c01..2ec0fb95 100644
--- a/libsidplay2/sidplay-libs-2.1.0/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/Makefile.in
@@ -32,7 +32,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = libsidplay2/sidplay-libs-2.1.0
+subdir = sid/sidplay-libs-2.1.0
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -177,7 +177,13 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_LIBRARIES = libsidplay2.a
-AM_CPPFLAGS = $(CPPFLAGS) -DVERSION=\"2.1.0\" -DHAVE_STRNCASECMP -DHAVE_STRCASECMP -Ilibsidplay -Ilibsidplay/include -Ilibsidplay/include/sidplay -Ilibsidutils/include/sidplay/utils -Ibuilders/resid-builder/include/sidplay/builders -Ibuilders/resid-builder/include -I../include -I ../include
+sidpath = @top_srcdir@/sid/sidplay-libs-2.1.0
+dist_pkgdata_SIDFILES = \
+	$(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 = $(CPPFLAGS) -DVERSION=\"2.1.0\" -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
 libsidplay2_a_SOURCES = libsidutils/src/SidDatabase.cpp\
 libsidutils/src/SidFilter.cpp\
 libsidutils/src/SidTuneMod.cpp\
@@ -220,7 +226,83 @@ resid/voice.cc\
 resid/sid.cc\
 resid/wave8580__ST.cc\
 resid/wave8580_P_T.cc\
-libsidplay/src/reloc65.c
+libsidplay/src/reloc65.c\
+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\
+unix/config.h\
+libsidplay/win/VC/sidconfig.h\
+libsidplay/win/VC/sidint.h\
+libsidplay/win/VC/config.h\
+libsidplay/unix/sidconfig.h\
+libsidplay/unix/sidint.h\
+libsidplay/src/xsid/xsid.h\
+libsidplay/src/mos6526/mos6526.h\
+libsidplay/src/sid6526/sid6526.h\
+libsidplay/src/mos656x/mos656x.h\
+libsidplay/src/c64/c64xsid.h\
+libsidplay/src/c64/c64cia.h\
+libsidplay/src/c64/c64vic.h\
+libsidplay/src/nullsid.h\
+libsidplay/src/sidtune/PP20_Defs.h\
+libsidplay/src/sidtune/SidTuneTools.h\
+libsidplay/src/sidtune/SidTuneCfg.h\
+libsidplay/src/sidtune/PP20.h\
+libsidplay/src/mos6510/cycle_based/sid6510c.h\
+libsidplay/src/mos6510/cycle_based/mos6510c.h\
+libsidplay/src/mos6510/mos6510.h\
+libsidplay/src/mos6510/conf6510.h\
+libsidplay/src/mos6510/opcodes.h\
+libsidplay/src/player.h\
+libsidplay/include/sidplay/SmartPtr.h\
+libsidplay/include/sidplay/sidusage.h\
+libsidplay/include/sidplay/sidtypes.h\
+libsidplay/include/sidplay/sidplay2.h\
+libsidplay/include/sidplay/sidconfig.h\
+libsidplay/include/sidplay/SidTune.h\
+libsidplay/include/sidplay/sid2types.h\
+libsidplay/include/sidplay/c64env.h\
+libsidplay/include/sidplay/sidbuilder.h\
+libsidplay/include/sidplay/sidint.h\
+libsidplay/include/sidplay/component.h\
+libsidplay/include/sidplay/event.h\
+libsidplay/include/sidplay/sidendian.h\
+libsidplay/include/sidplay/Buffer.h\
+libsidplay/include/sidenv.h\
+libsidplay/include/config.h\
+builders/resid-builder/win/VC/config.h\
+builders/resid-builder/src/resid-emu.h\
+builders/resid-builder/include/sidplay/builders/resid.h\
+builders/resid-builder/include/config.h\
+resid/voice.h\
+resid/siddefs.h\
+resid/wave.h\
+resid/sid.h\
+resid/filter.h\
+resid/envelope.h\
+resid/spline.h\
+resid/pot.h\
+resid/extfilt.h\
+libsidutils/src/ini/headings.i\
+libsidutils/src/ini/list.i\
+libsidutils/src/ini/keys.i\
+libsidutils/src/ini/types.i\
+libsidplay/src/mos6510/cycle_based/mos6510c.i\
+libsidplay/src/mos6510/cycle_based/sid6510c.i\
+libsidplay/src/kernal.bin\
+libsidplay/src/psiddrv.bin\
+libsidplay/src/poweron.bin
 
 all: all-am
 
@@ -235,9 +317,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libsidplay2/sidplay-libs-2.1.0/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sid/sidplay-libs-2.1.0/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu libsidplay2/sidplay-libs-2.1.0/Makefile
+	  $(AUTOMAKE) --gnu sid/sidplay-libs-2.1.0/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/libsidplay2/sidplay-libs-2.1.0/aclocal.m4 b/sid/sidplay-libs-2.1.0/aclocal.m4
index 1821b632..1821b632 100644
--- a/libsidplay2/sidplay-libs-2.1.0/aclocal.m4
+++ b/sid/sidplay-libs-2.1.0/aclocal.m4
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/Makefile.am b/sid/sidplay-libs-2.1.0/builders/Makefile.am
index 5ba945a7..5ba945a7 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/builders/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/Makefile.in b/sid/sidplay-libs-2.1.0/builders/Makefile.in
index d5047fcf..d5047fcf 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/builders/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/Makefile.am b/sid/sidplay-libs-2.1.0/builders/resid-builder/Makefile.am
index bc2fe8f8..bc2fe8f8 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/Makefile.in b/sid/sidplay-libs-2.1.0/builders/resid-builder/Makefile.in
index a77bf557..a77bf557 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/acinclude.m4 b/sid/sidplay-libs-2.1.0/builders/resid-builder/acinclude.m4
index 5fcfce10..5fcfce10 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/acinclude.m4
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/acinclude.m4
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/aclocal.m4 b/sid/sidplay-libs-2.1.0/builders/resid-builder/aclocal.m4
index 225a39e4..225a39e4 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/aclocal.m4
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/aclocal.m4
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/configure b/sid/sidplay-libs-2.1.0/builders/resid-builder/configure
index 974f641c..974f641c 100755
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/configure
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/configure
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/configure.ac b/sid/sidplay-libs-2.1.0/builders/resid-builder/configure.ac
index 79fc8301..79fc8301 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/configure.ac
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/configure.ac
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/include/Makefile.am b/sid/sidplay-libs-2.1.0/builders/resid-builder/include/Makefile.am
index 1c58b3b9..1c58b3b9 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/include/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/include/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/include/Makefile.in b/sid/sidplay-libs-2.1.0/builders/resid-builder/include/Makefile.in
index 0d13e311..0d13e311 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/include/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/include/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/include/config.h b/sid/sidplay-libs-2.1.0/builders/resid-builder/include/config.h
index ebe9c82f..ebe9c82f 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/include/config.h
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/include/config.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/Makefile.am b/sid/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/Makefile.am
index 82b48e43..82b48e43 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/Makefile.in b/sid/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/Makefile.in
index 49d409e8..49d409e8 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/builders/Makefile.am b/sid/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/builders/Makefile.am
index 4a35e9a7..4a35e9a7 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/builders/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/builders/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/builders/Makefile.in b/sid/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/builders/Makefile.in
index 17314249..17314249 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/builders/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/builders/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/builders/resid.h b/sid/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/builders/resid.h
index aa6ccffa..aa6ccffa 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/builders/resid.h
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/include/sidplay/builders/resid.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/src/Makefile.am b/sid/sidplay-libs-2.1.0/builders/resid-builder/src/Makefile.am
index 74272c4f..74272c4f 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/src/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/src/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/src/Makefile.in b/sid/sidplay-libs-2.1.0/builders/resid-builder/src/Makefile.in
index 9debbaf3..9debbaf3 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/src/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/src/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/src/resid-builder.cpp b/sid/sidplay-libs-2.1.0/builders/resid-builder/src/resid-builder.cpp
index 4c7650f6..4c7650f6 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/src/resid-builder.cpp
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/src/resid-builder.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/src/resid-emu.h b/sid/sidplay-libs-2.1.0/builders/resid-builder/src/resid-emu.h
index fc4e25bc..fc4e25bc 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/src/resid-emu.h
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/src/resid-emu.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/src/resid.cpp b/sid/sidplay-libs-2.1.0/builders/resid-builder/src/resid.cpp
index 41cbdc39..41cbdc39 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/src/resid.cpp
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/src/resid.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/Makefile.am b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/Makefile.am
index dcb940b2..dcb940b2 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/Makefile.in b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/Makefile.in
index d655acf8..d655acf8 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/config.guess b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/config.guess
index f1657bbc..f1657bbc 100755
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/config.guess
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/config.guess
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/config.h.in b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/config.h.in
index 8c158a66..8c158a66 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/config.h.in
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/config.h.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/config.sub b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/config.sub
index 1dea9b79..1dea9b79 100755
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/config.sub
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/config.sub
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/depcomp b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/depcomp
index 807b991f..807b991f 100755
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/depcomp
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/depcomp
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/install-sh b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/install-sh
index 11870f1b..11870f1b 100755
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/install-sh
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/install-sh
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/ltmain.sh b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/ltmain.sh
index c4538260..c4538260 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/ltmain.sh
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/ltmain.sh
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/missing b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/missing
index 6a37006e..6a37006e 100755
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/missing
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/missing
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/mkinstalldirs b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/mkinstalldirs
index d2d5f21b..d2d5f21b 100755
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/mkinstalldirs
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/mkinstalldirs
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/my_macros.m4 b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/my_macros.m4
index bd607f73..bd607f73 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/my_macros.m4
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/my_macros.m4
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/sidplay2.m4 b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/sidplay2.m4
index 123575c6..123575c6 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/unix/sidplay2.m4
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/unix/sidplay2.m4
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/win/VC/config.h b/sid/sidplay-libs-2.1.0/builders/resid-builder/win/VC/config.h
index 87d75e5c..87d75e5c 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/win/VC/config.h
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/win/VC/config.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/win/VC/resid_builder.dsp b/sid/sidplay-libs-2.1.0/builders/resid-builder/win/VC/resid_builder.dsp
index 7ee15fad..7ee15fad 100644
--- a/libsidplay2/sidplay-libs-2.1.0/builders/resid-builder/win/VC/resid_builder.dsp
+++ b/sid/sidplay-libs-2.1.0/builders/resid-builder/win/VC/resid_builder.dsp
diff --git a/libsidplay2/sidplay-libs-2.1.0/configure b/sid/sidplay-libs-2.1.0/configure
index 72305412..72305412 100755
--- a/libsidplay2/sidplay-libs-2.1.0/configure
+++ b/sid/sidplay-libs-2.1.0/configure
diff --git a/libsidplay2/sidplay-libs-2.1.0/configure.ac b/sid/sidplay-libs-2.1.0/configure.ac
index e85773a6..e85773a6 100644
--- a/libsidplay2/sidplay-libs-2.1.0/configure.ac
+++ b/sid/sidplay-libs-2.1.0/configure.ac
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/AUTHORS b/sid/sidplay-libs-2.1.0/libsidplay/AUTHORS
index e2fbdfba..e2fbdfba 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/AUTHORS
+++ b/sid/sidplay-libs-2.1.0/libsidplay/AUTHORS
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/COPYING b/sid/sidplay-libs-2.1.0/libsidplay/COPYING
index eeb586b3..eeb586b3 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/COPYING
+++ b/sid/sidplay-libs-2.1.0/libsidplay/COPYING
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/ChangeLog b/sid/sidplay-libs-2.1.0/libsidplay/ChangeLog
index 7a11e01a..7a11e01a 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/ChangeLog
+++ b/sid/sidplay-libs-2.1.0/libsidplay/ChangeLog
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/INSTALL b/sid/sidplay-libs-2.1.0/libsidplay/INSTALL
index 02a4a074..02a4a074 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/INSTALL
+++ b/sid/sidplay-libs-2.1.0/libsidplay/INSTALL
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/Makefile.am b/sid/sidplay-libs-2.1.0/libsidplay/Makefile.am
index bc2fe8f8..bc2fe8f8 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/libsidplay/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/Makefile.in b/sid/sidplay-libs-2.1.0/libsidplay/Makefile.in
index ad6c5db8..ad6c5db8 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/libsidplay/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/README b/sid/sidplay-libs-2.1.0/libsidplay/README
index afea8f07..afea8f07 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/README
+++ b/sid/sidplay-libs-2.1.0/libsidplay/README
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/TODO b/sid/sidplay-libs-2.1.0/libsidplay/TODO
index 6de32a74..6de32a74 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/TODO
+++ b/sid/sidplay-libs-2.1.0/libsidplay/TODO
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/aclocal.m4 b/sid/sidplay-libs-2.1.0/libsidplay/aclocal.m4
index c5b8eaad..c5b8eaad 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/aclocal.m4
+++ b/sid/sidplay-libs-2.1.0/libsidplay/aclocal.m4
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/configure b/sid/sidplay-libs-2.1.0/libsidplay/configure
index 631d3a38..631d3a38 100755
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/configure
+++ b/sid/sidplay-libs-2.1.0/libsidplay/configure
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/configure.ac b/sid/sidplay-libs-2.1.0/libsidplay/configure.ac
index 0667bf55..0667bf55 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/configure.ac
+++ b/sid/sidplay-libs-2.1.0/libsidplay/configure.ac
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/Makefile.am b/sid/sidplay-libs-2.1.0/libsidplay/include/Makefile.am
index 9ccc23eb..9ccc23eb 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/Makefile.in b/sid/sidplay-libs-2.1.0/libsidplay/include/Makefile.in
index 16cc3cde..16cc3cde 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/config.h b/sid/sidplay-libs-2.1.0/libsidplay/include/config.h
index 2e5c8ba4..2e5c8ba4 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/config.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/config.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidenv.h b/sid/sidplay-libs-2.1.0/libsidplay/include/sidenv.h
index 0f02e31c..0f02e31c 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidenv.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/sidenv.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/Buffer.h b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/Buffer.h
index 8e766e1c..8e766e1c 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/Buffer.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/Buffer.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/Makefile.am b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/Makefile.am
index adb87b6a..adb87b6a 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/Makefile.in b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/Makefile.in
index f19799ca..f19799ca 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/SidTune.h b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/SidTune.h
index f544afb6..f544afb6 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/SidTune.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/SidTune.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/SmartPtr.h b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/SmartPtr.h
index 0cc7c046..0cc7c046 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/SmartPtr.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/SmartPtr.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/c64env.h b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/c64env.h
index 044dd0d0..044dd0d0 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/c64env.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/c64env.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/component.h b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/component.h
index ee8a76c1..ee8a76c1 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/component.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/component.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/event.h b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/event.h
index b89af24e..b89af24e 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/event.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/event.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/sid2types.h b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sid2types.h
index 55cbe75c..55cbe75c 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/sid2types.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sid2types.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidbuilder.h b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidbuilder.h
index 8dde0548..8dde0548 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidbuilder.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidbuilder.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidconfig.h b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidconfig.h
index fa8af23e..fa8af23e 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidconfig.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidconfig.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidendian.h b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidendian.h
index 9fa8582d..9fa8582d 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidendian.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidendian.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidint.h b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidint.h
index c2387d78..c2387d78 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidint.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidint.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidplay2.h b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidplay2.h
index ccb54bca..ccb54bca 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidplay2.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidplay2.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidtypes.h b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidtypes.h
index 788c21ab..788c21ab 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidtypes.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidtypes.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidusage.h b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidusage.h
index 7d35e676..7d35e676 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidusage.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidusage.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/Makefile.am b/sid/sidplay-libs-2.1.0/libsidplay/src/Makefile.am
index 8c586b8b..8c586b8b 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/Makefile.in b/sid/sidplay-libs-2.1.0/libsidplay/src/Makefile.in
index 5475c200..5475c200 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/c64/Makefile.am b/sid/sidplay-libs-2.1.0/libsidplay/src/c64/Makefile.am
index 94d8e182..94d8e182 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/c64/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/c64/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/c64/Makefile.in b/sid/sidplay-libs-2.1.0/libsidplay/src/c64/Makefile.in
index a9a93154..a9a93154 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/c64/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/c64/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/c64/c64cia.h b/sid/sidplay-libs-2.1.0/libsidplay/src/c64/c64cia.h
index b9626405..b9626405 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/c64/c64cia.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/c64/c64cia.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/c64/c64vic.h b/sid/sidplay-libs-2.1.0/libsidplay/src/c64/c64vic.h
index d9b2f934..d9b2f934 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/c64/c64vic.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/c64/c64vic.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/c64/c64xsid.h b/sid/sidplay-libs-2.1.0/libsidplay/src/c64/c64xsid.h
index e8385adb..e8385adb 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/c64/c64xsid.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/c64/c64xsid.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/config.cpp b/sid/sidplay-libs-2.1.0/libsidplay/src/config.cpp
index 0b4a71da..0b4a71da 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/config.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/config.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/event.cpp b/sid/sidplay-libs-2.1.0/libsidplay/src/event.cpp
index ced11c38..ced11c38 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/event.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/event.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/kernal.bin b/sid/sidplay-libs-2.1.0/libsidplay/src/kernal.bin
index 301badb1..301badb1 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/kernal.bin
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/kernal.bin
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mixer.cpp b/sid/sidplay-libs-2.1.0/libsidplay/src/mixer.cpp
index c7703dc1..c7703dc1 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mixer.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/mixer.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6510/Makefile.am b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/Makefile.am
index 27acc569..27acc569 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6510/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6510/Makefile.in b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/Makefile.in
index 9af93a74..9af93a74 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6510/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6510/conf6510.h b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/conf6510.h
index 6a1ea0bd..6a1ea0bd 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6510/conf6510.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/conf6510.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/mos6510c.h b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/mos6510c.h
index 9a046d2e..9a046d2e 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/mos6510c.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/mos6510c.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/mos6510c.i b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/mos6510c.i
index 78d57ba6..78d57ba6 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/mos6510c.i
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/mos6510c.i
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/sid6510c.h b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/sid6510c.h
index 49d96dd6..49d96dd6 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/sid6510c.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/sid6510c.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/sid6510c.i b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/sid6510c.i
index bc573d3b..bc573d3b 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/sid6510c.i
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/cycle_based/sid6510c.i
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6510/mos6510.cpp b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/mos6510.cpp
index 74b09c95..74b09c95 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6510/mos6510.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/mos6510.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6510/mos6510.h b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/mos6510.h
index e7ad1a3f..e7ad1a3f 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6510/mos6510.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/mos6510.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6510/opcodes.h b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/opcodes.h
index e4d44acd..e4d44acd 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6510/opcodes.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6510/opcodes.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6526/Makefile.am b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6526/Makefile.am
index e5029df5..e5029df5 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6526/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6526/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6526/Makefile.in b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6526/Makefile.in
index 8f1667ec..8f1667ec 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6526/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6526/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6526/mos6526.cpp b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6526/mos6526.cpp
index 32b6f1f2..32b6f1f2 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6526/mos6526.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6526/mos6526.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6526/mos6526.h b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6526/mos6526.h
index 5fa11bcf..5fa11bcf 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos6526/mos6526.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/mos6526/mos6526.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos656x/Makefile.am b/sid/sidplay-libs-2.1.0/libsidplay/src/mos656x/Makefile.am
index 7a228bca..7a228bca 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos656x/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/mos656x/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos656x/Makefile.in b/sid/sidplay-libs-2.1.0/libsidplay/src/mos656x/Makefile.in
index eeeea606..eeeea606 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos656x/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/mos656x/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos656x/mos656x.cpp b/sid/sidplay-libs-2.1.0/libsidplay/src/mos656x/mos656x.cpp
index a7e03642..a7e03642 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos656x/mos656x.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/mos656x/mos656x.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos656x/mos656x.h b/sid/sidplay-libs-2.1.0/libsidplay/src/mos656x/mos656x.h
index 7cf9867e..7cf9867e 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/mos656x/mos656x.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/mos656x/mos656x.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/nullsid.h b/sid/sidplay-libs-2.1.0/libsidplay/src/nullsid.h
index 7865d9e9..7865d9e9 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/nullsid.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/nullsid.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/player.cpp b/sid/sidplay-libs-2.1.0/libsidplay/src/player.cpp
index 38b612c0..38b612c0 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/player.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/player.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/player.h b/sid/sidplay-libs-2.1.0/libsidplay/src/player.h
index e50a3412..e50a3412 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/player.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/player.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/poweron.bin b/sid/sidplay-libs-2.1.0/libsidplay/src/poweron.bin
index b5850151..b5850151 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/poweron.bin
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/poweron.bin
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/psiddrv.a65 b/sid/sidplay-libs-2.1.0/libsidplay/src/psiddrv.a65
index 8d269662..8d269662 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/psiddrv.a65
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/psiddrv.a65
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/psiddrv.bin b/sid/sidplay-libs-2.1.0/libsidplay/src/psiddrv.bin
index a7e8ae05..a7e8ae05 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/psiddrv.bin
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/psiddrv.bin
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/psiddrv.cpp b/sid/sidplay-libs-2.1.0/libsidplay/src/psiddrv.cpp
index 5a8cf894..5a8cf894 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/psiddrv.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/psiddrv.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/reloc65.c b/sid/sidplay-libs-2.1.0/libsidplay/src/reloc65.c
index 3c732a39..3c732a39 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/reloc65.c
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/reloc65.c
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sid6526/Makefile.am b/sid/sidplay-libs-2.1.0/libsidplay/src/sid6526/Makefile.am
index 8b282820..8b282820 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sid6526/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/sid6526/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sid6526/Makefile.in b/sid/sidplay-libs-2.1.0/libsidplay/src/sid6526/Makefile.in
index ef5bdb03..ef5bdb03 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sid6526/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/sid6526/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sid6526/sid6526.cpp b/sid/sidplay-libs-2.1.0/libsidplay/src/sid6526/sid6526.cpp
index 8737f7f0..8737f7f0 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sid6526/sid6526.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/sid6526/sid6526.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sid6526/sid6526.h b/sid/sidplay-libs-2.1.0/libsidplay/src/sid6526/sid6526.h
index d92c230c..d92c230c 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sid6526/sid6526.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/sid6526/sid6526.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidplay2.cpp b/sid/sidplay-libs-2.1.0/libsidplay/src/sidplay2.cpp
index e3535ddb..e3535ddb 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidplay2.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/sidplay2.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/IconInfo.cpp b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/IconInfo.cpp
index 37717694..37717694 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/IconInfo.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/IconInfo.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/InfoFile.cpp b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/InfoFile.cpp
index 18e6d1b8..18e6d1b8 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/InfoFile.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/InfoFile.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/MUS.cpp b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/MUS.cpp
index 16ea8fe9..16ea8fe9 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/MUS.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/MUS.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/Makefile.am b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/Makefile.am
index e1c06822..e1c06822 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/Makefile.in b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/Makefile.in
index bb5a7c27..bb5a7c27 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/PP20.cpp b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/PP20.cpp
index 8bec5cfe..8bec5cfe 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/PP20.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/PP20.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/PP20.h b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/PP20.h
index 74e7f5f7..74e7f5f7 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/PP20.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/PP20.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/PP20_Defs.h b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/PP20_Defs.h
index 9e3b345b..9e3b345b 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/PP20_Defs.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/PP20_Defs.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/PSID.cpp b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/PSID.cpp
index 0cc96969..0cc96969 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/PSID.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/PSID.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTune.cpp b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTune.cpp
index 29638775..29638775 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTune.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTune.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTuneCfg.h b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTuneCfg.h
index 7b184156..7b184156 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTuneCfg.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTuneCfg.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTuneTools.cpp b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTuneTools.cpp
index 79bf1597..79bf1597 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTuneTools.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTuneTools.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTuneTools.h b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTuneTools.h
index bc67fa93..bc67fa93 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTuneTools.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/sidtune/SidTuneTools.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/xsid/Makefile.am b/sid/sidplay-libs-2.1.0/libsidplay/src/xsid/Makefile.am
index 4c7caf6a..4c7caf6a 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/xsid/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/xsid/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/xsid/Makefile.in b/sid/sidplay-libs-2.1.0/libsidplay/src/xsid/Makefile.in
index aafad807..aafad807 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/xsid/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/xsid/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/xsid/xsid.cpp b/sid/sidplay-libs-2.1.0/libsidplay/src/xsid/xsid.cpp
index 29b5c909..29b5c909 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/xsid/xsid.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/xsid/xsid.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/xsid/xsid.h b/sid/sidplay-libs-2.1.0/libsidplay/src/xsid/xsid.h
index 98171d73..98171d73 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/src/xsid/xsid.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/src/xsid/xsid.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/Makefile.am b/sid/sidplay-libs-2.1.0/libsidplay/unix/Makefile.am
index 804c3d38..804c3d38 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/libsidplay/unix/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/Makefile.in b/sid/sidplay-libs-2.1.0/libsidplay/unix/Makefile.in
index 6102c2f7..6102c2f7 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/libsidplay/unix/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/ac_compile_check_sizeof.m4 b/sid/sidplay-libs-2.1.0/libsidplay/unix/ac_compile_check_sizeof.m4
index 8ada30a5..8ada30a5 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/ac_compile_check_sizeof.m4
+++ b/sid/sidplay-libs-2.1.0/libsidplay/unix/ac_compile_check_sizeof.m4
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/ac_create_stdint_h.m4 b/sid/sidplay-libs-2.1.0/libsidplay/unix/ac_create_stdint_h.m4
index 0e807324..0e807324 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/ac_create_stdint_h.m4
+++ b/sid/sidplay-libs-2.1.0/libsidplay/unix/ac_create_stdint_h.m4
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/config.guess b/sid/sidplay-libs-2.1.0/libsidplay/unix/config.guess
index f1657bbc..f1657bbc 100755
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/config.guess
+++ b/sid/sidplay-libs-2.1.0/libsidplay/unix/config.guess
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/config.h.in b/sid/sidplay-libs-2.1.0/libsidplay/unix/config.h.in
index 1f42ded5..1f42ded5 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/config.h.in
+++ b/sid/sidplay-libs-2.1.0/libsidplay/unix/config.h.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/config.sub b/sid/sidplay-libs-2.1.0/libsidplay/unix/config.sub
index 1dea9b79..1dea9b79 100755
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/config.sub
+++ b/sid/sidplay-libs-2.1.0/libsidplay/unix/config.sub
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/depcomp b/sid/sidplay-libs-2.1.0/libsidplay/unix/depcomp
index 807b991f..807b991f 100755
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/depcomp
+++ b/sid/sidplay-libs-2.1.0/libsidplay/unix/depcomp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/install-sh b/sid/sidplay-libs-2.1.0/libsidplay/unix/install-sh
index 11870f1b..11870f1b 100755
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/install-sh
+++ b/sid/sidplay-libs-2.1.0/libsidplay/unix/install-sh
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/libsidplay2.pc.in b/sid/sidplay-libs-2.1.0/libsidplay/unix/libsidplay2.pc.in
index 33596988..33596988 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/libsidplay2.pc.in
+++ b/sid/sidplay-libs-2.1.0/libsidplay/unix/libsidplay2.pc.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/libsidplay2.spec b/sid/sidplay-libs-2.1.0/libsidplay/unix/libsidplay2.spec
index 7f6859f4..7f6859f4 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/libsidplay2.spec
+++ b/sid/sidplay-libs-2.1.0/libsidplay/unix/libsidplay2.spec
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/libsidplay2.spec.in b/sid/sidplay-libs-2.1.0/libsidplay/unix/libsidplay2.spec.in
index 518c9973..518c9973 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/libsidplay2.spec.in
+++ b/sid/sidplay-libs-2.1.0/libsidplay/unix/libsidplay2.spec.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/ltmain.sh b/sid/sidplay-libs-2.1.0/libsidplay/unix/ltmain.sh
index c4538260..c4538260 100755
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/ltmain.sh
+++ b/sid/sidplay-libs-2.1.0/libsidplay/unix/ltmain.sh
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/missing b/sid/sidplay-libs-2.1.0/libsidplay/unix/missing
index 6a37006e..6a37006e 100755
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/missing
+++ b/sid/sidplay-libs-2.1.0/libsidplay/unix/missing
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/mkinstalldirs b/sid/sidplay-libs-2.1.0/libsidplay/unix/mkinstalldirs
index e6826388..e6826388 100755
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/mkinstalldirs
+++ b/sid/sidplay-libs-2.1.0/libsidplay/unix/mkinstalldirs
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/my_macros.m4 b/sid/sidplay-libs-2.1.0/libsidplay/unix/my_macros.m4
index bd607f73..bd607f73 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/my_macros.m4
+++ b/sid/sidplay-libs-2.1.0/libsidplay/unix/my_macros.m4
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/sidconfig.h b/sid/sidplay-libs-2.1.0/libsidplay/unix/sidconfig.h
index 6a111853..6a111853 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/sidconfig.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/unix/sidconfig.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/sidconfig.h.in b/sid/sidplay-libs-2.1.0/libsidplay/unix/sidconfig.h.in
index b9c82441..b9c82441 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/sidconfig.h.in
+++ b/sid/sidplay-libs-2.1.0/libsidplay/unix/sidconfig.h.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/sidint.h b/sid/sidplay-libs-2.1.0/libsidplay/unix/sidint.h
index 9110ca49..9110ca49 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/unix/sidint.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/unix/sidint.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/win/VC/config.h b/sid/sidplay-libs-2.1.0/libsidplay/win/VC/config.h
index 553737ed..553737ed 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/win/VC/config.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/win/VC/config.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/win/VC/libsidplay.dsp b/sid/sidplay-libs-2.1.0/libsidplay/win/VC/libsidplay.dsp
index 7722eb4c..7722eb4c 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/win/VC/libsidplay.dsp
+++ b/sid/sidplay-libs-2.1.0/libsidplay/win/VC/libsidplay.dsp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/win/VC/sidconfig.h b/sid/sidplay-libs-2.1.0/libsidplay/win/VC/sidconfig.h
index 024aeeac..024aeeac 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/win/VC/sidconfig.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/win/VC/sidconfig.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidplay/win/VC/sidint.h b/sid/sidplay-libs-2.1.0/libsidplay/win/VC/sidint.h
index b0776d16..b0776d16 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidplay/win/VC/sidint.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/win/VC/sidint.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/AUTHORS b/sid/sidplay-libs-2.1.0/libsidutils/AUTHORS
index 86de71c6..86de71c6 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/AUTHORS
+++ b/sid/sidplay-libs-2.1.0/libsidutils/AUTHORS
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/COPYING b/sid/sidplay-libs-2.1.0/libsidutils/COPYING
index aa0aea5b..aa0aea5b 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/COPYING
+++ b/sid/sidplay-libs-2.1.0/libsidutils/COPYING
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/ChangeLog b/sid/sidplay-libs-2.1.0/libsidutils/ChangeLog
index 555ef0b9..555ef0b9 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/ChangeLog
+++ b/sid/sidplay-libs-2.1.0/libsidutils/ChangeLog
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/INSTALL b/sid/sidplay-libs-2.1.0/libsidutils/INSTALL
index 02a4a074..02a4a074 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/INSTALL
+++ b/sid/sidplay-libs-2.1.0/libsidutils/INSTALL
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/Makefile.am b/sid/sidplay-libs-2.1.0/libsidutils/Makefile.am
index bc2fe8f8..bc2fe8f8 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/libsidutils/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/Makefile.in b/sid/sidplay-libs-2.1.0/libsidutils/Makefile.in
index e39aed30..e39aed30 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/libsidutils/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/README b/sid/sidplay-libs-2.1.0/libsidutils/README
index b23614bd..b23614bd 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/README
+++ b/sid/sidplay-libs-2.1.0/libsidutils/README
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/TODO b/sid/sidplay-libs-2.1.0/libsidutils/TODO
index 688b0746..688b0746 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/TODO
+++ b/sid/sidplay-libs-2.1.0/libsidutils/TODO
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/aclocal.m4 b/sid/sidplay-libs-2.1.0/libsidutils/aclocal.m4
index 7b718771..7b718771 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/aclocal.m4
+++ b/sid/sidplay-libs-2.1.0/libsidutils/aclocal.m4
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/configure b/sid/sidplay-libs-2.1.0/libsidutils/configure
index 7c226169..7c226169 100755
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/configure
+++ b/sid/sidplay-libs-2.1.0/libsidutils/configure
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/configure.ac b/sid/sidplay-libs-2.1.0/libsidutils/configure.ac
index 845c2630..845c2630 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/configure.ac
+++ b/sid/sidplay-libs-2.1.0/libsidutils/configure.ac
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/Makefile.am b/sid/sidplay-libs-2.1.0/libsidutils/include/Makefile.am
index 1c58b3b9..1c58b3b9 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/libsidutils/include/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/Makefile.in b/sid/sidplay-libs-2.1.0/libsidutils/include/Makefile.in
index 20bc9137..20bc9137 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/libsidutils/include/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/config.h b/sid/sidplay-libs-2.1.0/libsidutils/include/config.h
index 21653356..21653356 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/config.h
+++ b/sid/sidplay-libs-2.1.0/libsidutils/include/config.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/sidplay/Makefile.am b/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/Makefile.am
index 97b7b2b3..97b7b2b3 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/sidplay/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/sidplay/Makefile.in b/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/Makefile.in
index bcb71602..bcb71602 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/sidplay/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/Makefile.am b/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/Makefile.am
index 5337a9a2..5337a9a2 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/Makefile.in b/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/Makefile.in
index 223aada3..223aada3 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidDatabase.h b/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidDatabase.h
index e16932a2..e16932a2 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidDatabase.h
+++ b/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidDatabase.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidFilter.h b/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidFilter.h
index db52aa01..db52aa01 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidFilter.h
+++ b/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidFilter.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidTuneMod.h b/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidTuneMod.h
index 4355f3a0..4355f3a0 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidTuneMod.h
+++ b/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidTuneMod.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidUsage.h b/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidUsage.h
index 77e63708..77e63708 100755
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidUsage.h
+++ b/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/SidUsage.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/libini.h b/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/libini.h
index 798dfe8e..798dfe8e 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/libini.h
+++ b/sid/sidplay-libs-2.1.0/libsidutils/include/sidplay/utils/libini.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/MD5/MD5.cpp b/sid/sidplay-libs-2.1.0/libsidutils/src/MD5/MD5.cpp
index acb7e42f..acb7e42f 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/MD5/MD5.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/MD5/MD5.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/MD5/MD5.h b/sid/sidplay-libs-2.1.0/libsidutils/src/MD5/MD5.h
index 7ced54f7..7ced54f7 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/MD5/MD5.h
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/MD5/MD5.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/MD5/MD5_Defs.h b/sid/sidplay-libs-2.1.0/libsidutils/src/MD5/MD5_Defs.h
index 77dca881..77dca881 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/MD5/MD5_Defs.h
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/MD5/MD5_Defs.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/MD5/Makefile.am b/sid/sidplay-libs-2.1.0/libsidutils/src/MD5/Makefile.am
index 010f6f79..010f6f79 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/MD5/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/MD5/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/MD5/Makefile.in b/sid/sidplay-libs-2.1.0/libsidutils/src/MD5/Makefile.in
index c72e248b..c72e248b 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/MD5/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/MD5/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/Makefile.am b/sid/sidplay-libs-2.1.0/libsidutils/src/Makefile.am
index 448412ed..448412ed 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/Makefile.in b/sid/sidplay-libs-2.1.0/libsidutils/src/Makefile.in
index 5e35304b..5e35304b 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/SidDatabase.cpp b/sid/sidplay-libs-2.1.0/libsidutils/src/SidDatabase.cpp
index 20dd20b3..20dd20b3 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/SidDatabase.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/SidDatabase.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/SidFilter.cpp b/sid/sidplay-libs-2.1.0/libsidutils/src/SidFilter.cpp
index 1d9b35ea..1d9b35ea 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/SidFilter.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/SidFilter.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/SidTuneMod.cpp b/sid/sidplay-libs-2.1.0/libsidutils/src/SidTuneMod.cpp
index 6af33350..6af33350 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/SidTuneMod.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/SidTuneMod.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/SidUsage.cpp b/sid/sidplay-libs-2.1.0/libsidutils/src/SidUsage.cpp
index abeb085d..abeb085d 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/SidUsage.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/SidUsage.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/Makefile.am b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/Makefile.am
index 9afbd7db..9afbd7db 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/Makefile.in b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/Makefile.in
index a7e5247f..a7e5247f 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/headings.h b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/headings.h
index 2f7fcf74..2f7fcf74 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/headings.h
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/headings.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/headings.i b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/headings.i
index 11833a99..11833a99 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/headings.i
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/headings.i
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/ini.cpp b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/ini.cpp
index b7d39362..b7d39362 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/ini.cpp
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/ini.cpp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/ini.h b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/ini.h
index bc622cba..bc622cba 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/ini.h
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/ini.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/keys.h b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/keys.h
index 2bef0ff4..2bef0ff4 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/keys.h
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/keys.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/keys.i b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/keys.i
index 5507b95d..5507b95d 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/keys.i
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/keys.i
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/list.h b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/list.h
index 9e7f88e4..9e7f88e4 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/list.h
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/list.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/list.i b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/list.i
index 57f6011d..57f6011d 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/list.i
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/list.i
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/types.i b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/types.i
index a59d0dbf..a59d0dbf 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/ini/types.i
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/ini/types.i
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/smm0.h b/sid/sidplay-libs-2.1.0/libsidutils/src/smm0.h
index fca61092..fca61092 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/src/smm0.h
+++ b/sid/sidplay-libs-2.1.0/libsidutils/src/smm0.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/Makefile.am b/sid/sidplay-libs-2.1.0/libsidutils/unix/Makefile.am
index 0297d7f8..0297d7f8 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/libsidutils/unix/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/Makefile.in b/sid/sidplay-libs-2.1.0/libsidutils/unix/Makefile.in
index 69c47c44..69c47c44 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/libsidutils/unix/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/config.guess b/sid/sidplay-libs-2.1.0/libsidutils/unix/config.guess
index f1657bbc..f1657bbc 100755
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/config.guess
+++ b/sid/sidplay-libs-2.1.0/libsidutils/unix/config.guess
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/config.h.in b/sid/sidplay-libs-2.1.0/libsidutils/unix/config.h.in
index 5e123d10..5e123d10 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/config.h.in
+++ b/sid/sidplay-libs-2.1.0/libsidutils/unix/config.h.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/config.sub b/sid/sidplay-libs-2.1.0/libsidutils/unix/config.sub
index 1dea9b79..1dea9b79 100755
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/config.sub
+++ b/sid/sidplay-libs-2.1.0/libsidutils/unix/config.sub
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/depcomp b/sid/sidplay-libs-2.1.0/libsidutils/unix/depcomp
index 807b991f..807b991f 100755
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/depcomp
+++ b/sid/sidplay-libs-2.1.0/libsidutils/unix/depcomp
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/install-sh b/sid/sidplay-libs-2.1.0/libsidutils/unix/install-sh
index 11870f1b..11870f1b 100755
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/install-sh
+++ b/sid/sidplay-libs-2.1.0/libsidutils/unix/install-sh
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/libsidutils.pc.in b/sid/sidplay-libs-2.1.0/libsidutils/unix/libsidutils.pc.in
index bb2fed73..bb2fed73 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/libsidutils.pc.in
+++ b/sid/sidplay-libs-2.1.0/libsidutils/unix/libsidutils.pc.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/libsidutils.spec b/sid/sidplay-libs-2.1.0/libsidutils/unix/libsidutils.spec
index 4337cd46..4337cd46 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/libsidutils.spec
+++ b/sid/sidplay-libs-2.1.0/libsidutils/unix/libsidutils.spec
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/libsidutils.spec.in b/sid/sidplay-libs-2.1.0/libsidutils/unix/libsidutils.spec.in
index 7ce8b921..7ce8b921 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/libsidutils.spec.in
+++ b/sid/sidplay-libs-2.1.0/libsidutils/unix/libsidutils.spec.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/ltmain.sh b/sid/sidplay-libs-2.1.0/libsidutils/unix/ltmain.sh
index c4538260..c4538260 100755
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/ltmain.sh
+++ b/sid/sidplay-libs-2.1.0/libsidutils/unix/ltmain.sh
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/missing b/sid/sidplay-libs-2.1.0/libsidutils/unix/missing
index 6a37006e..6a37006e 100755
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/missing
+++ b/sid/sidplay-libs-2.1.0/libsidutils/unix/missing
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/mkinstalldirs b/sid/sidplay-libs-2.1.0/libsidutils/unix/mkinstalldirs
index d2d5f21b..d2d5f21b 100755
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/mkinstalldirs
+++ b/sid/sidplay-libs-2.1.0/libsidutils/unix/mkinstalldirs
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/my_macros.m4 b/sid/sidplay-libs-2.1.0/libsidutils/unix/my_macros.m4
index bd607f73..bd607f73 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/my_macros.m4
+++ b/sid/sidplay-libs-2.1.0/libsidutils/unix/my_macros.m4
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/sidplay2.m4 b/sid/sidplay-libs-2.1.0/libsidutils/unix/sidplay2.m4
index 123575c6..123575c6 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/unix/sidplay2.m4
+++ b/sid/sidplay-libs-2.1.0/libsidutils/unix/sidplay2.m4
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/win/VC/config.h b/sid/sidplay-libs-2.1.0/libsidutils/win/VC/config.h
index be69c2bc..be69c2bc 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/win/VC/config.h
+++ b/sid/sidplay-libs-2.1.0/libsidutils/win/VC/config.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/libsidutils/win/VC/libsidutils.dsp b/sid/sidplay-libs-2.1.0/libsidutils/win/VC/libsidutils.dsp
index ae408746..ae408746 100644
--- a/libsidplay2/sidplay-libs-2.1.0/libsidutils/win/VC/libsidutils.dsp
+++ b/sid/sidplay-libs-2.1.0/libsidutils/win/VC/libsidutils.dsp
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/AUTHORS b/sid/sidplay-libs-2.1.0/resid/AUTHORS
index d22e33d5..d22e33d5 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/AUTHORS
+++ b/sid/sidplay-libs-2.1.0/resid/AUTHORS
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/COPYING b/sid/sidplay-libs-2.1.0/resid/COPYING
index eeb586b3..eeb586b3 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/COPYING
+++ b/sid/sidplay-libs-2.1.0/resid/COPYING
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/ChangeLog b/sid/sidplay-libs-2.1.0/resid/ChangeLog
index c1735aaf..c1735aaf 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/ChangeLog
+++ b/sid/sidplay-libs-2.1.0/resid/ChangeLog
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/INSTALL b/sid/sidplay-libs-2.1.0/resid/INSTALL
index 9f743ca4..9f743ca4 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/INSTALL
+++ b/sid/sidplay-libs-2.1.0/resid/INSTALL
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/Makefile.am b/sid/sidplay-libs-2.1.0/resid/Makefile.am
index f83377a0..f83377a0 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/resid/Makefile.am
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/Makefile.in b/sid/sidplay-libs-2.1.0/resid/Makefile.in
index 6c6001f6..6c6001f6 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/Makefile.in
+++ b/sid/sidplay-libs-2.1.0/resid/Makefile.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/NEWS b/sid/sidplay-libs-2.1.0/resid/NEWS
index 2f9f3c42..2f9f3c42 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/NEWS
+++ b/sid/sidplay-libs-2.1.0/resid/NEWS
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/README b/sid/sidplay-libs-2.1.0/resid/README
index 8967f5d2..8967f5d2 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/README
+++ b/sid/sidplay-libs-2.1.0/resid/README
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/THANKS b/sid/sidplay-libs-2.1.0/resid/THANKS
index f65a075f..f65a075f 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/THANKS
+++ b/sid/sidplay-libs-2.1.0/resid/THANKS
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/TODO b/sid/sidplay-libs-2.1.0/resid/TODO
index 4527dfa5..4527dfa5 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/TODO
+++ b/sid/sidplay-libs-2.1.0/resid/TODO
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/aclocal.m4 b/sid/sidplay-libs-2.1.0/resid/aclocal.m4
index 7a0844fe..7a0844fe 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/aclocal.m4
+++ b/sid/sidplay-libs-2.1.0/resid/aclocal.m4
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/config.guess b/sid/sidplay-libs-2.1.0/resid/config.guess
index ba661651..ba661651 100755
--- a/libsidplay2/sidplay-libs-2.1.0/resid/config.guess
+++ b/sid/sidplay-libs-2.1.0/resid/config.guess
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/config.sub b/sid/sidplay-libs-2.1.0/resid/config.sub
index a06a480a..a06a480a 100755
--- a/libsidplay2/sidplay-libs-2.1.0/resid/config.sub
+++ b/sid/sidplay-libs-2.1.0/resid/config.sub
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/configure b/sid/sidplay-libs-2.1.0/resid/configure
index 769ba94b..769ba94b 100755
--- a/libsidplay2/sidplay-libs-2.1.0/resid/configure
+++ b/sid/sidplay-libs-2.1.0/resid/configure
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/configure.in b/sid/sidplay-libs-2.1.0/resid/configure.in
index 2d3413be..2d3413be 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/configure.in
+++ b/sid/sidplay-libs-2.1.0/resid/configure.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/depcomp b/sid/sidplay-libs-2.1.0/resid/depcomp
index 65899658..65899658 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/depcomp
+++ b/sid/sidplay-libs-2.1.0/resid/depcomp
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/envelope.cc b/sid/sidplay-libs-2.1.0/resid/envelope.cc
index a4bbd511..a4bbd511 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/envelope.cc
+++ b/sid/sidplay-libs-2.1.0/resid/envelope.cc
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/envelope.h b/sid/sidplay-libs-2.1.0/resid/envelope.h
index d0b528ff..d0b528ff 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/envelope.h
+++ b/sid/sidplay-libs-2.1.0/resid/envelope.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/extfilt.cc b/sid/sidplay-libs-2.1.0/resid/extfilt.cc
index 461cdaf7..461cdaf7 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/extfilt.cc
+++ b/sid/sidplay-libs-2.1.0/resid/extfilt.cc
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/extfilt.h b/sid/sidplay-libs-2.1.0/resid/extfilt.h
index 84c204ef..84c204ef 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/extfilt.h
+++ b/sid/sidplay-libs-2.1.0/resid/extfilt.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/filter.cc b/sid/sidplay-libs-2.1.0/resid/filter.cc
index 9ca793e0..9ca793e0 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/filter.cc
+++ b/sid/sidplay-libs-2.1.0/resid/filter.cc
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/filter.h b/sid/sidplay-libs-2.1.0/resid/filter.h
index 7db4f31c..7db4f31c 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/filter.h
+++ b/sid/sidplay-libs-2.1.0/resid/filter.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/install-sh b/sid/sidplay-libs-2.1.0/resid/install-sh
index e9de2384..e9de2384 100755
--- a/libsidplay2/sidplay-libs-2.1.0/resid/install-sh
+++ b/sid/sidplay-libs-2.1.0/resid/install-sh
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/ltmain.sh b/sid/sidplay-libs-2.1.0/resid/ltmain.sh
index 2393e14d..2393e14d 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/ltmain.sh
+++ b/sid/sidplay-libs-2.1.0/resid/ltmain.sh
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/missing b/sid/sidplay-libs-2.1.0/resid/missing
index d46f79f6..d46f79f6 100755
--- a/libsidplay2/sidplay-libs-2.1.0/resid/missing
+++ b/sid/sidplay-libs-2.1.0/resid/missing
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/mkinstalldirs b/sid/sidplay-libs-2.1.0/resid/mkinstalldirs
index 4f58503e..4f58503e 100755
--- a/libsidplay2/sidplay-libs-2.1.0/resid/mkinstalldirs
+++ b/sid/sidplay-libs-2.1.0/resid/mkinstalldirs
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/pot.cc b/sid/sidplay-libs-2.1.0/resid/pot.cc
index 805f9a7c..805f9a7c 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/pot.cc
+++ b/sid/sidplay-libs-2.1.0/resid/pot.cc
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/pot.h b/sid/sidplay-libs-2.1.0/resid/pot.h
index e61c2238..e61c2238 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/pot.h
+++ b/sid/sidplay-libs-2.1.0/resid/pot.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/samp2src.pl b/sid/sidplay-libs-2.1.0/resid/samp2src.pl
index 0313e1df..0313e1df 100755
--- a/libsidplay2/sidplay-libs-2.1.0/resid/samp2src.pl
+++ b/sid/sidplay-libs-2.1.0/resid/samp2src.pl
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/sid.cc b/sid/sidplay-libs-2.1.0/resid/sid.cc
index f3cd02a3..f3cd02a3 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/sid.cc
+++ b/sid/sidplay-libs-2.1.0/resid/sid.cc
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/sid.h b/sid/sidplay-libs-2.1.0/resid/sid.h
index 33754547..33754547 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/sid.h
+++ b/sid/sidplay-libs-2.1.0/resid/sid.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/siddefs.h b/sid/sidplay-libs-2.1.0/resid/siddefs.h
index 9889e946..9889e946 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/siddefs.h
+++ b/sid/sidplay-libs-2.1.0/resid/siddefs.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/siddefs.h.in b/sid/sidplay-libs-2.1.0/resid/siddefs.h.in
index e5634924..e5634924 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/siddefs.h.in
+++ b/sid/sidplay-libs-2.1.0/resid/siddefs.h.in
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/spline.h b/sid/sidplay-libs-2.1.0/resid/spline.h
index a4871a3c..a4871a3c 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/spline.h
+++ b/sid/sidplay-libs-2.1.0/resid/spline.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/version.cc b/sid/sidplay-libs-2.1.0/resid/version.cc
index ebb0e607..ebb0e607 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/version.cc
+++ b/sid/sidplay-libs-2.1.0/resid/version.cc
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/voice.cc b/sid/sidplay-libs-2.1.0/resid/voice.cc
index 049e0530..049e0530 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/voice.cc
+++ b/sid/sidplay-libs-2.1.0/resid/voice.cc
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/voice.h b/sid/sidplay-libs-2.1.0/resid/voice.h
index 77f8b443..77f8b443 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/voice.h
+++ b/sid/sidplay-libs-2.1.0/resid/voice.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/wave.cc b/sid/sidplay-libs-2.1.0/resid/wave.cc
index 6f5ec5dd..6f5ec5dd 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/wave.cc
+++ b/sid/sidplay-libs-2.1.0/resid/wave.cc
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/wave.h b/sid/sidplay-libs-2.1.0/resid/wave.h
index 6d4f90ed..6d4f90ed 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/wave.h
+++ b/sid/sidplay-libs-2.1.0/resid/wave.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/wave6581_PST.cc b/sid/sidplay-libs-2.1.0/resid/wave6581_PST.cc
index 37b54734..37b54734 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/wave6581_PST.cc
+++ b/sid/sidplay-libs-2.1.0/resid/wave6581_PST.cc
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/wave6581_PST.dat b/sid/sidplay-libs-2.1.0/resid/wave6581_PST.dat
index 5afe75e2..5afe75e2 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/wave6581_PST.dat
+++ b/sid/sidplay-libs-2.1.0/resid/wave6581_PST.dat
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/wave6581_PS_.cc b/sid/sidplay-libs-2.1.0/resid/wave6581_PS_.cc
index 9304df8c..9304df8c 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/wave6581_PS_.cc
+++ b/sid/sidplay-libs-2.1.0/resid/wave6581_PS_.cc
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/wave6581_PS_.dat b/sid/sidplay-libs-2.1.0/resid/wave6581_PS_.dat
index ea2fb9c5..ea2fb9c5 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/wave6581_PS_.dat
+++ b/sid/sidplay-libs-2.1.0/resid/wave6581_PS_.dat
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/wave6581_P_T.cc b/sid/sidplay-libs-2.1.0/resid/wave6581_P_T.cc
index 35a246af..35a246af 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/wave6581_P_T.cc
+++ b/sid/sidplay-libs-2.1.0/resid/wave6581_P_T.cc
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/wave6581_P_T.dat b/sid/sidplay-libs-2.1.0/resid/wave6581_P_T.dat
index 1cc8874d..1cc8874d 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/wave6581_P_T.dat
+++ b/sid/sidplay-libs-2.1.0/resid/wave6581_P_T.dat
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/wave6581__ST.cc b/sid/sidplay-libs-2.1.0/resid/wave6581__ST.cc
index 55ec36b7..55ec36b7 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/wave6581__ST.cc
+++ b/sid/sidplay-libs-2.1.0/resid/wave6581__ST.cc
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/wave6581__ST.dat b/sid/sidplay-libs-2.1.0/resid/wave6581__ST.dat
index 2e5d9872..2e5d9872 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/wave6581__ST.dat
+++ b/sid/sidplay-libs-2.1.0/resid/wave6581__ST.dat
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/wave8580_PST.cc b/sid/sidplay-libs-2.1.0/resid/wave8580_PST.cc
index 5141f0f7..5141f0f7 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/wave8580_PST.cc
+++ b/sid/sidplay-libs-2.1.0/resid/wave8580_PST.cc
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/wave8580_PST.dat b/sid/sidplay-libs-2.1.0/resid/wave8580_PST.dat
index 22706cf2..22706cf2 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/wave8580_PST.dat
+++ b/sid/sidplay-libs-2.1.0/resid/wave8580_PST.dat
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/wave8580_PS_.cc b/sid/sidplay-libs-2.1.0/resid/wave8580_PS_.cc
index 15de9f9a..15de9f9a 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/wave8580_PS_.cc
+++ b/sid/sidplay-libs-2.1.0/resid/wave8580_PS_.cc
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/wave8580_PS_.dat b/sid/sidplay-libs-2.1.0/resid/wave8580_PS_.dat
index 9a20a9ee..9a20a9ee 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/wave8580_PS_.dat
+++ b/sid/sidplay-libs-2.1.0/resid/wave8580_PS_.dat
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/wave8580_P_T.cc b/sid/sidplay-libs-2.1.0/resid/wave8580_P_T.cc
index f3a3d835..f3a3d835 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/wave8580_P_T.cc
+++ b/sid/sidplay-libs-2.1.0/resid/wave8580_P_T.cc
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/wave8580_P_T.dat b/sid/sidplay-libs-2.1.0/resid/wave8580_P_T.dat
index 5423dd9a..5423dd9a 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/wave8580_P_T.dat
+++ b/sid/sidplay-libs-2.1.0/resid/wave8580_P_T.dat
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/wave8580__ST.cc b/sid/sidplay-libs-2.1.0/resid/wave8580__ST.cc
index 08e7c5a8..08e7c5a8 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/wave8580__ST.cc
+++ b/sid/sidplay-libs-2.1.0/resid/wave8580__ST.cc
diff --git a/libsidplay2/sidplay-libs-2.1.0/resid/wave8580__ST.dat b/sid/sidplay-libs-2.1.0/resid/wave8580__ST.dat
index f30002ce..f30002ce 100644
--- a/libsidplay2/sidplay-libs-2.1.0/resid/wave8580__ST.dat
+++ b/sid/sidplay-libs-2.1.0/resid/wave8580__ST.dat
diff --git a/libsidplay2/sidplay-libs-2.1.0/unix/config.guess b/sid/sidplay-libs-2.1.0/unix/config.guess
index f1657bbc..f1657bbc 100755
--- a/libsidplay2/sidplay-libs-2.1.0/unix/config.guess
+++ b/sid/sidplay-libs-2.1.0/unix/config.guess
diff --git a/libsidplay2/sidplay-libs-2.1.0/unix/config.h b/sid/sidplay-libs-2.1.0/unix/config.h
index ee1de9e8..ee1de9e8 100644
--- a/libsidplay2/sidplay-libs-2.1.0/unix/config.h
+++ b/sid/sidplay-libs-2.1.0/unix/config.h
diff --git a/libsidplay2/sidplay-libs-2.1.0/unix/config.sub b/sid/sidplay-libs-2.1.0/unix/config.sub
index 1dea9b79..1dea9b79 100755
--- a/libsidplay2/sidplay-libs-2.1.0/unix/config.sub
+++ b/sid/sidplay-libs-2.1.0/unix/config.sub
diff --git a/libsidplay2/sidplay-libs-2.1.0/unix/depcomp b/sid/sidplay-libs-2.1.0/unix/depcomp
index 807b991f..807b991f 100755
--- a/libsidplay2/sidplay-libs-2.1.0/unix/depcomp
+++ b/sid/sidplay-libs-2.1.0/unix/depcomp
diff --git a/libsidplay2/sidplay-libs-2.1.0/unix/install-sh b/sid/sidplay-libs-2.1.0/unix/install-sh
index 11870f1b..11870f1b 100755
--- a/libsidplay2/sidplay-libs-2.1.0/unix/install-sh
+++ b/sid/sidplay-libs-2.1.0/unix/install-sh
diff --git a/libsidplay2/sidplay-libs-2.1.0/unix/ltmain.sh b/sid/sidplay-libs-2.1.0/unix/ltmain.sh
index c4538260..c4538260 100755
--- a/libsidplay2/sidplay-libs-2.1.0/unix/ltmain.sh
+++ b/sid/sidplay-libs-2.1.0/unix/ltmain.sh
diff --git a/libsidplay2/sidplay-libs-2.1.0/unix/missing b/sid/sidplay-libs-2.1.0/unix/missing
index 6a37006e..6a37006e 100755
--- a/libsidplay2/sidplay-libs-2.1.0/unix/missing
+++ b/sid/sidplay-libs-2.1.0/unix/missing
diff --git a/libsidplay2/sidplay-libs-2.1.0/unix/mkinstalldirs b/sid/sidplay-libs-2.1.0/unix/mkinstalldirs
index e6826388..e6826388 100755
--- a/libsidplay2/sidplay-libs-2.1.0/unix/mkinstalldirs
+++ b/sid/sidplay-libs-2.1.0/unix/mkinstalldirs