# HG changeset patch # User Matti Hamalainen # Date 1064015701 0 # Node ID 3fca0b13a80aaebfce7bd0be48ef33a0894db467 # Parent 741291e14080890d337784039847270eb75e8398 Configuration panel tweaking diff -r 741291e14080 -r 3fca0b13a80a src/xs_config.c --- a/src/xs_config.c Mon Sep 15 11:12:02 2003 +0000 +++ b/src/xs_config.c Fri Sep 19 23:55:01 2003 +0000 @@ -168,9 +168,19 @@ xs_reset_filters(); #ifdef HAVE_SIDPLAY2 + xs_cfg.playerEngine = XS_ENG_SIDPLAY2; xs_cfg.memoryMode = XS_MPU_REAL; #else +#ifdef HAVE_SIDPLAY1 + xs_cfg.playerEngine = XS_ENG_SIDPLAY1; xs_cfg.memoryMode = XS_MPU_BANK_SWITCHING; +#else +#ifdef HAVE_NANOSID + xs_cfg.playerEngine = XS_ENG_NANOSID; +#else +#error Something strange is going on here... Please re-configure! +#endif +#endif #endif xs_cfg.clockSpeed = XS_CLOCK_PAL; @@ -497,6 +507,43 @@ } +void xs_cfg_emu_sidplay1_toggled(GtkToggleButton *togglebutton, gpointer user_data) +{ +#ifdef HAVE_SIDPLAY1 +#endif +} + + +void xs_cfg_emu_sidplay2_set(gboolean isActive) +{ + gtk_widget_set_sensitive(LUW("cfg_emu_sidplay2_opt"), isActive); + + gtk_widget_set_sensitive(LUW("cfg_emu_mem_real"), isActive); + + gtk_widget_set_sensitive(LUW("cfg_oversample_grp"), isActive); + gtk_widget_set_sensitive(LUW("cfg_oversample"), isActive); + gtk_widget_set_sensitive(LUW("cfg_oversample_factor"), isActive); + + gtk_widget_set_sensitive(LUW("cfg_overfilter_average"), isActive); + gtk_widget_set_sensitive(LUW("cfg_overfilter_sinc"), isActive); +} + + +void xs_cfg_emu_sidplay2_toggled(GtkToggleButton *togglebutton, gpointer user_data) +{ +#ifdef HAVE_SIDPLAY2 + xs_cfg_emu_sidplay2_set(GTK_TOGGLE_BUTTON(LUW("cfg_emu_sidplay2"))->active); +#endif +} + + +void xs_cfg_emu_nanosid_toggled(GtkToggleButton *togglebutton, gpointer user_data) +{ +#ifdef HAVE_NANOSID +#endif +} + + /* * Execute the configuration panel */ @@ -520,24 +567,20 @@ gtk_widget_set_sensitive(LUW("cfg_emu_sidplay1"), FALSE); #endif -#ifdef HAVE_SIDPLAY2 +#ifndef HAVE_SIDPLAY2 gtk_widget_set_sensitive(LUW("cfg_emu_sidplay2"), FALSE); - gtk_widget_set_sensitive(LUW("cfg_emu_sidplay2_opt"), FALSE); - - gtk_widget_set_sensitive(LUW("cfg_emu_mem_real"), FALSE); - - gtk_widget_set_sensitive(LUW("cfg_oversample_grp"), FALSE); - gtk_widget_set_sensitive(LUW("cfg_oversample"), FALSE); - gtk_widget_set_sensitive(LUW("cfg_oversample_factor"), FALSE); - - gtk_widget_set_sensitive(LUW("cfg_overfilter_average"), FALSE); - gtk_widget_set_sensitive(LUW("cfg_overfilter_sinc"), FALSE); + xs_cfg_emu_sidplay2_set(FALSE); #endif #ifndef HAVE_NANOSID gtk_widget_set_sensitive(LUW("cfg_emu_nanosid"), FALSE); #endif + xs_cfg_emu_sidplay1_toggled(NULL, NULL); + xs_cfg_emu_sidplay2_toggled(NULL, NULL); + xs_cfg_emu_nanosid_toggled(NULL, NULL); + + /* Other UI options */ #ifndef HAVE_XMMSEXTRA gtk_widget_set_sensitive(LUW("cfg_ftitle_override"), FALSE); xs_cfg.titleOverride = TRUE; diff -r 741291e14080 -r 3fca0b13a80a src/xs_genui.c --- a/src/xs_genui.c Mon Sep 15 11:12:02 2003 +0000 +++ b/src/xs_genui.c Fri Sep 19 23:55:01 2003 +0000 @@ -41,3 +41,12 @@ } + + +void +xs_cfg_emu_filters_toggled (GtkToggleButton *togglebutton, + gpointer user_data) +{ + +} + diff -r 741291e14080 -r 3fca0b13a80a src/xs_genui.h --- a/src/xs_genui.h Mon Sep 15 11:12:02 2003 +0000 +++ b/src/xs_genui.h Fri Sep 19 23:55:01 2003 +0000 @@ -56,3 +56,19 @@ void xs_cfg_stil_fs_cancel (GtkButton *button, gpointer user_data); + +void +xs_cfg_emu_sidplay1_toggled (GtkToggleButton *togglebutton, + gpointer user_data); + +void +xs_cfg_emu_sidplay2_toggled (GtkToggleButton *togglebutton, + gpointer user_data); + +void +xs_cfg_emu_nanosid_toggled (GtkToggleButton *togglebutton, + gpointer user_data); + +void +xs_cfg_emu_filters_toggled (GtkToggleButton *togglebutton, + gpointer user_data);