# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1073784301 0
# Node ID 4614f58ab169afe2f3afd8d3158722aeceae47da
# Parent  426e443240b847fa993c106c2b88d89e967b61e1
Paskaa


diff -r 426e443240b8 -r 4614f58ab169 configure.in
--- a/configure.in	Sun Jan 11 00:40:02 2004 +0000
+++ b/configure.in	Sun Jan 11 01:25:01 2004 +0000
@@ -6,7 +6,7 @@
 AC_PREREQ(2.56)
 
 dnl Initialize
-AC_INIT(XMMS-SID, 0.8.0beta7, ccr@tnsp.org)
+AC_INIT(XMMS-SID, 0.8.0beta6, ccr@tnsp.org)
 AC_COPYRIGHT([[(C) 2003-2004 Matti 'ccr' Hämäläinen]])
 AC_CONFIG_SRCDIR(src/xmms-sid.h)
 AM_INIT_AUTOMAKE
diff -r 426e443240b8 -r 4614f58ab169 src/xmms-sid.h
--- a/src/xmms-sid.h	Sun Jan 11 00:40:02 2004 +0000
+++ b/src/xmms-sid.h	Sun Jan 11 01:25:01 2004 +0000
@@ -108,7 +108,7 @@
  * Debugging and error handling macros
  */
 #ifdef DEBUG
-#define XSDEBUG(x...) { fprintf(stderr, "XSDEBUG [%s:%d]: ", __FILE__, (int) __LINE__); fprintf(stderr, ## x); }
+#define XSDEBUG(x...) { fprintf(stderr, "XS[%s:%d]: ", __FILE__, (int) __LINE__); fprintf(stderr, ## x); }
 #else
 #define XSDEBUG(x...) /* foo */
 #endif
diff -r 426e443240b8 -r 4614f58ab169 src/xs_sidplay2.cc
--- a/src/xs_sidplay2.cc	Sun Jan 11 00:40:02 2004 +0000
+++ b/src/xs_sidplay2.cc	Sun Jan 11 01:25:01 2004 +0000
@@ -210,9 +210,7 @@
 
  /* Try to get the tune */
  if (!pcFilename) return FALSE;
-XSDEBUG("paski #1\n");
  if (!myPlayer->currTune->load(pcFilename)) return FALSE;
-XSDEBUG("paski #2\n");
 
  /* Get current configuration */
  myPlayer->currConfig = myPlayer->currEng->config();
@@ -292,7 +290,6 @@
 #endif
 #endif
 
-XSDEBUG("paski #3\n");
 
  /* Now set the emulator configuration */
  if (myPlayer->currEng->config(myPlayer->currConfig) < 0)
@@ -301,8 +298,6 @@
 	return FALSE;
 	}
 
-XSDEBUG("paski #4\n");
-
  return TRUE;
 }
 
diff -r 426e443240b8 -r 4614f58ab169 src/xs_stil.c
--- a/src/xs_stil.c	Sun Jan 11 00:40:02 2004 +0000
+++ b/src/xs_stil.c	Sun Jan 11 01:25:01 2004 +0000
@@ -187,7 +187,9 @@
  {
  fgets(inLine, sizeof(inLine), inFile);
  lineNum++;
-
+ 
+ 
+ 
  } /* while */
 
  /* Close the file */  
diff -r 426e443240b8 -r 4614f58ab169 xmms-sid.glade
--- a/xmms-sid.glade	Sun Jan 11 00:40:02 2004 +0000
+++ b/xmms-sid.glade	Sun Jan 11 01:25:01 2004 +0000
@@ -1361,11 +1361,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>cfg_ftitle_desc1</name>
-	      <label>%1 - Composer
-%2 - Song name (title)
-%3 - Copyright
-%4 - SID File Type
-%5 - Subtune number</label>
+	      <label>%p - Performer/composer
+%t - Song name (title)
+%c - Copyright
+%s - SID File Type
+%n - Subtune number
+%f - Filename</label>
 	      <justify>GTK_JUSTIFY_LEFT</justify>
 	      <wrap>False</wrap>
 	      <xalign>0.04</xalign>
@@ -1382,10 +1383,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>cfg_ftitle_desc2</name>
-	      <label>%6 - STIL Title
-%7 - STIL Name
-%8 - STIL Artist
-%9 - STIL Comment</label>
+	      <label>%F - File path
+%e - File extension
+%T - STIL Title
+%N - STIL Name
+%A - STIL Artist
+%C - STIL Comment</label>
 	      <justify>GTK_JUSTIFY_LEFT</justify>
 	      <wrap>False</wrap>
 	      <xalign>0.04</xalign>