# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1073775184 0
# Node ID 4e929bb71057862bf6b2291f6cd19aeacee1963b
# Parent  086681f7091068c862831dc8e8e756a4332c4b9e
Fixes and improvements


diff -r 086681f70910 -r 4e929bb71057 src/xs_sidplay.h
--- a/src/xs_sidplay.h	Sat Jan 10 22:53:00 2004 +0000
+++ b/src/xs_sidplay.h	Sat Jan 10 22:53:04 2004 +0000
@@ -139,7 +139,7 @@
  t_xs_tune *pResult;
  TTUNEINFO tuneInfo;
  TTUNE *testTune;
- gboolean haveInfo = false;
+ gboolean haveInfo = FALSE;
  gint i;
 
  /* Check if the tune exists and is readable */
@@ -153,7 +153,14 @@
 	}
 
  /* Get general tune information */
+#ifdef _XS_SIDPLAY1_H
  haveInfo = testTune->getInfo(tuneInfo);
+#endif
+#ifdef _XS_SIDPLAY2_H
+ tuneInfo = testTune->getInfo();
+ haveInfo = TRUE;
+#endif
+
 
  /* Get length information (NOTE: Do not free this!) */
  tuneLen = xs_songlen_get(pcFilename);
@@ -187,4 +194,8 @@
  return pResult;
 }
 
-
+/* Undefine these */
+#undef TFUNCTION1
+#undef TFUNCTION2
+#undef TTUNEINFO
+#undef TTUNE