changeset 136:92952aeccb77

Minor fixes and improvements, nanosid support.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 23 Feb 2004 18:00:00 +0000
parents a3f522cbe787
children 6afee1ba02bb
files src/xmms-sid.c src/xs_about.c src/xs_config.c src/xs_nanosid.c
diffstat 4 files changed, 10 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/xmms-sid.c	Mon Feb 23 17:59:02 2004 +0000
+++ b/src/xmms-sid.c	Mon Feb 23 18:00:00 2004 +0000
@@ -625,9 +625,9 @@
 /*
  * File-information window
  */
-static GtkWidget		*xs_fileinfowin = NULL;
-static t_xs_tune		*xs_fileinfotune = NULL;
-static t_xs_stil_node		*xs_fileinfostil = NULL;
+static GtkWidget	*xs_fileinfowin = NULL;
+static t_xs_tune	*xs_fileinfotune = NULL;
+static t_xs_stil_node	*xs_fileinfostil = NULL;
 #define LUW(x...)	lookup_widget(xs_fileinfowin, ## x)
 
 
--- a/src/xs_about.c	Mon Feb 23 17:59:02 2004 +0000
+++ b/src/xs_about.c	Mon Feb 23 18:00:00 2004 +0000
@@ -27,7 +27,7 @@
 static GtkWidget *xs_aboutwin = NULL;
 
 
-int xs_about_ok(void)
+gint xs_about_ok(void)
 {
  gtk_widget_destroy(xs_aboutwin);
  xs_aboutwin = NULL;
@@ -173,9 +173,7 @@
  gtk_container_add (GTK_CONTAINER (alignment6), about_close);
  GTK_WIDGET_SET_FLAGS (about_close, GTK_CAN_DEFAULT);
 
- gtk_signal_connect (GTK_OBJECT (about_close), "clicked",
-                    GTK_SIGNAL_FUNC (xs_about_ok),
-                    NULL);
+ gtk_signal_connect (GTK_OBJECT (about_close), "clicked", GTK_SIGNAL_FUNC (xs_about_ok), NULL);
 
  gtk_widget_show(xs_aboutwin);
 }
--- a/src/xs_config.c	Mon Feb 23 17:59:02 2004 +0000
+++ b/src/xs_config.c	Mon Feb 23 18:00:00 2004 +0000
@@ -147,12 +147,10 @@
  */
 void xs_reset_filters(void)
 {
- /* Reset filter values */
-/*
- xs_cfg.filterFs = SIDEMU_DEFAULTFILTERFS;
- xs_cfg.filterFm = SIDEMU_DEFAULTFILTERFM;
- xs_cfg.filterFt = SIDEMU_DEFAULTFILTERFT;
-*/
+ /* Reset filter values (copied from libsidplay1's headers) */
+ xs_cfg.filterFs = 400.0f;
+ xs_cfg.filterFm = 60.0f;
+ xs_cfg.filterFt = 0.05f;
 }
 
 
--- a/src/xs_nanosid.c	Mon Feb 23 17:59:02 2004 +0000
+++ b/src/xs_nanosid.c	Mon Feb 23 18:00:00 2004 +0000
@@ -69,7 +69,7 @@
 
 
 /*
- * Close SIDPlay1
+ * Close NanoSID
  */
 void xs_nanosid_close(t_xs_status *myStatus)
 {