+++ /dev/null
---- alsaplayer-0.99.70/interface/gtk/PlaylistWindow.cpp~ Mon May 13 15:31:56 2002
-+++ alsaplayer-0.99.70/interface/gtk/PlaylistWindow.cpp Sun May 19 00:36:16 2002
-@@ -149,7 +149,7 @@
- gtk_clist_freeze(GTK_CLIST(gtkpl->playlist_list));
- if (item.title.size()) {
- sprintf(tmp, "%s %s", item.title.c_str(),
-- item.artist.size() ? (string("- ") + item.artist).c_str() : "");
-+ item.artist.size() ? (std::string("- ") + item.artist).c_str() : "");
- gtk_clist_set_text(GTK_CLIST(gtkpl->playlist_list), position,
- 1, g_strdup(tmp));
- }
-@@ -438,7 +438,7 @@
- filename = (gchar *)g_strdup(new_path);
- if (item->title.size()) {
- sprintf(pt, "%s %s", item->title.c_str(),
-- item->artist.size() ? (string("- ") + item->artist).c_str() :
-+ item->artist.size() ? (std::string("- ") + item->artist).c_str() :
- "");
- } else {
- sprintf(pt, "%s", filename);
+++ /dev/null
---- alsaplayer-0.99.60/configure.ac~ Fri May 3 22:13:21 2002
-+++ alsaplayer-0.99.60/configure.ac Fri May 3 22:13:13 2002
-@@ -363,9 +363,10 @@
-
- oldcflags=$CFLAGS
- CFLAGS="$CFLAGS -I$x_includes -L$x_libraries -lXt"
--AC_CHECK_LIB(audio,AuStartFlow, [have_nas=yes NAS_LIB="-L$x_libraries -laudio -lXt"], have_nas=no)
-+AC_CHECK_LIB(audio,AuStartFlow, [have_nas=yes NAS_LIB="-L$x_libraries -laudio -lXt" NAS_CFLAGS="-I/usr/X11R6/include"], have_nas=no)
- CFLAGS=$oldcflags
- AC_SUBST(NAS_LIB)
-+AC_SUBST(NAS_CFLAGS)
-
-
- dnl ==========
---- alsaplayer-0.99.60/output/nas/Makefile.am~ Mon Mar 25 16:43:12 2002
-+++ alsaplayer-0.99.60/output/nas/Makefile.am Fri May 3 22:12:46 2002
-@@ -1,17 +1,8 @@
--if HAVE_NAS
-
- nas_outltlibs = libnas_out.la
- nas_outldflags = -export-dynamic -avoid-version
- nas_outsources = nas.c
-
--else
--
--nas_outltlibs =
--nas_outldflags =
--nas_outsources =
--
--endif
--
- EXTRA_DIST = nas.c
-
- lib_LTLIBRARIES = $(nas_outltlibs)
-@@ -17,7 +17,7 @@
- lib_LTLIBRARIES = $(nasltlibs)
-
- CFLAGS = -D_REENTRANT -I$(top_builddir) -I$(top_srcdir)/alsaplayer \
-- @ARCH_CFLAGS@
-+ @ARCH_CFLAGS@ @NAS_CFLAGS@ -I/usr/X11R6/include
-
- libdir = $(ADDON_DIR)/output
-