# HG changeset patch
# User mf0102
# Date 1169245943 28800
# Node ID 0358eb5783e617e8e98b4d7526b0c30c299e5b29
# Parent  cfc8431aceb53a26309ebd15b13da5709a2efe6f
[svn] some last good-night cleanup

diff -r cfc8431aceb5 -r 0358eb5783e6 ChangeLog
--- a/ChangeLog	Fri Jan 19 14:12:34 2007 -0800
+++ b/ChangeLog	Fri Jan 19 14:32:23 2007 -0800
@@ -1,3 +1,16 @@
+2007-01-19 22:12:34 +0000  Michael Farber <01mf02@gmail.com>
+  revision [3740]
+  cleanups in many regards
+  trunk/src/audacious/Makefile |   80 ++++++++++++++++++-------------------------
+  trunk/src/audacious/dnd.c    |   32 +++++++++++++++++
+  trunk/src/audacious/dnd.h    |   11 +++--
+  trunk/src/audacious/effect.c |    4 --
+  trunk/src/audacious/effect.h |    3 -
+  trunk/src/audacious/fft.h    |   30 +++++-----------
+  trunk/src/audacious/util.c   |    1 
+  7 files changed, 83 insertions(+), 78 deletions(-)
+
+
 2007-01-18 21:45:05 +0000  Michael Farber <01mf02@gmail.com>
   revision [3738]
   beautify and comment main.c
diff -r cfc8431aceb5 -r 0358eb5783e6 src/audacious/playback.c
--- a/src/audacious/playback.c	Fri Jan 19 14:12:34 2007 -0800
+++ b/src/audacious/playback.c	Fri Jan 19 14:32:23 2007 -0800
@@ -196,30 +196,6 @@
     playstatus_set_status_buffering(mainwin_playstatus, FALSE);
 }
 
-void
-playback_stop_reentrant(void)
-{
-    if (ip_data.playing && get_current_input_plugin()) {
-
-        if (playback_get_paused())
-            playback_pause();
-
-        ip_data.playing = FALSE;
-
-        free_vis_data();
-        ip_data.paused = FALSE;
-
-        if (input_info_text) {
-            g_free(input_info_text);
-            input_info_text = NULL;
-            mainwin_set_info_text();
-        }
-    }
-
-    ip_data.buffering = FALSE;
-    ip_data.playing = FALSE;
-}
-
 static void
 run_no_output_plugin_dialog(void)
 {
diff -r cfc8431aceb5 -r 0358eb5783e6 src/audacious/playback.h
--- a/src/audacious/playback.h	Fri Jan 19 14:12:34 2007 -0800
+++ b/src/audacious/playback.h	Fri Jan 19 14:32:23 2007 -0800
@@ -30,7 +30,6 @@
 void playback_initiate(void);
 void playback_pause(void);
 void playback_stop(void);
-void playback_stop_reentrant(void);
 gboolean playback_play_file(PlaylistEntry *entry);
 gboolean playback_get_playing(void);
 gboolean playback_get_paused(void);
diff -r cfc8431aceb5 -r 0358eb5783e6 src/audtool/Makefile
--- a/src/audtool/Makefile	Fri Jan 19 14:12:34 2007 -0800
+++ b/src/audtool/Makefile	Fri Jan 19 14:32:23 2007 -0800
@@ -2,8 +2,6 @@
 include ../../mk/init.mk
 include ../../mk/objective.mk
 
-beepincludedir = $(includedir)/audacious
-
 OBJECTIVE_BINS = audtool
 
 LDFLAGS += $(AUDLDFLAGS)
diff -r cfc8431aceb5 -r 0358eb5783e6 src/libaudacious/Makefile
--- a/src/libaudacious/Makefile	Fri Jan 19 14:12:34 2007 -0800
+++ b/src/libaudacious/Makefile	Fri Jan 19 14:32:23 2007 -0800
@@ -3,8 +3,6 @@
 
 PICLDFLAGS = $(LIBLDFLAGS)
 
-beepincludedir = $(includedir)/audacious
-
 OBJECTIVE_LIBS = libaudacious$(SHARED_SUFFIX)
 OBJECTIVE_SONAME_SUFFIX = 4