changeset 698:acace9812961 trunk

[svn] Bug #806 Pretty sure freeing InputPlayback here is a bad idea.
author nemo
date Tue, 20 Feb 2007 13:50:17 -0800
parents 74a762a3592e
children 14f80d61e855
files ChangeLog src/metronom/metronom.c
diffstat 2 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Feb 20 09:12:56 2007 -0800
+++ b/ChangeLog	Tue Feb 20 13:50:17 2007 -0800
@@ -1,3 +1,11 @@
+2007-02-20 17:12:56 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [1480]
+  - temporarily cheat and disable certain codepaths for local files
+  
+  trunk/src/aac/src/libmp4.c |    5 +++--
+  1 file changed, 3 insertions(+), 2 deletions(-)
+
+
 2007-02-20 17:02:15 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [1478]
   - temporary workaround for ISO-8859-1 8bit character does not appear correctly.
--- a/src/metronom/metronom.c	Tue Feb 20 09:12:56 2007 -0800
+++ b/src/metronom/metronom.c	Tue Feb 20 13:50:17 2007 -0800
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2000 Martin Strauß <mys@faveve.uni-stuttgart.de>
+ *  Copyright 2000 Martin Strau? <mys@faveve.uni-stuttgart.de>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -78,7 +78,7 @@
 	static GtkWidget *box;
 	box = xmms_show_message(
 		"About Metronom",
-		"A Tact Generator by Martin Strauß <mys@faveve.uni-stuttgart.de>\n\nTo use it, add a URL: tact://beats*num/den\ne.g. tact://77 to play 77 beats per minute\nor   tact://60*3/4 to play 60 bpm in 3/4 tacts", "Ok",
+		"A Tact Generator by Martin Strau? <mys@faveve.uni-stuttgart.de>\n\nTo use it, add a URL: tact://beats*num/den\ne.g. tact://77 to play 77 beats per minute\nor   tact://60*3/4 to play 60 bpm in 3/4 tacts", "Ok",
 		FALSE, NULL, NULL);
 	gtk_signal_connect(GTK_OBJECT(box), "destroy",
 			   GTK_SIGNAL_FUNC(gtk_widget_destroyed), &box);
@@ -147,7 +147,6 @@
 			produce_audio(playback->output->written_time(), FMT_S16_LE, 1, BUF_BYTES, data, &going);
 	}
 	/* Make sure the output plugin stops prebuffering */
-	free(arg);
 	playback->output->buffer_free();
 	playback->output->buffer_free();
 	g_thread_exit(NULL);