tags 581282 + patch pending
thanks

Dear maintainer,

I've prepared an NMU for audacious-dumb (versioned as 0.57-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.
diff -u audacious-dumb-0.57/debian/changelog audacious-dumb-0.57/debian/changelog
--- audacious-dumb-0.57/debian/changelog
+++ audacious-dumb-0.57/debian/changelog
@@ -1,3 +1,11 @@
+audacious-dumb (0.57-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * audacious-dumb.c, audacious-dumb.h:
+    - Cherry-Pick fixes for new audacious (Closes: #581282).
+
+ -- Luca Falavigna <dktrkr...@debian.org>  Mon, 19 Jul 2010 19:45:24 +0200
+
 audacious-dumb (0.57-1) unstable; urgency=low
 
   * New upstream release.
only in patch2:
unchanged:
--- audacious-dumb-0.57.orig/audacious-dumb.c
+++ audacious-dumb-0.57/audacious-dumb.c
@@ -49,7 +49,6 @@
     .stop = stop,
     .pause = duh_pause,
     .seek = seek,
-    .get_song_info = get_song_info,
     .file_info_box = file_info_box,
     .get_song_tuple = get_tuple_info,
     .is_our_file_from_vfs = is_our_file_from_vfs,
@@ -281,19 +280,6 @@
 	return __get_tuple_info(filename, fd);
 }
 
-static void get_song_info(char *filename, char **title, int *length)
-{
-	Tuple *tuple = get_tuple_info(filename);
-	
-        (*length) = -1;
-        (*title) = NULL;
-	
-	*length = aud_tuple_get_int(tuple, FIELD_LENGTH, NULL);
-	*title = aud_tuple_formatter_process_string(tuple, duh_custom_title_format);
-
-	tuple_free(tuple);
-}
-
 static gchar *get_title(DUH *duh, char *filename)
 {
         Tuple *tuple = NULL;
@@ -363,14 +349,13 @@
 		}
 		else
 		{
-			playback->output->buffer_free ();
-			playback->output->buffer_free ();
 			while (playback->output->buffer_playing())
 				g_usleep(10000);
 			playback->playing = 0;
 		} 
 	}
 
+	playback->output->close_audio();
 	duh_end_sigrenderer(duh_file->file);
 	unload_duh(duh_file->duh);
 	return NULL;
only in patch2:
unchanged:
--- audacious-dumb-0.57.orig/audacious-dumb.h
+++ audacious-dumb-0.57/audacious-dumb.h
@@ -68,7 +68,6 @@
 
 static Tuple *get_tuple_info(char *filename);
 static Tuple *duh_probe_for_tuple(char *filename, VFSFile *fd);
-static void get_song_info(char *filename, char **title, int *length);
 static void file_info_box(char *filename);
 static void duh_about(void);
 static void duh_configure(void);

Reply via email to