Blob Blame History Raw
diff -Nur /tmp/tmp.XuE20VQcQk/audacious-plugins-old/src/jack/jack.c audacious-plugins/src/jack/jack.c
--- /tmp/tmp.XuE20VQcQk/audacious-plugins-old/src/jack/jack.c	2009-09-11 17:27:13.000000000 +0200
+++ audacious-plugins/src/jack/jack.c	2009-11-24 19:20:15.674971400 +0100
@@ -236,7 +236,7 @@
 
 
 /* Return the amount of data that can be written to the device */
-static gint jack_free(void)
+static gint audacious_jack_free(void)
 {
   unsigned long return_val = JACK_GetBytesFreeSpace(driver);
   unsigned long tmp;
@@ -448,7 +448,7 @@
     .close_audio = jack_close,
     .flush = jack_flush,
     .pause = jack_pause,
-    .buffer_free = jack_free,
+    .buffer_free = audacious_jack_free,
     .buffer_playing = jack_playing,
     .output_time = jack_get_output_time,
     .written_time = jack_get_written_time,