Mercurial > hg > xmms-sid

changeset 172:505da1389e5c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Twiddling
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 13 Aug 2004 06:41:03 +0000
parents 78e06aecad7f
children 7515712b4af7
files src/xmms-sid.c src/xs_config.c src/xs_config.h src/xs_genui.c src/xs_genui.h
diffstat 5 files changed, 46 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
--- a/src/xmms-sid.c	Fri Aug 13 06:39:04 2004 +0000
+++ b/src/xmms-sid.c	Fri Aug 13 06:41:03 2004 +0000
@@ -788,11 +788,11 @@
 
  if (xs_fileinfostil)
  	{
+ 	/* Get subtune number */
+ 	
+ 	
 	/* Get subtune information */
-	tmpItem  = gtk_menu_get_active(GTK_MENU(data));
-	tmpIndex = g_list_index(GTK_MENU_SHELL(data)->children, tmpItem);
 	tmpNode = &xs_fileinfostil->subTune[tmpIndex];
-
 	subName = tmpNode->pName;
 	subAuthor = tmpNode->pAuthor;
 
@@ -819,10 +819,7 @@
 
 void xs_fileinfo(gchar *pcFilename)
 {
- GtkWidget *tmpMenuItem, *tmpMenu, *tmpOptionMenu;
  t_xs_stil_subnode *tmpNode;
- gchar tmpStr[32], *tmpS;
- gint n;
 
  /* Free old info, if set */
  if (xs_fileinfotune)
@@ -860,36 +857,6 @@
  gtk_entry_set_text(GTK_ENTRY(LUW("fileinfo_composer")), xs_fileinfotune->tuneComposer);
  gtk_entry_set_text(GTK_ENTRY(LUW("fileinfo_copyright")), xs_fileinfotune->tuneCopyright);
 
-
- /* Main tune - the pseudo tune */
- tmpOptionMenu = LUW("fileinfo_sub_tune");
- tmpMenu = GTK_OPTION_MENU(tmpOptionMenu)->menu;
-
- tmpMenuItem = gtk_menu_item_new_with_label ("General info");
- gtk_widget_show (tmpMenuItem);
- gtk_menu_append (GTK_MENU(tmpMenu), tmpMenuItem);
- gtk_signal_connect (GTK_OBJECT (tmpMenuItem), "activate",
-		GTK_SIGNAL_FUNC (xs_fileinfo_subtune), tmpMenu);
-
- /* Other menu items */
- for (n = 1; n <= xs_fileinfotune->nsubTunes; n++)
-	{
-	if (xs_fileinfostil)
-		{
-		tmpNode = &xs_fileinfostil->subTune[n];
-		tmpS = (tmpNode->pName) ? tmpNode->pName : "-";
-		snprintf(tmpStr, sizeof(tmpStr), "Tune #%i: %s", n, tmpS);
-		} else
-		snprintf(tmpStr, sizeof(tmpStr), "Tune #%i: -", n);
-
-	tmpMenuItem = gtk_menu_item_new_with_label(tmpStr);
-	gtk_widget_show (tmpMenuItem);
-	gtk_menu_append (GTK_MENU(tmpMenu), tmpMenuItem);
-
-	gtk_signal_connect (GTK_OBJECT(tmpMenuItem), "activate",
-			GTK_SIGNAL_FUNC(xs_fileinfo_subtune), tmpMenu);
-	}
-
  /* Set the sub-tune information */
  xs_fileinfo_subtune(NULL, tmpMenu);
 
--- a/src/xs_config.c	Fri Aug 13 06:39:04 2004 +0000
+++ b/src/xs_config.c	Fri Aug 13 06:41:03 2004 +0000
@@ -59,7 +59,6 @@
 
 	{CTYPE_BOOL,	&xs_cfg.oversampleEnable,	"oversampleEnable"},
 	{CTYPE_INT,	&xs_cfg.oversampleFactor,	"oversampleFactor"},
-	{CTYPE_INT,	&xs_cfg.oversampleFilter,	"oversampleFilter"},
 
 	{CTYPE_BOOL,	&xs_cfg.playMaxTimeEnable,	"playMaxTimeEnable"},
 	{CTYPE_BOOL,	&xs_cfg.playMaxTimeUnknown,	"playMaxTimeUnknown"},
@@ -94,8 +93,6 @@
 { WTYPE_SPIN,	CTYPE_INT,	"cfg_samplerate",	&xs_cfg.audioFrequency,		0 },
 { WTYPE_BUTTON,	CTYPE_BOOL,	"cfg_oversample",	&xs_cfg.oversampleEnable,	0 },
 { WTYPE_SPIN,	CTYPE_INT,	"cfg_oversample_factor",&xs_cfg.oversampleFactor,	0 },
-{ WTYPE_BGROUP,	CTYPE_INT,	"cfg_overfilter_average",&xs_cfg.oversampleFilter,	XS_FILTER_AVERAGE },
-{ WTYPE_BGROUP,	CTYPE_INT,	"cfg_overfilter_sinc",	&xs_cfg.oversampleFilter,	XS_FILTER_SINC },
 
 { WTYPE_BGROUP,	CTYPE_INT,	"cfg_emu_sidplay1",	&xs_cfg.playerEngine,		XS_ENG_SIDPLAY1 },
 { WTYPE_BGROUP,	CTYPE_INT,	"cfg_emu_sidplay2",	&xs_cfg.playerEngine,		XS_ENG_SIDPLAY2 },
@@ -212,7 +209,6 @@
 
  xs_cfg.oversampleEnable	= FALSE;
  xs_cfg.oversampleFactor	= XS_MIN_OVERSAMPLE;
- xs_cfg.oversampleFilter	= XS_FILTER_AVERAGE;
 
  xs_cfg.playMaxTimeEnable	= FALSE;
  xs_cfg.playMaxTimeUnknown	= FALSE;
@@ -583,6 +579,17 @@
  */
 void xs_cfg_emu_filters_toggled(GtkToggleButton *togglebutton, gpointer user_data)
 {
+ gboolean isActive = GTK_TOGGLE_BUTTON(LUW("cfg_emu_filters"))->active;
+
+ gtk_widget_set_sensitive(LUW("cfg_frm_fs"), isActive);
+ gtk_widget_set_sensitive(LUW("cfg_frm_fm"), isActive);
+ gtk_widget_set_sensitive(LUW("cfg_frm_ft"), isActive);
+
+ gtk_widget_set_sensitive(LUW("cfg_emu_filt_fs"), isActive);
+ gtk_widget_set_sensitive(LUW("cfg_emu_filt_fm"), isActive);
+ gtk_widget_set_sensitive(LUW("cfg_emu_filt_ft"), isActive);
+
+ gtk_widget_set_sensitive(LUW("cfg_filter_reset"), isActive);
 }
 
 
@@ -635,6 +642,30 @@
 }
 
 
+
+void xs_cfg_mintime_changed(GtkEditable *editable, gpointer user_data)
+{
+ gint tmpValue, maxValue;
+ 
+ if (tmpValue > maxValue)
+ 	
+ gtk_adjustment_set_value(
+ 	gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(LUW("cfg_maxtime"))),
+	tmpValue);
+}
+
+
+void xs_cfg_maxtime_changed(GtkEditable *editable, gpointer user_data)
+{
+ gint tmpValue, minValue;
+ 
+ 
+ gtk_adjustment_set_value(
+ 	gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(LUW("cfg_mintime"))),
+	tmpValue);
+}
+
+
 /*
  * Execute the configuration panel
  */
--- a/src/xs_config.h	Fri Aug 13 06:39:04 2004 +0000
+++ b/src/xs_config.h	Fri Aug 13 06:41:03 2004 +0000
@@ -48,12 +48,6 @@
 };
 
 
-enum XS_FILTER {
-	XS_FILTER_AVERAGE = 1,
-	XS_FILTER_SINC
-};
-
-
 enum XS_SSC {
 	XS_SSC_NONE = 1,
 	XS_SSC_POPUP,
@@ -83,7 +77,6 @@
 
 	gboolean	oversampleEnable;
 	gint		oversampleFactor;	/* Factor of oversampling */
-	gint		oversampleFilter;	/* Oversampling filter type */
 
 	/* Playing settings */
 	gboolean	playMaxTimeEnable,
--- a/src/xs_genui.c	Fri Aug 13 06:39:04 2004 +0000
+++ b/src/xs_genui.c	Fri Aug 13 06:41:03 2004 +0000
@@ -7,5 +7,3 @@
 #include "xs_genui.h"
 #include "xs_interface.h"
 #include "xs_glade.h"
-
-
--- a/src/xs_genui.h	Fri Aug 13 06:39:04 2004 +0000
+++ b/src/xs_genui.h	Fri Aug 13 06:41:03 2004 +0000
@@ -76,3 +76,11 @@
 void
 xs_cfg_hvsc_fs_cancel                  (GtkButton       *button,
                                         gpointer         user_data);
+
+void
+xs_cfg_mintime_changed                 (GtkEditable     *editable,
+                                        gpointer         user_data);
+
+void
+xs_cfg_maxtime_changed                 (GtkEditable     *editable,
+                                        gpointer         user_data);