--- ./Output/IRIX/IRIX.h Tue Jan 18 06:35:25 2000 +++ ../xmms-1.0.1/./Output/IRIX/IRIX.h Wed Jul 12 17:13:07 2000 @@ -56,7 +56,7 @@ #include #include "xmms/plugin.h" -#include "libxmms/configfile.h" +#include "xmms/configfile.h" extern OutputPlugin op; --- ./Output/IRIX/audio.c Tue Jan 18 06:35:24 2000 +++ ../xmms-1.0.1/./Output/IRIX/audio.c Wed Jul 12 17:18:03 2000 @@ -56,7 +56,7 @@ static gint flush = -1; static gint audiofd = -2; -//static audio_info_t adinfo; +/*static audio_info_t adinfo;*/ static pthread_t buffer_thread; static uint_t audio_scount = 0; @@ -270,7 +270,7 @@ memcpy(buffer_read, ptr, length1); buffer_fillend = buffer_end; buffer_read = buffer_ptr; - memcpy(buffer_read, ptr + length1, length2); + memcpy(buffer_read, (char*)ptr + length1, length2); buffer_read += length2; } else --- ./Output/IRIX/configure.c Tue Jan 18 06:35:24 2000 +++ ../xmms-1.0.1/./Output/IRIX/configure.c Wed Jul 12 17:51:09 2000 @@ -102,7 +102,7 @@ audio_device = device; } -#ifdef 0 +#if 0 static gchar * device_name (gchar *file_name) { @@ -145,7 +145,9 @@ { int default_index = -1; - fprintf(stderr, "irix_configure: begin\n"); + if (IRIX_DEBUG & IRIX_DEBUG_CONFIGURE) { + fprintf(stderr, "irix_configure: begin\n"); + } configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(configure_win), "Configure IRIX driver"); @@ -330,6 +332,8 @@ gtk_widget_show(vbox); gtk_widget_show(configure_win); - fprintf(stderr, "irix_configure: returning\n"); + if (IRIX_DEBUG & IRIX_DEBUG_CONFIGURE) { + fprintf(stderr, "irix_configure: returning\n"); + } } --- ./Output/IRIX/init.c Tue Jan 18 06:35:25 2000 +++ ../xmms-1.0.1/./Output/IRIX/init.c Wed Jul 12 17:18:38 2000 @@ -1,5 +1,5 @@ #include "IRIX.h" -#include "libxmms/configfile.h" +#include "xmms/configfile.h" IrixConfig irix_cfg;