changeset 958:30e515b6e651 trunk

[svn] A cast a day keeps the compiler warning at bay.
author chainsaw
date Sat, 14 Apr 2007 18:09:55 -0700
parents f3ccef1dcd61
children b2fbf53360cf
files ChangeLog src/rootvis/config_frontend.c src/rootvis/config_frontend_widgets.c
diffstat 3 files changed, 19 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Apr 14 17:38:32 2007 -0700
+++ b/ChangeLog	Sat Apr 14 18:09:55 2007 -0700
@@ -1,3 +1,14 @@
+2007-04-15 00:38:32 +0000  Tony Vroon <chainsaw@gentoo.org>
+  revision [2054]
+  Hammer the WMA plugin into shape enough to bolt the following upstream commit on: "WMA decoder improvement, output closer to the dmo binary.
+  Patch by Ian Braithwaite ian braithwaite dot dk".
+  trunk/src/wma/libffwma/dsputil.h |   17 +--
+  trunk/src/wma/libffwma/wma.h     |  150 ++++++++++++++++++++++++++
+  trunk/src/wma/libffwma/wmadata.h |   57 ++++++----
+  trunk/src/wma/libffwma/wmadec.c  |  218 +++++++--------------------------------
+  4 files changed, 240 insertions(+), 202 deletions(-)
+
+
 2007-04-14 23:09:21 +0000  Tony Vroon <chainsaw@gentoo.org>
   revision [2052]
   I said to indent it, not to break it, hmmkay?
--- a/src/rootvis/config_frontend.c	Sat Apr 14 17:38:32 2007 -0700
+++ b/src/rootvis/config_frontend.c	Sat Apr 14 18:09:55 2007 -0700
@@ -134,11 +134,11 @@
 void signal_stereo_toggled(GtkWidget *togglebutton, gpointer data)
 {
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(togglebutton))) {
-		gtk_label_set_text(widgets.stereo_status[0], "renders left channel");
-		gtk_label_set_text(widgets.stereo_status[1], "renders right channel");
+		gtk_label_set_text(GTK_LABEL(widgets.stereo_status[0]), "renders left channel");
+		gtk_label_set_text(GTK_LABEL(widgets.stereo_status[1]), "renders right channel");
 	} else {
-		gtk_label_set_text(widgets.stereo_status[0], "renders both channels");
-		gtk_label_set_text(widgets.stereo_status[1], "unused / inactive");
+		gtk_label_set_text(GTK_LABEL(widgets.stereo_status[0]), "renders both channels");
+		gtk_label_set_text(GTK_LABEL(widgets.stereo_status[1]), "unused / inactive");
 	}
 }
 
--- a/src/rootvis/config_frontend_widgets.c	Sat Apr 14 17:38:32 2007 -0700
+++ b/src/rootvis/config_frontend_widgets.c	Sat Apr 14 18:09:55 2007 -0700
@@ -12,7 +12,7 @@
 	gtk_signal_connect(GTK_OBJECT(widget),	signal,	GTK_SIGNAL_FUNC(func),	GINT_TO_POINTER(data));
 }
 
-GtkWidget *frontend_create_window(int type, const char *name)
+GtkWidget *frontend_create_window(int type, char *name)
 {
 	GtkWidget *window;
 
@@ -25,7 +25,7 @@
 				NULL);
 
 	print_status("setting title");
-	gtk_window_set_title(window, name);
+	gtk_window_set_title(GTK_WINDOW(window), name);
 	print_status("done");
 	gtk_widget_show(window);
 	return window;
@@ -148,8 +148,8 @@
 	print_status(text);
 
 	label = gtk_label_new(text);
-	gtk_label_set_justify(label, GTK_JUSTIFY_CENTER);
-	gtk_label_set_line_wrap(label, TRUE);
+	gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);
+	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
 	gtk_widget_show(label);
 
 	gtk_container_add(GTK_CONTAINER(container), label);