--- a/src/xmms-sid.cc	Sat Jun 07 12:42:05 2003 +0000
+++ b/src/xmms-sid.cc	Sat Jun 07 12:42:05 2003 +0000
@@ -24,6 +24,7 @@
 #include "xmms-sid.h"
 #include "xs_config.h"
 #include "xs_length.h"
+#include "xs_title.h"
 #include <sidplay/player.h>
 #include <sidplay/myendian.h>
 #include <sidplay/fformat.h>
@@ -169,7 +170,7 @@
  */
 static void *xs_play_loop(void *argPointer)
 {
- gchar		plr_data[XMMS_SID_BUFSIZE];
+ gchar		plr_data[XS_BUFSIZE];
  struct sidTuneInfo plr_sidInf;
  gchar		*plr_tune_title = NULL;
  gint		plr_fxlen;
@@ -206,7 +207,7 @@
  plr_fmt = (xs_emuConf.bitsPerSample == 16) ? FMT_S16_NE : FMT_U8;
 
 
- if (!xmms_sid_ip.output->open_audio(plr_fmt, xs_emuConf.frequency, xs_emuConf.channels))
+ if (!xs_plugin_ip.output->open_audio(plr_fmt, xs_emuConf.frequency, xs_emuConf.channels))
 	{
 	pthread_mutex_lock(&xs_mutex);
 	xs_status.s_error = 1;
@@ -230,7 +231,7 @@
 
 
  /* Set song title information */
- xmms_sid_ip.set_info(
+ xs_plugin_ip.set_info(
 	plr_tune_title, 
 	(plr_tune_len * 1000),
 	(1000 * (plr_sidInf.songSpeed ? plr_sidInf.songSpeed : (plr_sidInf.clockSpeed == SIDTUNE_CLOCK_NTSC) ? 60 : 50)),
@@ -241,7 +242,7 @@
  /* Run playing loop: loop as long as xs_playing is same as current tune number */
  while (xs_status.s_playing == plr_tune_num)
 	{
-	plr_fxlen = XMMS_SID_BUFSIZE;
+	plr_fxlen = XS_BUFSIZE;
 
 	/* Run emulator to fill output buffer with audio data */
 	sidEmuFillBuffer(xs_emuEngine, *xs_status.s_tune, plr_data, plr_fxlen);
@@ -249,7 +250,7 @@
 	/* If Max Playtime option set, check playtime */
 	if (xs_cfg.playUseMaxTime)
 		{
-		if ((xmms_sid_ip.output->output_time() / 1000) >= xs_cfg.playMaxTime)
+		if ((xs_plugin_ip.output->output_time() / 1000) >= xs_cfg.playMaxTime)
 			{
 			pthread_mutex_lock(&xs_mutex);
 			xs_status.s_playing = 0;
@@ -260,7 +261,7 @@
 	/* Check playtime against database */
 	if (xs_cfg.playMethod == XMMS_SID_PMETHOD_DATABASE)
 		{
-		if ((xmms_sid_ip.output->output_time() / 1000) >= plr_tune_len)
+		if ((xs_plugin_ip.output->output_time() / 1000) >= plr_tune_len)
 			{
 			pthread_mutex_lock(&xs_mutex);
 			xs_status.s_playing = 0;
@@ -284,17 +285,17 @@
 
 
 		/* Send audio data to visualization plugin */
-		xmms_sid_ip.add_vis_pcm(xmms_sid_ip.output->written_time(),
+		xs_plugin_ip.add_vis_pcm(xs_plugin_ip.output->written_time(),
 					plr_fmt, xs_emuConf.channels, plr_fxlen, plr_data);
 
 		/* Wait for a while */
-		while ((xs_status.s_playing == plr_tune_num) && (xmms_sid_ip.output->buffer_free() < plr_fxlen))
+		while ((xs_status.s_playing == plr_tune_num) && (xs_plugin_ip.output->buffer_free() < plr_fxlen))
 			xmms_usleep(10000);
 
 
 		/* If playing, send final audio data to output plugin */
 		if (xs_status.s_playing == plr_tune_num)
-			xmms_sid_ip.output->write_audio(plr_data, plr_fxlen);
+			xs_plugin_ip.output->write_audio(plr_data, plr_fxlen);
 
 	}	/* End of playerloop */
 
@@ -303,7 +304,7 @@
 	XSDEBUG("cleaning up...\n");
 
 	/* Cleanup & shutdown */
-	xmms_sid_ip.output->close_audio();
+	xs_plugin_ip.output->close_audio();
 
 	if (plr_tune_title) g_free(plr_tune_title);
 
@@ -465,7 +466,7 @@
  */
 void xs_pause(short pauseState)
 {
- xmms_sid_ip.output->pause(pauseState);
+ xs_plugin_ip.output->pause(pauseState);
 }
 
 
@@ -501,7 +502,7 @@
  set_song_position(xs_status.s_playing, 1, xs_status.s_songs);
 #endif
 
- return xmms_sid_ip.output->output_time();
+ return xs_plugin_ip.output->output_time();
 }