Re: debain bugs and release goal

Index: Makefile.am
===================================================================
RCS file: /cvsroot/zinf/zinf/Makefile.am,v
retrieving revision 1.25
diff -u -b -B -w -p -r1.25 Makefile.am
--- Makefile.am	13 Feb 2004 23:43:41 -0000	1.25
+++ Makefile.am	14 Feb 2004 23:27:47 -0000
@@ -13,31 +13,20 @@ so_dir = .libs
 so_ext = .so
 
 plugins = \
-  ui/cmdline/cmdline-ui.la ui/ncurses/ncurses-ui.la \
-  ui/mpg123/mpg123-ui.la \
-  ui/zinf/zinf-ui.la ui/musicbrowser/musicbrowser-ui.la \
-  ui/musicbrowsermm/musicbrowsermm-ui.la \
-  ui/download/download-ui.la \
-  ui/irman/irman-ui.la ui/lcd/lcd-ui.la \
-  ui/corba/corba-ui.la \
-  lmc/vorbis/vorbis-lmc.la lmc/xingmp3/xingmp3-lmc.la \
-  lmc/cd/cd-lmc.la lmc/wav/wav-lmc.la \
-  io/local/local-pmi.la \
-  io/cd/cd-pmo.la io/alsa/alsa-pmo.la io/arts/arts-pmo.la \
-  io/soundcard/unix/linux/soundcard-pmo.la \
-  io/esound/esound-pmo.la io/obs/obs-pmi.la io/http/http-pmi.la \
-  io/wavout/wavout-pmo.la \
   plm/metadata/vorbis/vorbis-mdf.la \
   plm/metadata/id3lib/id3lib-mdf.la \
   plm/metadata/misc/misc-mdf.la \
   plm/metadata/mbcd/mbcd-mdf.la \
   plm/playlist/m3u/m3u-plf.la \
   plm/playlist/pls/pls-plf.la \
-  plm/portable/pmp300/pmp300-ppp.la \
-  mdb/mdb-mdb.la \
-  ftc/kjofol/kjofol-ftf.la ftc/winamp/winamp-ftf.la
+	$(foreach ftf,@FTC_PLUGINS@, ftc/$(ftf)/$(ftf)-ftf.la) \
+	$(foreach lmc,@LMC_PLUGINS@, lmc/$(lmc)/$(lmc)-lmc.la) \
+	$(foreach pmi,@PMI_PLUGINS@, io/$(pmi)/$(pmi)-pmi.la) \
+	$(foreach pmo,@PMO_PLUGINS@, io/$(subst soundcard,soundcard/unix/@UNIX_AUDIO_API@,$(pmo))/$(pmo)-pmo.la) \
+	$(foreach ppp,@PORTABLE_PLUGINS@, plm/portable/$(ppp)/$(ppp)-ppp.la) \
+	$(foreach ui,@UI_PLUGINS@, ui/$(ui)/$(ui)-ui.la)
 
-ln-plugins:
+plugins/stamp: $(plugins)
 	-rm -rf plugins
 	-mkdir plugins || true
 	for plugin in $(plugins); do \
@@ -48,8 +37,9 @@ ln-plugins:
 	     ln -s ../$$lib plugins/`echo $$name | sed 's/-/./'`; \
 	   fi \
 	done
+	touch plugins/stamp
 
-all-local: ln-plugins
+all-local: plugins/stamp
 
 install-ln-plugins:
 	for plugin in $(DESTDIR)$(pkglibdir)/plugins/*.la ; do \
Index: configure.ac
===================================================================
RCS file: /cvsroot/zinf/zinf/configure.ac,v
retrieving revision 1.33
diff -u -b -B -w -p -r1.33 configure.ac
--- configure.ac	9 Feb 2004 09:53:44 -0000	1.33
+++ configure.ac	14 Feb 2004 23:27:47 -0000
@@ -17,10 +17,10 @@ dnl
 dnl $Id: configure.ac,v 1.33 2004/02/09 09:53:44 enxrah Exp $
 
 dnl Process this file with your mom to produce a configure script
-AC_INIT(base/src/player.cpp)
+AC_INIT(zinf,2.2.5)
 AC_PREREQ(2.50)
 AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE(zinf, 2.2.5)
+AM_INIT_AUTOMAKE
 AC_CONFIG_HEADER(config/config.h)
 
 dnl
@@ -382,7 +382,8 @@ dnl
 dnl Checks for I/O plugins
 dnl 
 
-IO_PLUGINS="local cd http wavout obs"
+PMI_PLUGINS="http local obs"
+PMO_PLUGINS="cd wavout"
 
 dnl ALSA
 AC_ARG_ENABLE(alsa, AC_HELP_STRING([--disable-alsa], 
@@ -399,7 +400,7 @@ if test "$enable_alsa" = "yes"; then
   LDFLAGS="$zinf_save_LDFLAGS"
   LIBS="$zinf_save_LIBS"
   if test "$have_alsa" = "true"; then
-    IO_PLUGINS="$IO_PLUGINS alsa"
+    PMO_PLUGINS="$PMO_PLUGINS alsa"
   fi
 fi
 
@@ -410,7 +411,7 @@ AC_ARG_ENABLE(esd, AC_HELP_STRING([--dis
 if test "$enable_esd" = "yes"; then
   AM_PATH_ESD(0.2.12, have_esound=true, have_esound=false)
   if test "$have_esound" = "true"; then
-    IO_PLUGINS="$IO_PLUGINS esound"
+    PMO_PLUGINS="$PMO_PLUGINS esound"
   fi
 fi
 
@@ -429,18 +430,19 @@ if test "x$enable_arts" = "xyes"; then
     else
 	ARTS_CFLAGS=`$ARTSCCONFIG --cflags`
 	ARTS_LIBS=`$ARTSCCONFIG --libs`
-	IO_PLUGINS="$IO_PLUGINS arts"
+	PMO_PLUGINS="$PMO_PLUGINS arts"
     fi
 fi
 
 if test "x$UNIX_AUDIO_API" != "x" ; then
-    IO_PLUGINS="$IO_PLUGINS soundcard"
+    PMO_PLUGINS="$PMO_PLUGINS soundcard"
 fi
 
 AC_SUBST(ARTS_LIBS)
 AC_SUBST(ARTS_CFLAGS)
 
-AC_SUBST(IO_PLUGINS)
+AC_SUBST(PMI_PLUGINS)
+AC_SUBST(PMO_PLUGINS)
 
 dnl
 dnl Checks for lmc plugins
Index: io/Makefile.am
===================================================================
RCS file: /cvsroot/zinf/zinf/io/Makefile.am,v
retrieving revision 1.5
diff -u -b -B -w -p -r1.5 Makefile.am
--- io/Makefile.am	16 Sep 2003 17:34:57 -0000	1.5
+++ io/Makefile.am	14 Feb 2004 23:27:47 -0000
@@ -1,4 +1,4 @@
-SUBDIRS = . @IO_PLUGINS@
+SUBDIRS = . @PMI_PLUGINS@ @PMO_PLUGINS@
 DIST_SUBDIRS = alsa arts cd esound local http dsound obs soundcard wavout
 
 headers = eventbuffer.h pipeline.h pmi.h pmo.h pmoevent.h \

Index: ui/zinf/unix/src/GTKWindow.cpp
===================================================================
RCS file: /cvsroot/zinf/zinf/ui/zinf/unix/src/GTKWindow.cpp,v
retrieving revision 1.9
diff -u -b -B -w -p -r1.9 GTKWindow.cpp
--- ui/zinf/unix/src/GTKWindow.cpp	16 Sep 2003 17:36:23 -0000	1.9
+++ ui/zinf/unix/src/GTKWindow.cpp	14 Feb 2004 23:38:00 -0000
@@ -144,6 +144,17 @@ void leave_notify(GtkWidget *w, GdkEvent
     ui->m_pMindMeldMutex->Release();
     gdk_threads_enter();
 }
+
+bool delete_window(GtkWidget *w, GdkEventCrossing *e, GTKWindow *ui)
+{
+    string oControl("Quit");
+    gdk_threads_leave();
+    ui->m_theme->HandleControlMessage(oControl, CM_Pressed);
+    gdk_threads_enter();
+
+    return true;
+}
+
 void mymusic_pop(GTKWindow *p, guint action, GtkWidget *w)
 {
     string oControl("MyMusic");
@@ -300,6 +311,8 @@ Error GTKWindow::Run(Pos &oPos)
                        GTK_SIGNAL_FUNC(enter_notify), this);
     gtk_signal_connect(GTK_OBJECT(mainWindow), "leave_notify_event",
                        GTK_SIGNAL_FUNC(leave_notify), this);
+    gtk_signal_connect(GTK_OBJECT(mainWindow), "delete_event",
+                       GTK_SIGNAL_FUNC(delete_window), this);
 
     iMaxX = gdk_screen_width();
     iMaxY = gdk_screen_height();