--- a/src/xmms-sid.c	Wed Mar 26 08:55:29 2008 +0200
+++ b/src/xmms-sid.c	Wed Apr 02 19:46:59 2008 +0300
@@ -56,7 +56,7 @@
 /*
  * List of players and links to their functions
  */
-t_xs_player xs_playerlist[] = {
+xs_player_t xs_playerlist[] = {
 #ifdef HAVE_SIDPLAY1
 	{XS_ENG_SIDPLAY1,
 	 xs_sidplay1_probe,
@@ -79,13 +79,13 @@
 #endif
 };
 
-const gint xs_nplayerlist = (sizeof(xs_playerlist) / sizeof(t_xs_player));
+const gint xs_nplayerlist = (sizeof(xs_playerlist) / sizeof(xs_playerlist[0]));
 
 
 /*
  * Global variables
  */
-t_xs_status xs_status;
+xs_status_t xs_status;
 XS_MUTEX(xs_status);
 static XS_THREAD_T xs_decode_thread;
 
@@ -144,7 +144,7 @@
 	XS_MUTEX_LOCK(xs_cfg);
 
 	/* Initialize status and sanitize configuration */
-	xs_memset(&xs_status, 0, sizeof(xs_status));
+	memset(&xs_status, 0, sizeof(xs_status));
 
 	if (xs_cfg.audioFrequency < 8000)
 		xs_cfg.audioFrequency = 8000;
@@ -173,7 +173,7 @@
 		if (xs_playerlist[iPlayer].plrIdent == xs_cfg.playerEngine) {
 			if (xs_playerlist[iPlayer].plrInit(&xs_status)) {
 				isInitialized = TRUE;
-				xs_status.sidPlayer = (t_xs_player *) & xs_playerlist[iPlayer];
+				xs_status.sidPlayer = (xs_player_t *) & xs_playerlist[iPlayer];
 			}
 		}
 		iPlayer++;
@@ -185,7 +185,7 @@
 	while ((iPlayer < xs_nplayerlist) && !isInitialized) {
 		if (xs_playerlist[iPlayer].plrInit(&xs_status)) {
 			isInitialized = TRUE;
-			xs_status.sidPlayer = (t_xs_player *) & xs_playerlist[iPlayer];
+			xs_status.sidPlayer = (xs_player_t *) & xs_playerlist[iPlayer];
 			xs_cfg.playerEngine = xs_playerlist[iPlayer].plrIdent;
 		} else
 			iPlayer++;
@@ -206,13 +206,13 @@
 	/* Initialize song-length database */
 	xs_songlen_close();
 	if (xs_cfg.songlenDBEnable && (xs_songlen_init() != 0)) {
-		xs_error(_("Error initializing song-length database!\n"));
+		xs_error("Error initializing song-length database!\n");
 	}
 
 	/* Initialize STIL database */
 	xs_stil_close();
 	if (xs_cfg.stilDBEnable && (xs_stil_init() != 0)) {
-		xs_error(_("Error initializing STIL database!\n"));
+		xs_error("Error initializing STIL database!\n");
 	}
 
 }
@@ -272,7 +272,7 @@
 
 	/* Try to detect via detection routine, if required */
 	if (xs_cfg.detectMagic) {
-		t_xs_file *f;
+		xs_file_t *f;
 		if ((f = xs_fopen(pcFilename, "rb")) != NULL) {
 			if (xs_status.sidPlayer->plrProbe(f))
 				return TRUE;
@@ -310,8 +310,8 @@
  */
 void *xs_playthread(void *argPointer)
 {
-	t_xs_status myStatus;
-	t_xs_tuneinfo *myTune;
+	xs_status_t myStatus;
+	xs_tuneinfo_t *myTune;
 	gboolean audioOpen = FALSE, doPlay = FALSE, isFound = FALSE;
 	gint audioGot, songLength, i;
 	gchar *audioBuffer = NULL, *oversampleBuffer = NULL, *tmpTitle;
@@ -321,7 +321,7 @@
 	/* Initialize */
 	XSDEBUG("entering player thread\n");
 	XS_MUTEX_LOCK(xs_status);
-	memcpy(&myStatus, &xs_status, sizeof(t_xs_status));
+	memcpy(&myStatus, &xs_status, sizeof(xs_status_t));
 	myTune = xs_status.tuneInfo;
 	for (i = 0; i <= myTune->nsubTunes; i++)
 		myTune->subTunes[i].tunePlayed = FALSE;
@@ -330,14 +330,14 @@
 	/* Allocate audio buffer */
 	audioBuffer = (gchar *) g_malloc(XS_AUDIOBUF_SIZE);
 	if (audioBuffer == NULL) {
-		xs_error(_("Couldn't allocate memory for audio data buffer!\n"));
+		xs_error("Couldn't allocate memory for audio data buffer!\n");
 		goto xs_err_exit;
 	}
 
 	if (myStatus.oversampleEnable) {
 		oversampleBuffer = (gchar *) g_malloc(XS_AUDIOBUF_SIZE * myStatus.oversampleFactor);
 		if (oversampleBuffer == NULL) {
-			xs_error(_("Couldn't allocate memory for audio oversampling buffer!\n"));
+			xs_error("Couldn't allocate memory for audio oversampling buffer!\n");
 			goto xs_err_exit;
 		}
 	}
@@ -414,7 +414,7 @@
 
 		/* Initialize song */
 		if (!myStatus.sidPlayer->plrInitSong(&myStatus)) {
-			xs_error(_("Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"),
+			xs_error("Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n",
 			      myTune->sidFilename, myStatus.currSong);
 			goto xs_err_exit;
 		}
@@ -425,7 +425,7 @@
 		
 		if (!xs_plugin_ip.output->
 		    open_audio(myStatus.audioFormat, myStatus.audioFrequency, myStatus.audioChannels)) {
-			xs_error(_("Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"),
+			xs_error("Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n",
 				myStatus.audioFormat,
 				myStatus.audioFrequency,
 				myStatus.audioChannels);
@@ -471,7 +471,7 @@
 				/* Execute rate-conversion with filtering */
 				if (xs_filter_rateconv(audioBuffer, oversampleBuffer,
 					myStatus.audioFormat, myStatus.oversampleFactor, audioGot) < 0) {
-					xs_error(_("Oversampling rate-conversion pass failed.\n"));
+					xs_error("Oversampling rate-conversion pass failed.\n");
 					XS_MUTEX_LOCK(xs_status);
 					xs_status.isError = TRUE;
 					XS_MUTEX_UNLOCK(xs_status);
@@ -591,7 +591,7 @@
 
 	/* Start the playing thread! */
 	if (pthread_create(&xs_decode_thread, NULL, xs_playthread, NULL) < 0) {
-		xs_error(_("Couldn't create playing thread!\n"));
+		xs_error("Couldn't create playing thread!\n");
 		xs_tuneinfo_free(xs_status.tuneInfo);
 		xs_status.tuneInfo = NULL;
 		xs_status.sidPlayer->plrDeleteSID(&xs_status);
@@ -938,7 +938,7 @@
  */
 void xs_get_song_info(gchar * songFilename, gchar ** songTitle, gint * songLength)
 {
-	t_xs_tuneinfo *pInfo;
+	xs_tuneinfo_t *pInfo;
 	
 	XS_MUTEX_LOCK(xs_status);