org.handhelds.familiar/packages/xmms-embedded/xmms-embedded-20040327/gtkremoval.patch

   1 diff -urN xmms-embedded.orig/xmms/Input/fixpvorbis/configure.c xmms-embedded/xmms/Input/fixpvorbis/configure.c
   2 --- xmms-embedded.orig/xmms/Input/fixpvorbis/configure.c        2002-10-10 13:46:55.000000000 -0400
   3 +++ xmms-embedded/xmms/Input/fixpvorbis/configure.c     2004-03-28 17:39:52.000000000 -0500
   4 @@ -3,11 +3,13 @@
   5  #include <stdlib.h>
   6  #include <string.h>
   7  #include <glib.h>
   8 +#ifndef NOGUI
   9  #include <gtk/gtk.h>
  10 +#endif
  11
  12  #include "vorbis.h"
  13  #include "libxmms/configfile.h"
  14 -#include "libxmms/dirbrowser.h"
  15 +//#include "libxmms/dirbrowser.h"
  16  #include "libxmms/titlestring.h"
  17  #include "xmms/i18n.h"
  18  #include "libxmms/util.h"
  19 diff -urN xmms-embedded.orig/xmms/Input/fixpvorbis/fileinfo.c xmms-embedded/xmms/Input/fixpvorbis/fileinfo.c
  20 --- xmms-embedded.orig/xmms/Input/fixpvorbis/fileinfo.c 2002-12-02 17:14:40.000000000 -0500
  21 +++ xmms-embedded/xmms/Input/fixpvorbis/fileinfo.c      2004-03-28 17:39:52.000000000 -0500
  22 @@ -27,7 +27,9 @@
  23  #include <string.h>
  24  #include <pthread.h>
  25  #include <glib.h>
  26 +#ifndef NOGUI
  27  #include <gtk/gtk.h>
  28 +#endif
  29  #include <tremor/ogg.h>
  30  #include <tremor/ivorbiscodec.h>
  31  #include <tremor/ivorbisfile.h>
  32 @@ -253,10 +255,11 @@
  33         return retval;
  34  }
  35
  36 -
  37 +#ifndef NOGUI
  38  static void label_set_text(GtkWidget * label, char *str, ...)
  39  {
  40  }
  41 +#endif
  42
  43  /***********************************************************************/
  44
  45 diff -urN xmms-embedded.orig/xmms/Input/fixpvorbis/fixpvorbis.pro xmms-embedded/xmms/Input/fixpvorbis/fixpvorbis.pro
  46 --- xmms-embedded.orig/xmms/Input/fixpvorbis/fixpvorbis.pro     2002-12-02 15:21:42.000000000 -0500
  47 +++ xmms-embedded/xmms/Input/fixpvorbis/fixpvorbis.pro  2004-03-28 17:39:52.000000000 -0500
  48 @@ -17,4 +17,5 @@
  49  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H
  50  TMAKE_LFLAGS =
  51  DESTDIR = ../../../compiled/xmms/Input
  52 +DEFINES += NOGUI
  53  TARGET = fixpvorbisplugin
  54 diff -urN xmms-embedded.orig/xmms/Input/fixpvorbis/http.c xmms-embedded/xmms/Input/fixpvorbis/http.c
  55 --- xmms-embedded.orig/xmms/Input/fixpvorbis/http.c     2003-06-04 18:33:40.000000000 -0400
  56 +++ xmms-embedded/xmms/Input/fixpvorbis/http.c  2004-03-28 17:39:52.000000000 -0500
  57 @@ -23,7 +23,9 @@
  58  #include <arpa/inet.h>
  59  #include <netdb.h>
  60  #include <glib.h>
  61 +#ifndef NOGUI
  62  #include <gtk/gtk.h>
  63 +#endif
  64  #include <string.h>
  65  #include <fcntl.h>
  66  #include <unistd.h>
  67 @@ -50,7 +52,9 @@
  68  static guint64 buffer_read = 0;
  69  static gchar *buffer;
  70  static pthread_t thread;
  71 +#ifndef NOGUI
  72  static GtkWidget *error_dialog = NULL;
  73 +#endif
  74
  75  extern vorbis_config_t vorbis_cfg;
  76  extern InputPlugin vorbis_ip;
  77 diff -urN xmms-embedded.orig/xmms/Input/fixpvorbis/vorbis.c xmms-embedded/xmms/Input/fixpvorbis/vorbis.c
  78 --- xmms-embedded.orig/xmms/Input/fixpvorbis/vorbis.c   2003-06-04 18:33:40.000000000 -0400
  79 +++ xmms-embedded/xmms/Input/fixpvorbis/vorbis.c        2004-03-28 17:39:52.000000000 -0500
  80 @@ -31,7 +31,9 @@
  81  #include <string.h>
  82  #include <pthread.h>
  83  #include <glib.h>
  84 +#ifndef NOGUI
  85  #include <gtk/gtk.h>
  86 +#endif
  87  #include <tremor/ogg.h>
  88  #include <tremor/ivorbiscodec.h>
  89  #include <tremor/ivorbisfile.h>
  90 diff -urN xmms-embedded.orig/xmms/Input/mikmod/mikmod-plugin.h xmms-embedded/xmms/Input/mikmod/mikmod-plugin.h
  91 --- xmms-embedded.orig/xmms/Input/mikmod/mikmod-plugin.h        2002-10-10 13:46:47.000000000 -0400
  92 +++ xmms-embedded/xmms/Input/mikmod/mikmod-plugin.h     2004-03-28 17:39:52.000000000 -0500
  93 @@ -5,7 +5,9 @@
  94  #include <stdio.h>
  95  #include <limits.h>
  96  #include <pthread.h>
  97 +#ifndef NOGUI
  98  #include <gtk/gtk.h>
  99 +#endif
 100  #include "xmms/plugin.h"
 101  #include <mikmod.h>
 102
 103 diff -urN xmms-embedded.orig/xmms/Input/mikmod/mikmod.pro xmms-embedded/xmms/Input/mikmod/mikmod.pro
 104 --- xmms-embedded.orig/xmms/Input/mikmod/mikmod.pro     2002-10-10 13:46:48.000000000 -0400
 105 +++ xmms-embedded/xmms/Input/mikmod/mikmod.pro  2004-03-28 17:39:52.000000000 -0500
 106 @@ -10,4 +10,5 @@
 107  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H
 108  TMAKE_LFLAGS =
 109  DESTDIR = ../../../compiled/xmms/Input
 110 +DEFINES += NOGUI
 111  TARGET = mikmod
 112 diff -urN xmms-embedded.orig/xmms/Input/mikmod/plugin.c xmms-embedded/xmms/Input/mikmod/plugin.c
 113 --- xmms-embedded.orig/xmms/Input/mikmod/plugin.c       2002-12-11 16:26:36.000000000 -0500
 114 +++ xmms-embedded/xmms/Input/mikmod/plugin.c    2004-03-28 17:39:52.000000000 -0500
 115 @@ -26,7 +26,9 @@
 116  #include "libxmms/configfile.h"
 117  #include "libxmms/util.h"
 118  #include "libxmms/titlestring.h"
 119 +#ifndef NOGUI
 120  #include <gtk/gtk.h>
 121 +#endif
 122
 123  #include "mikmod.xpm"
 124
 125 @@ -42,7 +44,9 @@
 126  static void aboutbox(void);
 127  static void get_song_info(char *filename, char **title, int *length);
 128  static void configure();
 129 +#ifndef NOGUI
 130  static void config_ok(GtkWidget * widget, gpointer data);
 131 +#endif
 132
 133  static pthread_t decode_thread;
 134
 135 @@ -68,7 +72,9 @@
 136
 137
 138  static void *play_loop(void *arg);
 139 +#ifndef NOGUI
 140  static void config_ok(GtkWidget * widget, gpointer data);
 141 +#endif
 142
 143
 144  static void aboutbox()
 145 @@ -349,11 +355,12 @@
 146       configure()
 147  {
 148  }
 149 -
 150 +#ifndef NOGUI
 151  static void config_ok(GtkWidget * widget, gpointer data)
 152  {
 153
 154  }
 155 +#endif
 156
 157  InputPlugin mikmod_ip =
 158  {
 159 diff -urN xmms-embedded.orig/xmms/Input/mplayer/mplayer.pro xmms-embedded/xmms/Input/mplayer/mplayer.pro
 160 --- xmms-embedded.orig/xmms/Input/mplayer/mplayer.pro   2004-03-28 17:18:51.000000000 -0500
 161 +++ xmms-embedded/xmms/Input/mplayer/mplayer.pro        2004-03-28 17:39:52.000000000 -0500
 162 @@ -9,4 +9,5 @@
 163  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H
 164  TMAKE_LFLAGS =
 165  DESTDIR = ../../../compiled/xmms/Input
 166 +DEFINES += NOGUI
 167  TARGET = mplayer
 168 diff -urN xmms-embedded.orig/xmms/Input/mplayer/wav.pro xmms-embedded/xmms/Input/mplayer/wav.pro
 169 --- xmms-embedded.orig/xmms/Input/mplayer/wav.pro       2002-10-10 13:47:06.000000000 -0400
 170 +++ xmms-embedded/xmms/Input/mplayer/wav.pro    2004-03-28 17:39:52.000000000 -0500
 171 @@ -9,4 +9,5 @@
 172  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H
 173  TMAKE_LFLAGS =
 174  DESTDIR = ../../../compiled/xmms/Input
 175 +DEFINES += NOGUI
 176  TARGET = mplayer
 177 diff -urN xmms-embedded.orig/xmms/Input/shorten/gtk.c xmms-embedded/xmms/Input/shorten/gtk.c
 178 --- xmms-embedded.orig/xmms/Input/shorten/gtk.c 2002-10-10 13:47:10.000000000 -0400
 179 +++ xmms-embedded/xmms/Input/shorten/gtk.c      2004-03-28 17:47:14.000000000 -0500
 180 @@ -24,9 +24,9 @@
 181  #include <glib.h>
 182  #include <xmms/util.h>
 183  #include <libxmms/configfile.h>
 184 -#include <libxmms/dirbrowser.h>
 185 +//#include <libxmms/dirbrowser.h>
 186  #include "shorten.h"
 187 -
 188 +#ifndef NOGUI
 189  static GtkWidget *shn_configurewin = NULL,
 190                  *about_box,
 191                  *vbox,
 192 @@ -53,7 +53,7 @@
 193                  *ok,
 194                  *cancel,
 195                  *apply;
 196 -
 197 +#endif
 198  void display_shn_about(void)
 199  {
 200  }
 201 @@ -65,11 +65,11 @@
 202  void destroy_path_dirbrowser()
 203  {
 204  }
 205 -
 206 +#ifndef NOGUI
 207  static void path_browse_cb(GtkWidget * w, gpointer data)
 208  {
 209  }
 210 -
 211 +#endif
 212  void shn_configurewin_save(void)
 213  {
 214  }
 215 diff -urN xmms-embedded.orig/xmms/Input/shorten/shorten.pro xmms-embedded/xmms/Input/shorten/shorten.pro
 216 --- xmms-embedded.orig/xmms/Input/shorten/shorten.pro   2002-10-10 13:47:06.000000000 -0400
 217 +++ xmms-embedded/xmms/Input/shorten/shorten.pro        2004-03-28 17:44:34.000000000 -0500
 218 @@ -21,4 +21,5 @@
 219  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H
 220  TMAKE_LFLAGS =
 221  DESTDIR = ../../../compiled/xmms/Input
 222 +DEFINES += NOGUI
 223  TARGET = shorten
 224 diff -urN xmms-embedded.orig/xmms/Input/wav/wav.pro xmms-embedded/xmms/Input/wav/wav.pro
 225 --- xmms-embedded.orig/xmms/Input/wav/wav.pro   2002-10-10 13:47:05.000000000 -0400
 226 +++ xmms-embedded/xmms/Input/wav/wav.pro        2004-03-28 17:39:52.000000000 -0500
 227 @@ -9,4 +9,5 @@
 228  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H
 229  TMAKE_LFLAGS =
 230  DESTDIR = ../../../compiled/xmms/Input
 231 +DEFINES += NOGUI
 232  TARGET = wav
 233 diff -urN xmms-embedded.orig/xmms/Input/xmms-mad/fileinfo.c xmms-embedded/xmms/Input/xmms-mad/fileinfo.c
 234 --- xmms-embedded.orig/xmms/Input/xmms-mad/fileinfo.c   2002-11-18 05:13:21.000000000 -0500
 235 +++ xmms-embedded/xmms/Input/xmms-mad/fileinfo.c        2004-03-28 17:39:52.000000000 -0500
 236 @@ -30,11 +30,11 @@
 237  #include "input.h"
 238
 239  #include <xmms/util.h>
 240 +#ifndef NOGUI
 241  #include <gtk/gtk.h>
 242
 243  /* #define DEBUG */
 244
 245 -#ifndef NOGUI
 246  static GtkWidget *window = 0;
 247  static GtkWidget *filename_entry, *id3_frame;
 248  static GtkWidget *title_entry, *artist_entry, *album_entry;
 249 diff -urN xmms-embedded.orig/xmms/Input/xmms-mad/xmms-mad.c xmms-embedded/xmms/Input/xmms-mad/xmms-mad.c
 250 --- xmms-embedded.orig/xmms/Input/xmms-mad/xmms-mad.c   2002-12-03 04:46:37.000000000 -0500
 251 +++ xmms-embedded/xmms/Input/xmms-mad/xmms-mad.c        2004-03-28 17:39:52.000000000 -0500
 252 @@ -25,7 +25,9 @@
 253  #include "libxmms/configfile.h"
 254
 255  #include <pthread.h>
 256 +#ifndef NOGUI
 257  #include <gtk/gtk.h>
 258 +#endif
 259  #include <xmms/util.h>
 260  #include <stdarg.h>
 261  #include <fcntl.h>
 262 @@ -41,8 +43,10 @@
 263  static pthread_t *decode_thread; /**< the single decoder thread */
 264  static struct mad_info_t info;   /**< info for current track */
 265
 266 +#ifndef NOGUI
 267  static GtkWidget *about_window = 0;
 268  static GtkWidget *error_dialog = 0;
 269 +#endif
 270
 271  static void
 272  xmmsmad_init ()
 273 diff -urN xmms-embedded.orig/xmms/Input/xmms-mad/xmms-mad.pro xmms-embedded/xmms/Input/xmms-mad/xmms-mad.pro
 274 --- xmms-embedded.orig/xmms/Input/xmms-mad/xmms-mad.pro 2002-12-02 17:14:40.000000000 -0500
 275 +++ xmms-embedded/xmms/Input/xmms-mad/xmms-mad.pro      2004-03-28 17:39:52.000000000 -0500
 276 @@ -17,6 +17,7 @@
 277  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H -DNOGUI -DSLOWCPU
 278  TMAKE_LFLAGS =
 279  DESTDIR = ../../../compiled/xmms/Input
 280 +DEFINES += NOGUI
 281  TARGET = xmms-mad
 282
 283
 284 diff -urN xmms-embedded.orig/xmms/Input/xmms-sid/xmms-sid.pro xmms-embedded/xmms/Input/xmms-sid/xmms-sid.pro
 285 --- xmms-embedded.orig/xmms/Input/xmms-sid/xmms-sid.pro 2002-10-10 13:47:05.000000000 -0400
 286 +++ xmms-embedded/xmms/Input/xmms-sid/xmms-sid.pro      2004-03-28 17:39:52.000000000 -0500
 287 @@ -16,4 +16,5 @@
 288  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops "-DVERSION=\"1.0.0\""
 289  TMAKE_LFLAGS =
 290  DESTDIR = ../../../compiled/xmms/Input
 291 +DEFINES += NOGUI
 292  TARGET = xmms-sid
 293 diff -urN xmms-embedded.orig/xmms/Input/xmms-sid/xs_about.c xmms-embedded/xmms/Input/xmms-sid/xs_about.c
 294 --- xmms-embedded.orig/xmms/Input/xmms-sid/xs_about.c   2002-10-10 13:47:04.000000000 -0400
 295 +++ xmms-embedded/xmms/Input/xmms-sid/xs_about.c        2004-03-28 17:39:52.000000000 -0500
 296 @@ -23,11 +23,14 @@
 297  */
 298
 299  #include "xmms-sid.h"
 300 +#ifndef NOGUI
 301  #include <gtk/gtk.h>
 302 +#endif
 303  #include "xmms-sid-logo.xpm"
 304
 305 -
 306 +#ifndef NOGUI
 307  static GtkWidget *xs_aboutwin = NULL;
 308 +#endif
 309
 310
 311
 312 diff -urN xmms-embedded.orig/xmms/Input/xmms-sid/xs_config.c xmms-embedded/xmms/Input/xmms-sid/xs_config.c
 313 --- xmms-embedded.orig/xmms/Input/xmms-sid/xs_config.c  2002-10-10 13:47:04.000000000 -0400
 314 +++ xmms-embedded/xmms/Input/xmms-sid/xs_config.c       2004-03-28 17:39:52.000000000 -0500
 315 @@ -23,13 +23,16 @@
 316  */
 317  #include "xmms-sid.h"
 318  #include <libxmms/configfile.h>
 319 +#ifndef NOGUI
 320  #include <gtk/gtk.h>
 321 +#endif
 322  #include <stdio.h>
 323
 324
 325  /*
 326   * General stuff
 327   */
 328 +#ifndef NOGUI
 329  static GtkWidget *xs_configwin = NULL;
 330  static GtkWidget *xs_fileselector = NULL;
 331
 332 @@ -38,7 +41,7 @@
 333  static GtkWidget *cfg_chn_stereo, *cfg_chn_autopan, *cfg_mem_banksw, *cfg_mem_transrom, *cfg_mem_playsid;
 334  static GtkWidget *cfg_songnameformat, *cfg_clock_pal, *cfg_clock_ntsc, *cfg_clock_force, *cfg_ok, *cfg_cancel;
 335  static GtkWidget *cfg_wav_mos6581, *cfg_wav_mos8580, *cfg_emufilters, *cfg_stil_browse, *cfg_stil_use, *cfg_stil_path;
 336 -
 337 +#endif
 338
 339
 340  /*
 341 diff -urN xmms-embedded.orig/xmms/Input/xmms-sid/xs_fileinfo.cc xmms-embedded/xmms/Input/xmms-sid/xs_fileinfo.cc
 342 --- xmms-embedded.orig/xmms/Input/xmms-sid/xs_fileinfo.cc       2002-10-10 13:47:04.000000000 -0400
 343 +++ xmms-embedded/xmms/Input/xmms-sid/xs_fileinfo.cc    2004-03-28 17:43:11.000000000 -0500
 344 @@ -23,16 +23,19 @@
 345
 346
 347  #include "xmms-sid.h"
 348 +#ifndef NOGUI
 349  #include <gtk/gtk.h>
 350 +#endif
 351  #include <sidplay/sidtune.h>
 352  #include <stdio.h>
 353  #include <string.h>
 354
 355 +#ifndef NOGUI
 356  static GtkWidget *xs_fileinfowin = NULL;
 357  static GtkWidget *fileinfo_filename, *fileinfo_songname, *fileinfo_composer;
 358  static GtkWidget *fileinfo_copyright, *fileinfo_ok, *fileinfo_sub_comment;
 359  static GtkWidget *fileinfo_sub_tune, *fileinfo_sub_tune_menu, *fileinfo_sub_artist, *fileinfo_sub_title;
 360 -
 361 +#endif
 362
 363
 364
 365 diff -urN xmms-embedded.orig/xmms/libxmms/libxmms.pro xmms-embedded/xmms/libxmms/libxmms.pro
 366 --- xmms-embedded.orig/xmms/libxmms/libxmms.pro 2002-10-10 13:51:46.000000000 -0400
 367 +++ xmms-embedded/xmms/libxmms/libxmms.pro      2004-03-28 17:39:52.000000000 -0500
 368 @@ -3,22 +3,23 @@
 369
 370  HEADERS = configfile.h \
 371  config.h \
 372 -dirbrowser.h \
 373 +#dirbrowser.h \
 374  formatter.h \
 375  titlestring.h \
 376  util.h \
 377  xmmsctrl.h
 378
 379  SOURCES = configfile.c \
 380 -dirbrowser.c \
 381 +#dirbrowser.c \
 382  formatter.c \
 383  titlestring.c \
 384  util.c \
 385  xmmsctrl.c
 386
 387 -INCLUDEPATH = . /usr/include/glib-1.2 /usr/lib/glib/include ../include /usr/include/gtk-1.2 /usr/X11R6/include
 388 +INCLUDEPATH = . /usr/include/glib-1.2 /usr/lib/glib/include ../include /usr/X11R6/include
 389  LIBS = -lglib -lm -ldl
 390  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H
 391  TMAKE_LFLAGS = -export-dynamic
 392  DESTDIR = ../../compiled
 393 +DEFINES += NOGUI
 394  TARGET = xmms
 395 diff -urN xmms-embedded.orig/xmms/libxmms/titlestring.c xmms-embedded/xmms/libxmms/titlestring.c
 396 --- xmms-embedded.orig/xmms/libxmms/titlestring.c       2002-10-10 13:51:48.000000000 -0400
 397 +++ xmms-embedded/xmms/libxmms/titlestring.c    2004-03-28 17:39:52.000000000 -0500
 398 @@ -287,8 +287,9 @@
 399         {'c', N_("Comment")},
 400  };
 401
 402 +#ifndef NOGUI
 403  GtkWidget* xmms_titlestring_descriptions(char* tags, int columns)
 404  {
 405         return NULL;
 406  }
 407 -
 408 +#endif
 409 diff -urN xmms-embedded.orig/xmms/libxmms/titlestring.h xmms-embedded/xmms/libxmms/titlestring.h
 410 --- xmms-embedded.orig/xmms/libxmms/titlestring.h       2002-10-10 13:51:48.000000000 -0400
 411 +++ xmms-embedded/xmms/libxmms/titlestring.h    2004-03-28 17:39:52.000000000 -0500
 412 @@ -21,7 +21,9 @@
 413  #define XMMS_TITLESTRING_H
 414
 415  #include <glib.h>
 416 +#ifndef NOGUI
 417  #include <gtk/gtk.h>
 418 +#endif
 419
 420
 421  /*
 422 @@ -77,7 +79,9 @@
 423  #endif
 424
 425  gchar *xmms_get_titlestring(gchar *fmt, TitleInput *input);
 426 +#ifndef NOGUI
 427  GtkWidget* xmms_titlestring_descriptions(char* tags, int rows);
 428 +#endif
 429
 430  #ifdef __cplusplus
 431  };
 432 diff -urN xmms-embedded.orig/xmms/libxmms/util.c xmms-embedded/xmms/libxmms/util.c
 433 --- xmms-embedded.orig/xmms/libxmms/util.c      2002-11-18 05:13:24.000000000 -0500
 434 +++ xmms-embedded/xmms/libxmms/util.c   2004-03-28 17:39:52.000000000 -0500
 435 @@ -1,8 +1,9 @@
 436  #if defined(HAVE_CONFIG_H)
 437  #include "config.h"
 438  #endif
 439 -
 440 +#ifndef NOGUI
 441  #include <gtk/gtk.h>
 442 +#endif
 443
 444  #ifdef HAVE_SCHED_H
 445  #include <sched.h>
 446 @@ -33,13 +34,13 @@
 447  #endif
 448
 449  #include "util.h"
 450 -
 451 +#ifndef NOGUI
 452  GtkWidget *xmms_show_message(gchar * title, gchar * text, gchar * button_text, gboolean modal, GtkSignalFunc button_action, gpointer action_data)
 453  {
 454
 455         return NULL;
 456  }
 457 -
 458 +#endif
 459  gboolean xmms_check_realtime_priority(void)
 460  {
 461  #ifdef HAVE_SCHED_SETSCHEDULER
 462 diff -urN xmms-embedded.orig/xmms/libxmms/util.h xmms-embedded/xmms/libxmms/util.h
 463 --- xmms-embedded.orig/xmms/libxmms/util.h      2002-11-18 05:13:25.000000000 -0500
 464 +++ xmms-embedded/xmms/libxmms/util.h   2004-03-28 17:39:52.000000000 -0500
 465 @@ -1,6 +1,9 @@
 466  #ifndef XMMS_UTIL_H
 467  #define XMMS_UTIL_H
 468 +#include <glib.h>
 469 +#ifndef NOGUI
 470  #include <gtk/gtk.h>
 471 +#endif
 472
 473  #define MYREMOTEFILE 1
 474  #define NOTMYREMOTEFILE 2
 475 @@ -10,8 +13,9 @@
 476  #ifdef __cplusplus
 477  extern "C" {
 478  #endif
 479 -
 480 +#ifndef NOGUI
 481  GtkWidget *xmms_show_message(gchar * title, gchar * text, gchar * button_text, gboolean modal, GtkSignalFunc button_action, gpointer action_data);
 482 +#endif
 483  gboolean xmms_check_realtime_priority(void);
 484  void xmms_usleep(gint usec);
 485  int is_my_remote_file(char *filename, char *pluginid);
 486 diff -urN xmms-embedded.orig/xmms/Output/OSS/configure.c xmms-embedded/xmms/Output/OSS/configure.c
 487 --- xmms-embedded.orig/xmms/Output/OSS/configure.c      2002-10-10 13:51:51.000000000 -0400
 488 +++ xmms-embedded/xmms/Output/OSS/configure.c   2004-03-28 17:39:52.000000000 -0500
 489 @@ -19,10 +19,12 @@
 490  #include "xmms/i18n.h"
 491  #include "OSS.h"
 492
 493 +#ifndef NOGUI
 494  static GtkWidget *configure_win = NULL;
 495  static GtkWidget *mixer_usemaster_check, *buffer_size_spin, *buffer_pre_spin;
 496  static GtkWidget *adevice_use_alt_check, *audio_alt_device_entry;
 497  static GtkWidget *mdevice_use_alt_check, *mixer_alt_device_entry;
 498 +#endif
 499  static gint audio_device, mixer_device;
 500
 501
 502 diff -urN xmms-embedded.orig/xmms/Output/OSS/OSS.h xmms-embedded/xmms/Output/OSS/OSS.h
 503 --- xmms-embedded.orig/xmms/Output/OSS/OSS.h    2003-04-01 12:55:54.000000000 -0500
 504 +++ xmms-embedded/xmms/Output/OSS/OSS.h 2004-03-28 17:39:52.000000000 -0500
 505 @@ -22,7 +22,7 @@
 506
 507  #include <unistd.h>
 508  #include <inttypes.h>
 509 -#include <gtk/gtk.h>
 510 +#include <glib.h>
 511
 512  #include <sys/types.h>
 513  #include <sys/ioctl.h>
 514 diff -urN xmms-embedded.orig/xmms/Output/OSS/oss.pro xmms-embedded/xmms/Output/OSS/oss.pro
 515 --- xmms-embedded.orig/xmms/Output/OSS/oss.pro  2002-10-10 13:51:52.000000000 -0400
 516 +++ xmms-embedded/xmms/Output/OSS/oss.pro       2004-03-28 17:39:52.000000000 -0500
 517 @@ -10,10 +10,11 @@
 518  mixer.c \
 519  OSS.c
 520
 521 -INCLUDEPATH = . ../../include ../.. /usr/include/glib-1.2 /usr/lib/glib/include /usr/include/gtk-1.2 /usr/X11R6/include
 522 +INCLUDEPATH = . ../../include ../.. /usr/include/glib-1.2 /usr/lib/glib/include /usr/X11R6/include
 523  LIBS = -lglib -lm -ldl
 524  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H
 525  TMAKE_LFLAGS =
 526  DESTDIR = ../../../compiled/xmms/Output
 527 +DEFINES += NOGUI
 528  TARGET = oss
 529
 530 diff -urN xmms-embedded.orig/xmms/Output/OSS/OSS.pro xmms-embedded/xmms/Output/OSS/OSS.pro
 531 --- xmms-embedded.orig/xmms/Output/OSS/OSS.pro  2004-03-28 17:18:51.000000000 -0500
 532 +++ xmms-embedded/xmms/Output/OSS/OSS.pro       2004-03-28 17:39:52.000000000 -0500
 533 @@ -15,5 +15,6 @@
 534  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H
 535  TMAKE_LFLAGS =
 536  DESTDIR = ../../../compiled/xmms/Output
 537 +DEFINES += NOGUI
 538  TARGET = oss
 539
 540 diff -urN xmms-embedded.orig/xmms/xmms/main.c xmms-embedded/xmms/xmms/main.c
 541 --- xmms-embedded.orig/xmms/xmms/main.c 2002-12-25 13:24:00.000000000 -0500
 542 +++ xmms-embedded/xmms/xmms/main.c      2004-03-28 17:39:52.000000000 -0500
 543 @@ -19,11 +19,12 @@
 544   */
 545  #include "xmms.h"
 546  #include "eoss.h"
 547 -
 548 +#ifndef NOGUI
 549  #include <gdk/gdkx.h>
 550  #include <gdk/gdk.h>
 551  #include <X11/Xlib.h>
 552  #include <X11/Xatom.h>
 553 +#endif
 554  #include <getopt.h>
 555  #include <signal.h>
 556  #include <ctype.h>
 557 diff -urN xmms-embedded.orig/xmms/xmms/titlestring.h xmms-embedded/xmms/xmms/titlestring.h
 558 --- xmms-embedded.orig/xmms/xmms/titlestring.h  2002-10-10 13:52:48.000000000 -0400
 559 +++ xmms-embedded/xmms/xmms/titlestring.h       2004-03-28 17:39:52.000000000 -0500
 560 @@ -21,7 +21,10 @@
 561  #define XMMS_TITLESTRING_H
 562
 563  #include <glib.h>
 564 +
 565 +#ifndef NOGUI
 566  #include <gtk/gtk.h>
 567 +#endif
 568
 569
 570  /*
 571 @@ -77,7 +80,9 @@
 572  #endif
 573
 574  gchar *xmms_get_titlestring(gchar *fmt, TitleInput *input);
 575 +#ifndef NOGUI
 576  GtkWidget* xmms_titlestring_descriptions(char* tags, int rows);
 577 +#endif
 578
 579  #ifdef __cplusplus
 580  };
 581 diff -urN xmms-embedded.orig/xmms/xmms/util.c xmms-embedded/xmms/xmms/util.c
 582 --- xmms-embedded.orig/xmms/xmms/util.c 2002-10-10 13:51:57.000000000 -0400
 583 +++ xmms-embedded/xmms/xmms/util.c      2004-03-28 17:39:52.000000000 -0500
 584 @@ -18,8 +18,10 @@
 585   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 586   */
 587  #include "xmms.h"
 588 +#ifndef NOGUI
 589  #include <gdk/gdkprivate.h>
 590  #include <X11/Xlib.h>
 591 +#endif
 592  #include <sys/ipc.h>
 593  #include <ctype.h>
 594  #ifdef HAVE_FTS_H
 595 @@ -165,11 +167,12 @@
 596  #endif /* !HAVE_FTS_H */
 597  }
 598
 599 +#ifndef NOGUI
 600  GdkImage *create_dblsize_image(GdkImage * img)
 601  {
 602         return NULL;
 603  }
 604 -
 605 +#endif
 606  char *read_ini_string(const char *filename, const char *section, const char *key)
 607  {
 608         FILE *file;
 609 @@ -331,6 +334,7 @@
 610         gint y;
 611  };
 612
 613 +#ifndef NOGUI
 614  static void util_menu_position(GtkMenu *menu, gint *x, gint *y, gpointer data)
 615  {
 616  }
 617 @@ -362,12 +366,13 @@
 618         util_item_factory_popup_with_data(ifactory, NULL, NULL, x, y,
 619                                           mouse_button, time);
 620  }
 621 -
 622 +#endif
 623  static gint util_find_compare_func(gconstpointer a, gconstpointer b)
 624  {
 625         return strcasecmp(a, b);
 626  }
 627
 628 +#ifndef NOGUI
 629  static void util_add_url_callback(GtkWidget *w, GtkWidget *entry)
 630  {
 631  }
 632 @@ -375,7 +380,7 @@
 633  GtkWidget* util_create_add_url_window(gchar *caption, GtkSignalFunc ok_func, GtkSignalFunc enqueue_func)
 634  {
 635  }
 636 -
 637 +#endif
 638  static int int_compare_func(gconstpointer a, gconstpointer b)
 639  {
 640         if (GPOINTER_TO_INT(a) < GPOINTER_TO_INT(b))
 641 @@ -386,6 +391,7 @@
 642                 return 0;
 643  }
 644
 645 +#ifndef NOGUI
 646  static void filebrowser_changed(GtkWidget * w, GtkFileSelection * filesel)
 647  {
 648  }
 649 @@ -431,7 +437,7 @@
 650  void util_set_cursor(GtkWidget *window)
 651  {
 652  }
 653 -
 654 +#endif
 655  void util_dump_menu_rc(void)
 656  {
 657  }
 658 diff -urN xmms-embedded.orig/xmms/xmms/util.h xmms-embedded/xmms/xmms/util.h
 659 --- xmms-embedded.orig/xmms/xmms/util.h 2002-10-10 13:51:57.000000000 -0400
 660 +++ xmms-embedded/xmms/xmms/util.h      2004-03-28 17:39:52.000000000 -0500
 661 @@ -21,17 +21,21 @@
 662  #define UTIL_H
 663
 664  #include "i18n.h"
 665 +#include <glib.h>
 666 +#ifndef NOGUI
 667  #include <gdk/gdk.h>
 668  #include <gtk/gtk.h>
 669 +#endif
 670
 671  gchar *find_file_recursively(const char *dirname, const char *file);
 672  void del_directory(const char *dirname);
 673 -GdkImage *create_dblsize_image(GdkImage * img);
 674  char *read_ini_string(const char *filename, const char *section, const char *key);
 675  GArray *read_ini_array(const gchar * filename, const gchar * section, const gchar * key);
 676  GArray *string_to_garray(const gchar * str);
 677  void glist_movedown(GList * list);
 678  void glist_moveup(GList * list);
 679 +#ifndef NOGUI
 680 +GdkImage *create_dblsize_image(GdkImage * img);
 681  void util_item_factory_popup(GtkItemFactory * ifactory, guint x, guint y, guint mouse_button, guint32 time);
 682  void util_item_factory_popup_with_data(GtkItemFactory * ifactory, gpointer data, GtkDestroyNotify destroy, guint x, guint y, guint mouse_button, guint32 time);
 683  GtkWidget *util_create_add_url_window(gchar *caption, GtkSignalFunc ok_func, GtkSignalFunc enqueue_func);
 684 @@ -39,6 +43,7 @@
 685  gboolean util_filebrowser_is_dir(GtkFileSelection * filesel);
 686  GdkFont *util_font_load(gchar *name);
 687  void util_set_cursor(GtkWidget *window);
 688 +#endif
 689  void util_dump_menu_rc(void);
 690  void util_read_menu_rc(void);
 691
 692 diff -urN xmms-embedded.orig/xmms/xmms/xmms.h xmms-embedded/xmms/xmms/xmms.h
 693 --- xmms-embedded.orig/xmms/xmms/xmms.h 2002-10-10 13:52:24.000000000 -0400
 694 +++ xmms-embedded/xmms/xmms/xmms.h      2004-03-28 17:39:52.000000000 -0500
 695 @@ -18,10 +18,12 @@
 696  #ifndef XMMS_H
 697  #define XMMS_H
 698
 699 +#ifndef NOGUI
 700  #include <gtk/gtk.h>
 701  #include <gdk/gdkx.h>
 702  #include <gdk/gdkkeysyms.h>
 703  #include <X11/Xlib.h>
 704 +#endif
 705
 706  #include <sys/time.h>
 707  #include <sys/types.h>
 708 diff -urN xmms-embedded.orig/xmms/xmms/xmms.pro xmms-embedded/xmms/xmms/xmms.pro
 709 --- xmms-embedded.orig/xmms/xmms/xmms.pro       2002-10-10 13:52:48.000000000 -0400
 710 +++ xmms-embedded/xmms/xmms/xmms.pro    2004-03-28 17:39:52.000000000 -0500
 711 @@ -30,9 +30,10 @@
 712  pluginenum.c \
 713  urldecode.c \
 714  util.c
 715 -INCLUDEPATH = . .. /usr/include/glib-1.2 /usr/lib/glib/include ../include /usr/include/gtk-1.2 /usr/X11R6/include
 716 +INCLUDEPATH = . .. /usr/include/glib-1.2 /usr/lib/glib/include ../include /usr/X11R6/include
 717  LIBS = -lglib -L../../compiled -lxmms
 718  TMAKE_CFLAGS = -g -O2 -Wall -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H -DPLUGIN_DIR=\"/opt/QtPalmtop/lib/xmms\" -DLOCALEDIR=\"/usr/local/share/locale\" -DPLUGINSUBS=\"Output\",\"Input\",\"Effect\",\"General\"
 719  TMAKE_LFLAGS = -export-dynamic
 720  DESTDIR = ../../compiled/bin
 721 +DEFINES += NOGUI
 722  TARGET = xmms