# HG changeset patch # User Matti Hamalainen # Date 1104075183 0 # Node ID b6481d876ec217d628360bab7a9a9ab1be433f66 # Parent e6dec620b1b3c278de87a31ebf361db5f8b94c39 Disable oversampling if non-mono output; remove disabling of oversampling settings in configuration dialog. diff -r e6dec620b1b3 -r b6481d876ec2 src/xmms-sid.c --- a/src/xmms-sid.c Sun Dec 26 14:59:01 2004 +0000 +++ b/src/xmms-sid.c Sun Dec 26 15:33:03 2004 +0000 @@ -150,6 +150,9 @@ if (xs_cfg.oversampleFactor > XS_MAX_OVERSAMPLE) xs_cfg.oversampleFactor = XS_MAX_OVERSAMPLE; + if (xs_cfg.audioChannels != XS_CHN_MONO) + xs_cfg.oversampleEnable = FALSE; + xs_status.audioFrequency = xs_cfg.audioFrequency; xs_status.audioBitsPerSample = xs_cfg.audioBitsPerSample; xs_status.audioChannels = xs_cfg.audioChannels; diff -r e6dec620b1b3 -r b6481d876ec2 src/xs_config.c --- a/src/xs_config.c Sun Dec 26 14:59:01 2004 +0000 +++ b/src/xs_config.c Sun Dec 26 15:33:03 2004 +0000 @@ -658,10 +658,6 @@ 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_sidplay2_grp"), isActive); gtk_widget_set_sensitive(LUW("cfg_emu_sidplay2_opt"), isActive);