[beepmp-cvs] bmp/beep Makefile.am,1.14,1.15 about.c,1.5,1.6 dirbrowser.c,1.16,1.17 dynamic_lib.c,1.4

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/beepmp/bmp/beep
In directory sc8-pr-cvs1:/tmp/cvs-serv13362

Modified Files:
	Makefile.am about.c dirbrowser.c dynamic_lib.c effect.h 
	equalizer.c equalizer.h fft.c fullscreen.c fullscreen.h 
	general.h hints.c hslider.c input.h main.c mainwin.h menurow.c 
	monostereo.c monostereo.h number.c number.h output.c output.h 
	pbutton.c pbutton.h playlist_popup.c playlist_popup.h 
	playlist_slider.c playlist_slider.h playlistwin.h playstatus.c 
	pluginenum.c prefswin.c sbutton.c sbutton.h skin.c skin.h 
	skinwin.c skinwin.h sm.c sm.h svis.c svis.h tbutton.c 
	tbutton.h textbox.c textbox.h util.h vis.c vis.h 
	visualization.c visualization.h 
Removed Files:
	beep.h 
Log Message:

- removed all inclusion of "beep.h", removed beep.h

Index: Makefile.am
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile.am	25 Dec 2003 00:58:09 -0000	1.14
--- Makefile.am	26 Dec 2003 08:30:15 -0000	1.15
***************
*** 59,63 ****
  plugin.h \
  softvolume.c softvolume.h \
- beep.h \
  getopt.c getopt1.c getopt.h \
  urldecode.c urldecode.h \
--- 59,62 ----

Index: about.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/about.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** about.c	26 Dec 2003 06:15:51 -0000	1.5
--- about.c	26 Dec 2003 08:30:15 -0000	1.6
***************
*** 19,23 ****
   */

! #include "config.h"

  #include "about.h"
--- 19,25 ----
   */

! #ifdef HAVE_CONFIG_H
! #  include "config.h"
! #endif

  #include "about.h"

Index: dirbrowser.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/dirbrowser.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** dirbrowser.c	26 Dec 2003 06:15:51 -0000	1.16
--- dirbrowser.c	26 Dec 2003 08:30:15 -0000	1.17
***************
*** 1,3 ****
! #include "config.h"

  #include "dirbrowser.h"
--- 1,6 ----
! 
! #ifdef HAVE_CONFIG_H
! #  include "config.h"
! #endif

  #include "dirbrowser.h"

Index: dynamic_lib.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/dynamic_lib.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dynamic_lib.c	24 Dec 2003 14:03:14 -0000	1.4
--- dynamic_lib.c	26 Dec 2003 08:30:15 -0000	1.5
***************
*** 1,7 ****

  #include <glib.h>
  #include <string.h>
- #include "config.h"
- #include "dynamic_lib.h"

  #ifdef HPUX
--- 1,10 ----
+ #ifdef HAVE_CONFIG_H
+ #  include "config.h"
+ #endif
+ 
+ #include "dynamic_lib.h"

  #include <glib.h>
  #include <string.h>

  #ifdef HPUX

Index: effect.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/effect.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** effect.h	26 Dec 2003 05:29:35 -0000	1.4
--- effect.h	26 Dec 2003 08:30:15 -0000	1.5
***************
*** 21,24 ****
--- 21,25 ----
  void effect_enable_from_stringified_list(const gchar * list);

+ extern struct EffectPluginData *ep_data;

  #endif

Index: equalizer.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/equalizer.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** equalizer.c	26 Dec 2003 06:47:05 -0000	1.10
--- equalizer.c	26 Dec 2003 08:30:15 -0000	1.11
***************
*** 19,23 ****
   */

! #include "config.h"

  #include "equalizer.h"
--- 19,25 ----
   */

! #ifdef HAVE_CONFIG_H
! #  include "config.h"
! #endif

  #include "equalizer.h"

Index: equalizer.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/equalizer.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** equalizer.h	26 Dec 2003 06:47:05 -0000	1.5
--- equalizer.h	26 Dec 2003 08:30:15 -0000	1.6
***************
*** 24,27 ****
--- 24,29 ----
  #include <gtk/gtk.h>

+ #include "pbutton.h"
+ 
  #define EQUALIZER_DOUBLESIZE (cfg.doublesize && cfg.eq_doublesize_linked)
  #define EQUALIZER_HEIGHT ((cfg.equalizer_shaded ? 14 : 116) * (EQUALIZER_DOUBLESIZE + 1))
***************
*** 52,55 ****
--- 54,59 ----

  extern GtkWidget *equalizerwin;
+ extern PButton *equalizerwin_close;
+ extern gboolean equalizerwin_focus;

  #endif

Index: fft.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/fft.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** fft.c	24 Dec 2003 14:03:14 -0000	1.2
--- fft.c	26 Dec 2003 08:30:15 -0000	1.3
***************
*** 26,30 ****
   */

! #include "config.h"
  #include "fft.h"

--- 26,33 ----
   */

! #ifdef HAVE_CONFIG_H
! #  include "config.h"
! #endif
! 
  #include "fft.h"

Index: fullscreen.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/fullscreen.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** fullscreen.c	24 Dec 2003 14:03:14 -0000	1.2
--- fullscreen.c	26 Dec 2003 08:30:15 -0000	1.3
***************
*** 16,22 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! #include <config.h>
! #include "beep.h"
  #include "libbeep/util.h"
  #include <X11/Xatom.h>
  #include <X11/Xmd.h>
--- 16,28 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! #ifdef HAVE_CONFIG_H
! #  include "config.h"
! #endif
! 
! #include "fullscreen.h"
! 
  #include "libbeep/util.h"
+ 
+ #include <X11/Xlib.h>
  #include <X11/Xatom.h>
  #include <X11/Xmd.h>

Index: fullscreen.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/fullscreen.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** fullscreen.h	24 Dec 2003 14:03:14 -0000	1.2
--- fullscreen.h	26 Dec 2003 08:30:15 -0000	1.3
***************
*** 26,31 ****
  #define _XMMS_FULLSCREEN_H 1

  #include <gtk/gtk.h>
! #include <gdk/gdkx.h>

  typedef struct {
--- 26,33 ----
  #define _XMMS_FULLSCREEN_H 1

+ #include <glib.h>
  #include <gtk/gtk.h>
! 
! #include <X11/Xlib.h>

  typedef struct {

Index: general.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/general.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** general.h	26 Dec 2003 06:15:51 -0000	1.3
--- general.h	26 Dec 2003 08:30:15 -0000	1.4
***************
*** 18,20 ****
--- 18,22 ----
  void general_enable_from_stringified_list(gchar * list);

+ extern struct GeneralPluginData *gp_data;
+ 
  #endif

Index: hints.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/hints.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** hints.c	24 Dec 2003 14:03:14 -0000	1.2
--- hints.c	26 Dec 2003 08:30:15 -0000	1.3
***************
*** 18,27 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
  #include <X11/Xlib.h>
  #include <X11/Xmd.h>
  #include <X11/Xatom.h>
- #include <gdk/gdkx.h>
- #include <gdk/gdkprivate.h>
- #include "beep.h"

  /* flags for the window layer */
--- 18,36 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
+ 
+ #include "hints.h"
+ 
+ #include <glib.h>
+ #include <gtk/gtk.h>
+ 
+ #include "equalizer.h"
+ #include "mainwin.h"
+ #include "playlistwin.h"
+ 
+ #include <gdk/gdkx.h>
+ #include <gdk/gdkprivate.h>
  #include <X11/Xlib.h>
  #include <X11/Xmd.h>
  #include <X11/Xatom.h>

  /* flags for the window layer */

Index: hslider.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/hslider.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** hslider.c	24 Dec 2003 14:03:14 -0000	1.3
--- hslider.c	26 Dec 2003 08:30:15 -0000	1.4
***************
*** 16,20 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! #include "beep.h"

  void hslider_set_position(HSlider * hs, gint pos)
--- 16,27 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! 
! #include "hslider.h"
! 
! #include <glib.h>
! #include <gdk/gdk.h>
! #include <gtk/gtk.h>
! 
! #include "skin.h"

  void hslider_set_position(HSlider * hs, gint pos)

Index: input.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/input.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** input.h	24 Dec 2003 14:03:14 -0000	1.8
--- input.h	26 Dec 2003 08:30:15 -0000	1.9
***************
*** 63,65 ****
--- 63,67 ----
  				    gchar ** genre, guint * tracknum);

+ extern struct InputPluginData *ip_data;
+ 
  #endif

Index: main.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/main.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** main.c	25 Dec 2003 23:26:13 -0000	1.27
--- main.c	26 Dec 2003 08:30:15 -0000	1.28
***************
*** 19,24 ****
   */

! #if defined(HAVE_CONFIG_H)
! #include "config.h"
  #endif

--- 19,24 ----
   */

! #ifdef HAVE_CONFIG_H
! #  include "config.h"
  #endif

Index: mainwin.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/mainwin.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mainwin.h	24 Dec 2003 14:03:17 -0000	1.6
--- mainwin.h	26 Dec 2003 08:30:15 -0000	1.7
***************
*** 5,8 ****
--- 5,9 ----

  #include "number.h"
+ #include "pbutton.h"
  #include "tbutton.h"
  #include "textbox.h"
***************
*** 31,37 ****
  extern GtkItemFactory *mainwin_play_menu;

! extern Number *mainwin_minus_num, *mainwin_10min_num, *mainwin_min_num,
!     *mainwin_10sec_num, *mainwin_sec_num;

  extern TButton *mainwin_shuffle, *mainwin_repeat, *mainwin_eq, *mainwin_pl;
  extern gint mainwin_timeout_tag;
--- 32,40 ----
  extern GtkItemFactory *mainwin_play_menu;

! extern Number *mainwin_minus_num, *mainwin_10min_num, *mainwin_min_num;
! extern Number *mainwin_10sec_num, *mainwin_sec_num;

+ extern PButton *mainwin_menubtn, *mainwin_minimize, *mainwin_shade,
+     *mainwin_close;
  extern TButton *mainwin_shuffle, *mainwin_repeat, *mainwin_eq, *mainwin_pl;
  extern gint mainwin_timeout_tag;
***************
*** 41,44 ****
--- 44,49 ----
  extern SVis *mainwin_svis;
  extern gint bitrate, frequency, numchannels;
+ 
+ extern gboolean mainwin_focus;

  void mainwin_create(void);

Index: menurow.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/menurow.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** menurow.c	24 Dec 2003 14:03:17 -0000	1.2
--- menurow.c	26 Dec 2003 08:30:16 -0000	1.3
***************
*** 16,20 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! #include "beep.h"

  void menurow_draw(Widget * w)
--- 16,28 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! 
! #include "menurow.h"
! 
! #include <glib.h>
! #include <gdk/gdk.h>
! 
! #include "main.h"
! #include "menurow.h"
! #include "widget.h"

  void menurow_draw(Widget * w)

Index: monostereo.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/monostereo.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** monostereo.c	24 Dec 2003 14:03:17 -0000	1.2
--- monostereo.c	26 Dec 2003 08:30:16 -0000	1.3
***************
*** 17,21 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! #include "beep.h"

  void monostereo_draw(Widget * w)
--- 17,28 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! 
! #include "monostereo.h"
! 
! #include <glib.h>
! #include <gdk/gdk.h>
! 
! #include "skin.h"
! #include "widget.h"

  void monostereo_draw(Widget * w)

Index: monostereo.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/monostereo.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** monostereo.h	24 Dec 2003 14:03:17 -0000	1.2
--- monostereo.h	26 Dec 2003 08:30:16 -0000	1.3
***************
*** 19,25 ****
  #define MONOSTEREO_H

  typedef struct {
      Widget ms_widget;
!     int ms_num_channels;
      SkinIndex ms_skin_index;
  } MonoStereo;
--- 19,31 ----
  #define MONOSTEREO_H

+ #include <glib.h>
+ #include <gdk/gdk.h>
+ 
+ #include "skin.h"
+ #include "widget.h"
+ 
  typedef struct {
      Widget ms_widget;
!     gint ms_num_channels;
      SkinIndex ms_skin_index;
  } MonoStereo;

Index: number.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/number.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** number.c	24 Dec 2003 14:03:17 -0000	1.2
--- number.c	26 Dec 2003 08:30:16 -0000	1.3
***************
*** 16,22 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
- #include "beep.h"

! void number_set_number(Number * nu, int number)
  {
      if (number == nu->nu_number)
--- 16,28 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */

! #include "number.h"
! 
! #include <glib.h>
! #include <gdk/gdk.h>
! 
! #include "skin.h"
! 
! void number_set_number(Number * nu, gint number)
  {
      if (number == nu->nu_number)

Index: number.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/number.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** number.h	24 Dec 2003 14:03:17 -0000	1.3
--- number.h	26 Dec 2003 08:30:16 -0000	1.4
***************
*** 20,23 ****
--- 20,26 ----
  #define NUMBER_H

+ #include <glib.h>
+ #include <gdk/gdk.h>
+ 
  #include "widget.h"
  #include "skin.h"
***************
*** 29,33 ****
  } Number;

! void number_set_number(Number * nu, int number);
  Number *create_number(GList ** wlist, GdkPixmap * parent, GdkGC * gc,
  		      gint x, gint y, SkinIndex si);
--- 32,36 ----
  } Number;

! void number_set_number(Number * nu, gint number);
  Number *create_number(GList ** wlist, GdkPixmap * parent, GdkGC * gc,
  		      gint x, gint y, SkinIndex si);

Index: output.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/output.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** output.c	24 Dec 2003 14:03:17 -0000	1.5
--- output.c	26 Dec 2003 08:30:16 -0000	1.6
***************
*** 18,22 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! #include "beep.h"
  #include "playlist.h"
  #include "libbeep/util.h"
--- 18,24 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! 
! #include "output.h"
! 
  #include "playlist.h"
  #include "libbeep/util.h"

Index: output.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/output.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** output.h	24 Dec 2003 14:03:17 -0000	1.2
--- output.h	26 Dec 2003 08:30:16 -0000	1.3
***************
*** 20,23 ****
--- 20,27 ----
  #define OUTPUT_H

+ #include <glib.h>
+ 
+ #include "plugin.h"
+ 
  struct OutputPluginData {
      GList *output_list;
***************
*** 27,35 ****
  GList *get_output_list(void);
  OutputPlugin *get_current_output_plugin(void);
! void set_current_output_plugin(int i);
! void output_about(int i);
! void output_configure(int i);
! void output_get_volume(int *l, int *r);
! void output_set_volume(int l, int r);

  #endif
--- 31,41 ----
  GList *get_output_list(void);
  OutputPlugin *get_current_output_plugin(void);
! void set_current_output_plugin(gint i);
! void output_about(gint i);
! void output_configure(gint i);
! void output_get_volume(gint * l, gint * r);
! void output_set_volume(gint l, gint r);
! 
! extern struct OutputPluginData *op_data;

  #endif

Index: pbutton.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/pbutton.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pbutton.c	24 Dec 2003 14:03:17 -0000	1.3
--- pbutton.c	26 Dec 2003 08:30:16 -0000	1.4
***************
*** 16,20 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! #include "beep.h"

  void pbutton_draw(Widget * w)
--- 16,28 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! 
! #include "pbutton.h"
! 
! #include <glib.h>
! #include <gtk/gtk.h>
! #include <gdk/gdk.h>
! 
! #include "skin.h"
! #include "widget.h"

  void pbutton_draw(Widget * w)
***************
*** 74,78 ****
  		       PButton * button)
  {
!     int inside;

      if (!button->pb_pressed)
--- 82,86 ----
  		       PButton * button)
  {
!     gint inside;

      if (!button->pb_pressed)

Index: pbutton.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/pbutton.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pbutton.h	24 Dec 2003 14:03:17 -0000	1.2
--- pbutton.h	26 Dec 2003 08:30:16 -0000	1.3
***************
*** 19,22 ****
--- 19,28 ----
  #define PBUTTON_H

+ #include <glib.h>
+ #include <gdk/gdk.h>
+ 
+ #include "widget.h"
+ #include "skin.h"
+ 
  typedef struct {
      Widget pb_widget;

Index: playlist_popup.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/playlist_popup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** playlist_popup.c	24 Dec 2003 14:03:17 -0000	1.3
--- playlist_popup.c	26 Dec 2003 08:30:16 -0000	1.4
***************
*** 17,21 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! #include "beep.h"

  typedef struct {
--- 17,30 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! 
! #include "playlist_popup.h"
! 
! #include <glib.h>
! #include <gtk/gtk.h>
! #include <gdk/gdk.h>
! #include <string.h>
! 
! #include "skin.h"
! #include "util.h"

  typedef struct {

Index: playlist_popup.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/playlist_popup.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** playlist_popup.h	24 Dec 2003 14:03:17 -0000	1.2
--- playlist_popup.h	26 Dec 2003 08:30:16 -0000	1.3
***************
*** 19,22 ****
--- 19,24 ----
  #define PLAYLIST_POPUP_H

+ #include <glib.h>
+ 
  void playlist_popup_destroy(void);
  void playlist_popup(gint x, gint y, gint num_items, gint * nx, gint * ny,

Index: playlist_slider.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/playlist_slider.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** playlist_slider.c	25 Dec 2003 23:26:13 -0000	1.4
--- playlist_slider.c	26 Dec 2003 08:30:16 -0000	1.5
***************
*** 18,22 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! #include "beep.h"

  void playlistslider_draw(Widget * w)
--- 18,30 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! 
! #include "playlist_slider.h"
! 
! #include <glib.h>
! 
! #include "playlist.h"
! #include "playlistwin.h"
! #include "skin.h"
! #include "widget.h"

  void playlistslider_draw(Widget * w)

Index: playlist_slider.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/playlist_slider.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** playlist_slider.h	24 Dec 2003 14:03:17 -0000	1.3
--- playlist_slider.h	26 Dec 2003 08:30:16 -0000	1.4
***************
*** 21,25 ****
--- 21,29 ----
  #define PLAYLIST_SLIDER_H

+ #include <glib.h>
+ #include <gdk/gdk.h>
+ 
  #include "playlist_list.h"
+ #include "widget.h"

  typedef struct {
***************
*** 29,33 ****
      gint ps_drag_y, ps_prev_y, ps_prev_height;
      GdkImage *ps_back_image;
!     int ps_skin_id;
  } PlaylistSlider;

--- 33,37 ----
      gint ps_drag_y, ps_prev_y, ps_prev_height;
      GdkImage *ps_back_image;
!     gint ps_skin_id;
  } PlaylistSlider;

Index: playlistwin.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/playlistwin.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** playlistwin.h	13 Dec 2003 13:31:54 -0000	1.4
--- playlistwin.h	26 Dec 2003 08:30:16 -0000	1.5
***************
*** 21,25 ****
--- 21,28 ----
  #define PLAYLISTWIN_H

+ #include <glib.h>
+ 
  #include "mainwin.h"
+ #include "pbutton.h"
  #include "playlist_list.h"

***************
*** 55,58 ****
--- 58,65 ----
  extern Vis *playlistwin_vis;
  extern PlayList_List *playlistwin_list;
+ 
+ extern PButton *playlistwin_shade, *playlistwin_close;
+ 
+ extern gboolean playlistwin_focus;

  #endif

Index: playstatus.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/playstatus.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** playstatus.c	24 Dec 2003 14:03:17 -0000	1.2
--- playstatus.c	26 Dec 2003 08:30:16 -0000	1.3
***************
*** 16,20 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! #include "beep.h"

  void playstatus_draw(Widget * w)
--- 16,27 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! 
! #include "playstatus.h"
! 
! #include <glib.h>
! #include <gdk/gdk.h>
! 
! #include "skin.h"
! #include "widget.h"

  void playstatus_draw(Widget * w)

Index: pluginenum.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/pluginenum.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** pluginenum.c	26 Dec 2003 03:33:06 -0000	1.14
--- pluginenum.c	26 Dec 2003 08:30:16 -0000	1.15
***************
*** 43,54 ****
  };

- extern struct InputPluginData *ip_data;
- extern struct OutputPluginData *op_data;
- extern struct EffectPluginData *ep_data;
- extern struct GeneralPluginData *gp_data;
- extern struct VisPluginData *vp_data;
- 
- extern Config cfg;
- 
  static gint d_iplist_compare(gconstpointer a, gconstpointer b)
  {
--- 43,46 ----

Index: prefswin.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/prefswin.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** prefswin.c	26 Dec 2003 06:47:05 -0000	1.6
--- prefswin.c	26 Dec 2003 08:30:16 -0000	1.7
***************
*** 77,89 ****
  PangoFontDescription *mainwin_font;

- 
- extern MenuRow *mainwin_menurow;
- 
- extern PButton *playlistwin_shade, *playlistwin_close, *equalizerwin_close;
- extern PButton *mainwin_menubtn, *mainwin_minimize, *mainwin_shade,
-     *mainwin_close;
- extern TextBox *mainwin_info;
- extern gboolean mainwin_focus, equalizerwin_focus, playlistwin_focus;
- 
  static gboolean is_opening = FALSE;
  static gint selected_oplugin;
--- 77,80 ----

Index: sbutton.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/sbutton.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sbutton.c	24 Dec 2003 14:03:17 -0000	1.3
--- sbutton.c	26 Dec 2003 08:30:16 -0000	1.4
***************
*** 16,20 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! #include "beep.h"

  void sbutton_button_press_cb(GtkWidget * widget, GdkEventButton * event,
--- 16,25 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! 
! #include "sbutton.h"
! 
! #include <glib.h>
! #include <gtk/gtk.h>
! #include <gdk/gdk.h>

  void sbutton_button_press_cb(GtkWidget * widget, GdkEventButton * event,

Index: sbutton.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/sbutton.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sbutton.h	24 Dec 2003 14:03:17 -0000	1.2
--- sbutton.h	26 Dec 2003 08:30:16 -0000	1.3
***************
*** 19,22 ****
--- 19,28 ----
  #define SBUTTON_H

+ #include <glib.h>
+ #include <gdk/gdk.h>
+ 
+ #include "widget.h"
+ 
+ #define SBUTTON(x)  ((SButton *)(x))
  typedef struct {
      Widget sb_widget;

Index: skin.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/skin.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** skin.c	24 Dec 2003 14:03:17 -0000	1.12
--- skin.c	26 Dec 2003 08:30:16 -0000	1.13
***************
*** 19,38 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
  #define G_LOG_DOMAIN "skin.c"

  /* TODO: enforce default sizes! */

! #include "beep.h"
  #include <ctype.h>

  #define DEFAULT_SKIN_PATH DATA_DIR "/Skins/Default"

  #ifndef HAVE_MKDTEMP
! char *mkdtemp(char *path);
  #endif

  Skin *skin;

! static int skin_current_num;

  typedef struct {
--- 19,57 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
+ 
  #define G_LOG_DOMAIN "skin.c"

+ #ifdef HAVE_CONFIG_H
+ #  include "config.h"
+ #endif
+ 
  /* TODO: enforce default sizes! */

! #include <glib.h>
! #include <stdio.h>
! #include <stdlib.h>
! #include <string.h>
  #include <ctype.h>

+ #include "bmp.h"
+ #include "equalizer.h"
+ #include "main.h"
+ #include "playlistwin.h"
+ #include "skin.h"
+ #include "skinwin.h"
+ #include "util.h"
+ 
+ #include <gdk/gdkx.h>
+ #include <X11/Xlib.h>
+ 
  #define DEFAULT_SKIN_PATH DATA_DIR "/Skins/Default"

  #ifndef HAVE_MKDTEMP
! gchar *mkdtemp(gchar * path);
  #endif

  Skin *skin;

! static gint skin_current_num;

  typedef struct {
***************
*** 224,228 ****
  }

! void skin_mask_create(Skin * sk, const gchar * path, int id,
  		      GdkWindow * win)
  {
--- 243,247 ----
  }

! void skin_mask_create(Skin * sk, const gchar * path, gint id,
  		      GdkWindow * win)
  {
***************
*** 596,600 ****
  }

! static void skin_load_pixmaps(const char *path)
  {
      GdkPixmap *text_pm;
--- 615,619 ----
  }

! static void skin_load_pixmaps(const gchar * path)
  {
      GdkPixmap *text_pm;

Index: skin.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/skin.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** skin.h	24 Dec 2003 14:03:17 -0000	1.5
--- skin.h	26 Dec 2003 08:30:16 -0000	1.6
***************
*** 21,24 ****
--- 21,25 ----
  #define SKIN_H

+ #include <glib.h>
  #include <gdk/gdk.h>

Index: skinwin.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/skinwin.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** skinwin.c	26 Dec 2003 03:33:06 -0000	1.10
--- skinwin.c	26 Dec 2003 08:30:16 -0000	1.11
***************
*** 18,30 ****
   */

! #include "beep.h"
! #include "beep/skin.h"
  #include "skin.h"
  #include "na.xpm"
  #include "beep_mini.xpm"

  GtkWidget *skinwin = NULL, *skinwin_close, *scrolled_win;
  GList *skinlist = NULL;
- //static pthread_mutex_t skinwin_mutex = PTHREAD_MUTEX_INITIALIZER;

  void create_skin_window(void);
--- 18,45 ----
   */

! #ifdef HAVE_CONFIG_H
! #  include "config.h"
! #endif
! 
! #include "skinwin.h"
! 
! #include <glib.h>
! #include <gdk/gdk.h>
! #include <gdk/gdkkeysyms.h>
! #include <gtk/gtk.h>
! #include <stdlib.h>
! #include <string.h>
! 
! #include "main.h"
  #include "skin.h"
+ #include "util.h"
+ 
  #include "na.xpm"
  #include "beep_mini.xpm"

+ #include <gdk/gdkx.h>
+ 
  GtkWidget *skinwin = NULL, *skinwin_close, *scrolled_win;
  GList *skinlist = NULL;

  void create_skin_window(void);
***************
*** 101,105 ****
  {

!     char *name;
      GtkTreeIter iter;
      GtkTreeView *treeview = GTK_TREE_VIEW(data);
--- 116,120 ----
  {

!     gchar *name;
      GtkTreeIter iter;
      GtkTreeView *treeview = GTK_TREE_VIEW(data);
***************
*** 144,149 ****
  static void add_skin(gchar * skin)
  {
!     struct SkinNode *node =
! 	(struct SkinNode *) g_malloc(sizeof(struct SkinNode));
      gchar *tmp = NULL;

--- 159,163 ----
  static void add_skin(gchar * skin)
  {
!     struct SkinNode *node = SKIN_NODE(g_malloc(sizeof(struct SkinNode)));
      gchar *tmp = NULL;

Index: skinwin.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/skinwin.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** skinwin.h	24 Dec 2003 14:03:17 -0000	1.3
--- skinwin.h	26 Dec 2003 08:30:16 -0000	1.4
***************
*** 20,25 ****
--- 20,29 ----
  #define SKINWIN_H

+ #include <glib.h>
+ #include <gtk/gtk.h>
+ 
  extern GList *skinlist;

+ #define SKIN_NODE(x)  ((struct SkinNode *)(x))
  struct SkinNode {
      gchar *name, *path;

Index: sm.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/sm.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sm.c	24 Dec 2003 14:03:17 -0000	1.2
--- sm.c	26 Dec 2003 08:30:16 -0000	1.3
***************
*** 18,34 ****
   */

! #include "beep.h"

  #ifdef WITH_SM
- #include <X11/SM/SMlib.h>

! void mainwin_quit_cb(void);

  static SmcConn smc_conn = NULL;
  static IceConn ice_conn;
! static char *session_id;

! static void sm_save_yourself(SmcConn c, SmPointer p, int save_type,
! 			     Bool shutdown, int interact_style, Bool fast)
  {
      GDK_THREADS_ENTER();
--- 18,42 ----
   */

! #ifdef HAVE_CONFIG_H
! #  include "config.h"
! #endif
! 
! #include "sm.h"
! 
! #include <glib.h>
! 

  #ifdef WITH_SM

! #include <gdk/gdk.h>
! 
! #include <X11/SM/SMlib.h>

  static SmcConn smc_conn = NULL;
  static IceConn ice_conn;
! static gchar *session_id;

! static void sm_save_yourself(SmcConn c, SmPointer p, gint save_type,
! 			     Bool shutdown, gint interact_style, Bool fast)
  {
      GDK_THREADS_ENTER();
***************
*** 59,66 ****
  }

! void sm_init(int argc, char **argv, const char *previous_session_id)
  {
      SmcCallbacks smcall;
!     char errstr[256];

      if (!getenv("SESSION_MANAGER"))
--- 67,74 ----
  }

! void sm_init(gint argc, gchar ** argv, const gchar * previous_session_id)
  {
      SmcCallbacks smcall;
!     gchar errstr[256];

      if (!getenv("SESSION_MANAGER"))
***************
*** 78,82 ****
  				 SmcShutdownCancelledProcMask |
  				 SmcDieProcMask,
! 				 &smcall, (char *) previous_session_id,
  				 &session_id, sizeof(errstr), errstr);
      if (smc_conn) {
--- 86,90 ----
  				 SmcShutdownCancelledProcMask |
  				 SmcDieProcMask,
! 				 &smcall, (gchar *) previous_session_id,
  				 &session_id, sizeof(errstr), errstr);
      if (smc_conn) {
***************
*** 144,148 ****
  #else

! void sm_init(int argc, char **argv, const char *previous_session_id)
  {
  }
--- 152,156 ----
  #else

! void sm_init(gint argc, gchar ** argv, const gchar * previous_session_id)
  {
  }

Index: sm.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/sm.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** sm.h	19 Nov 2003 16:02:50 -0000	1.1.1.1
--- sm.h	26 Dec 2003 08:30:16 -0000	1.2
***************
*** 20,25 ****
  #define SM_H

! void sm_init(int argc, char **argv, const char *previous_session_id);
! void sm_cleanup(void);

  #endif
--- 20,35 ----
  #define SM_H

! #include <glib.h>
! 
! #ifdef __cplusplus
! extern "C" {
! #endif

+     void sm_init(gint argc, gchar ** argv,
+ 		 const gchar * previous_session_id);
+     void sm_cleanup(void);
+ 
+ #ifdef __cplusplus
+ }
+ #endif
  #endif

Index: svis.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/svis.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** svis.c	24 Dec 2003 14:03:17 -0000	1.2
--- svis.c	26 Dec 2003 08:30:16 -0000	1.3
***************
*** 17,21 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! #include "beep.h"

  static gint svis_redraw_delays[] = { 1, 2, 4, 8 };
--- 17,32 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! 
! #include "svis.h"
! 
! #include <glib.h>
! #include <gdk/gdk.h>
! #include <string.h>
! 
! #include "main.h"
! #include "mainwin.h"
! #include "plugin.h"
! #include "widget.h"
! #include "vis.h"

  static gint svis_redraw_delays[] = { 1, 2, 4, 8 };

Index: svis.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/svis.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** svis.h	24 Dec 2003 14:03:17 -0000	1.2
--- svis.h	26 Dec 2003 08:30:16 -0000	1.3
***************
*** 20,23 ****
--- 20,30 ----
  #define SVIS_H

+ #include <glib.h>
+ #include <gdk/gdk.h>
+ 
+ #include "svis.h"
+ #include "widget.h"
+ 
+ #define SVIS(x)  ((SVis *)(x))
  typedef struct {
      Widget vs_widget;

Index: tbutton.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/tbutton.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tbutton.c	24 Dec 2003 14:03:17 -0000	1.3
--- tbutton.c	26 Dec 2003 08:30:16 -0000	1.4
***************
*** 16,20 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! #include "beep.h"

  void tbutton_draw(Widget * w)
--- 16,26 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! 
! #include "tbutton.h"
! 
! #include <glib.h>
! #include <gdk/gdk.h>
! 
! #include "widget.h"

  void tbutton_draw(Widget * w)
***************
*** 92,96 ****
  		       TButton * button)
  {
!     int inside;

      if (!button->tb_pressed)
--- 98,102 ----
  		       TButton * button)
  {
!     gint inside;

      if (!button->tb_pressed)

Index: tbutton.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/tbutton.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tbutton.h	24 Dec 2003 14:03:17 -0000	1.2
--- tbutton.h	26 Dec 2003 08:30:16 -0000	1.3
***************
*** 19,22 ****
--- 19,28 ----
  #define TBUTTON_H

+ #include <glib.h>
+ 
+ #include "skin.h"
+ #include "widget.h"
+ 
+ #define TBUTTON(x) ((TButton *)(x))
  typedef struct {
      Widget tb_widget;

Index: textbox.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/textbox.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** textbox.c	24 Dec 2003 14:03:17 -0000	1.2
--- textbox.c	26 Dec 2003 08:30:16 -0000	1.3
***************
*** 18,24 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! #include "beep.h"
  #include <gdk/gdkprivate.h>
  #include <ctype.h>

  static void textbox_generate_pixmap(TextBox * tb);
--- 18,33 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! 
! #include "textbox.h"
! 
! #include <glib.h>
! #include <gtk/gtk.h>
! #include <gdk/gdk.h>
  #include <gdk/gdkprivate.h>
+ #include <string.h>
  #include <ctype.h>
+ 
+ #include "main.h"
+ #include "util.h"

  static void textbox_generate_pixmap(TextBox * tb);

Index: textbox.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/textbox.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** textbox.h	24 Dec 2003 14:03:17 -0000	1.4
--- textbox.h	26 Dec 2003 08:30:16 -0000	1.5
***************
*** 21,30 ****
  #define	TEXTBOX_H

  #include "skin.h"
  #include "widget.h"

! #define	TEXTBOX_SCROLL_TIMEOUT	200
! #define TEXTBOX_SCROLL_SMOOTH_TIMEOUT 30

  typedef struct {
      Widget tb_widget;
--- 21,35 ----
  #define	TEXTBOX_H

+ #include <glib.h>
+ #include <gdk/gdk.h>
+ #include <pango/pango.h>
+ 
  #include "skin.h"
  #include "widget.h"

! #define	TEXTBOX_SCROLL_TIMEOUT	       200
! #define TEXTBOX_SCROLL_SMOOTH_TIMEOUT  30

+ #define TEXTBOX(x)  ((TextBox*)(x))
  typedef struct {
      Widget tb_widget;
***************
*** 37,41 ****
      gint tb_timeout_tag, tb_drag_x, tb_drag_off;
      gint tb_nominal_y, tb_nominal_height;
!     int tb_skin_id;
      SkinIndex tb_skin_index;
      PangoFontDescription *tb_font;
--- 42,46 ----
      gint tb_timeout_tag, tb_drag_x, tb_drag_off;
      gint tb_nominal_y, tb_nominal_height;
!     gint tb_skin_id;
      SkinIndex tb_skin_index;
      PangoFontDescription *tb_font;

Index: util.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/util.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** util.h	26 Dec 2003 05:29:35 -0000	1.8
--- util.h	26 Dec 2003 08:30:16 -0000	1.9
***************
*** 23,28 ****
  #include "i18n.h"

! #define NO_PLAY_BUTTON FALSE
! #define PLAY_BUTTON TRUE

  gchar *escape_shell_chars(const gchar * string);
--- 23,31 ----
  #include "i18n.h"

! #include <glib.h>
! #include <gtk/gtk.h>
! 
! #define NO_PLAY_BUTTON  FALSE
! #define PLAY_BUTTON     TRUE

  gchar *escape_shell_chars(const gchar * string);

Index: vis.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/vis.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** vis.c	24 Dec 2003 14:03:17 -0000	1.2
--- vis.c	26 Dec 2003 08:30:16 -0000	1.3
***************
*** 17,21 ****
   */

! #include "beep.h"

  static const gfloat vis_afalloff_speeds[] = { 0.34, 0.5, 1.0, 1.3, 1.6 };
--- 17,29 ----
   */

! #include "vis.h"
! 
! #include <glib.h>
! #include <gdk/gdk.h>
! #include <string.h>
! 
! #include "main.h"
! #include "skin.h"
! #include "widget.h"

  static const gfloat vis_afalloff_speeds[] = { 0.34, 0.5, 1.0, 1.3, 1.6 };

Index: vis.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/vis.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** vis.h	24 Dec 2003 14:03:17 -0000	1.3
--- vis.h	26 Dec 2003 08:30:16 -0000	1.4
***************
*** 19,22 ****
--- 19,25 ----
  #define VIS_H

+ #include <glib.h>
+ #include <gdk/gdk.h>
+ 
  #include "widget.h"

***************
*** 50,53 ****
--- 53,57 ----
  } FalloffSpeed;

+ #define VIS(x)  ((Vis *)(x))
  typedef struct {
      Widget vs_widget;

Index: visualization.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/visualization.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** visualization.c	24 Dec 2003 14:03:17 -0000	1.3
--- visualization.c	26 Dec 2003 08:30:16 -0000	1.4
***************
*** 18,27 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! #include "beep.h"
  #include "fft.h"

  struct VisPluginData *vp_data;
- extern Vis *active_vis;
- extern SVis *mainwin_svis;

  GList *get_vis_list(void)
--- 18,39 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! 
! #include "visualization.h"
! 
! #include <glib.h>
! #include <stdlib.h>
! #include <math.h>
! #include <string.h>
! 
  #include "fft.h"
+ #include "input.h"
+ #include "main.h"
+ #include "plugin.h"
+ #include "prefswin.h"
+ #include "svis.h"
+ #include "vis.h"
+ #include "widget.h"

  struct VisPluginData *vp_data;

  GList *get_vis_list(void)
***************
*** 42,46 ****
  }

! void vis_about(int i)
  {
      GList *node = g_list_nth(vp_data->vis_list, i);
--- 54,58 ----
  }

! void vis_about(gint i)
  {
      GList *node = g_list_nth(vp_data->vis_list, i);
***************
*** 117,121 ****
  }

! gboolean vis_enabled(int i)
  {
      return (g_list_find
--- 129,133 ----
  }

! gboolean vis_enabled(gint i)
  {
      return (g_list_find

Index: visualization.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/visualization.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** visualization.h	24 Dec 2003 14:03:17 -0000	1.2
--- visualization.h	26 Dec 2003 08:30:16 -0000	1.3
***************
*** 21,24 ****
--- 21,28 ----
  #define VISUALIZATION_H

+ #include <glib.h>
+ 
+ #include "plugin.h"
+ 
  struct VisPluginData {
      GList *vis_list;
***************
*** 29,42 ****
  GList *get_vis_list(void);
  GList *get_vis_enabled_list(void);
! void enable_vis_plugin(int i, gboolean enable);
  void vis_disable_plugin(VisPlugin * vp);
! void vis_about(int i);
! void vis_configure(int i);
  void vis_playback_start(void);
  void vis_playback_stop(void);
! gboolean vis_enabled(int i);
  gchar *vis_stringify_enabled_list(void);
  void vis_enable_from_stringified_list(gchar * list);
! void vis_send_data(gint16 pcm_data[2][512], int nch, int lenght);

  #endif
--- 33,48 ----
  GList *get_vis_list(void);
  GList *get_vis_enabled_list(void);
! void enable_vis_plugin(gint i, gboolean enable);
  void vis_disable_plugin(VisPlugin * vp);
! void vis_about(gint i);
! void vis_configure(gint i);
  void vis_playback_start(void);
  void vis_playback_stop(void);
! gboolean vis_enabled(gint i);
  gchar *vis_stringify_enabled_list(void);
  void vis_enable_from_stringified_list(gchar * list);
! void vis_send_data(gint16 pcm_data[2][512], gint nch, gint length);
! 
! extern struct VisPluginData *vp_data;

  #endif

--- beep.h DELETED ---