Mercurial > hg > xmms-sid

changeset 360:3bea6584259f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Indentation fixes and SID model forcing
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 07 Nov 2005 10:29:02 +0000
parents b1a858b8cb1a
children 178e197f6f9a
files src/xs_config.c src/xs_config.h
diffstat 2 files changed, 82 insertions(+), 124 deletions(-) [+]
line wrap: on
line diff
--- a/src/xs_config.c	Mon Nov 07 09:50:04 2005 +0000
+++ b/src/xs_config.c	Mon Nov 07 10:29:02 2005 +0000
@@ -43,154 +43,111 @@
 struct t_xs_cfg xs_cfg;
 
 t_xs_cfg_item xs_cfgtable[] = {
-	{CTYPE_INT, &xs_cfg.audioBitsPerSample, "audioBitsPerSample"},
-	{CTYPE_INT, &xs_cfg.audioChannels, "audioChannels"},
-	{CTYPE_INT, &xs_cfg.audioFrequency, "audioFrequency"},
+{ CTYPE_INT,	&xs_cfg.audioBitsPerSample,	"audioBitsPerSample" },
+{ CTYPE_INT,	&xs_cfg.audioChannels,		"audioChannels" },
+{ CTYPE_INT,	&xs_cfg.audioFrequency,		"audioFrequency" },
 
-	{CTYPE_BOOL, &xs_cfg.mos8580, "mos8580"},
-	{CTYPE_BOOL, &xs_cfg.emulateFilters, "emulateFilters"},
-	{CTYPE_FLOAT, &xs_cfg.filterFs, "filterFs"},
-	{CTYPE_FLOAT, &xs_cfg.filterFm, "filterFm"},
-	{CTYPE_FLOAT, &xs_cfg.filterFt, "filterFt"},
-	{CTYPE_INT, &xs_cfg.memoryMode, "memoryMode"},
-	{CTYPE_INT, &xs_cfg.clockSpeed, "clockSpeed"},
-	{CTYPE_BOOL, &xs_cfg.forceSpeed, "forceSpeed"},
+{ CTYPE_BOOL,	&xs_cfg.mos8580,		"mos8580" },
+{ CTYPE_BOOL,	&xs_cfg.forceModel,		"forceModel" },
+{ CTYPE_BOOL,	&xs_cfg.emulateFilters,		"emulateFilters" },
+{ CTYPE_FLOAT,	&xs_cfg.filterFs,		"filterFs" },
+{ CTYPE_FLOAT,	&xs_cfg.filterFm,		"filterFm" },
+{ CTYPE_FLOAT,	&xs_cfg.filterFt,		"filterFt" },
+{ CTYPE_INT,	&xs_cfg.memoryMode,		"memoryMode" },
+{ CTYPE_INT,	&xs_cfg.clockSpeed,		"clockSpeed" },
+{ CTYPE_BOOL,	&xs_cfg.forceSpeed,		"forceSpeed" },
 
-	{CTYPE_INT, &xs_cfg.playerEngine, "playerEngine"},
+{ CTYPE_INT,	&xs_cfg.playerEngine,		"playerEngine" },
 
-	{CTYPE_INT, &xs_cfg.sid2Builder, "sid2Builder"},
-	{CTYPE_INT, &xs_cfg.sid2OptLevel, "sid2OptLevel"},
+{ CTYPE_INT,	&xs_cfg.sid2Builder,		"sid2Builder" },
+{ CTYPE_INT,	&xs_cfg.sid2OptLevel,		"sid2OptLevel" },
 
-	{CTYPE_BOOL, &xs_cfg.oversampleEnable, "oversampleEnable"},
-	{CTYPE_INT, &xs_cfg.oversampleFactor, "oversampleFactor"},
+{ CTYPE_BOOL,	&xs_cfg.oversampleEnable,	"oversampleEnable" },
+{ CTYPE_INT,	&xs_cfg.oversampleFactor,	"oversampleFactor" },
 
-	{CTYPE_BOOL, &xs_cfg.playMaxTimeEnable, "playMaxTimeEnable"},
-	{CTYPE_BOOL, &xs_cfg.playMaxTimeUnknown, "playMaxTimeUnknown"},
-	{CTYPE_INT, &xs_cfg.playMaxTime, "playMaxTime"},
-	{CTYPE_BOOL, &xs_cfg.playMinTimeEnable, "playMinTimeEnable"},
-	{CTYPE_INT, &xs_cfg.playMinTime, "playMinTime"},
-	{CTYPE_BOOL, &xs_cfg.songlenDBEnable, "songlenDBEnable"},
-	{CTYPE_STR, &xs_cfg.songlenDBPath, "songlenDBPath"},
+{ CTYPE_BOOL,	&xs_cfg.playMaxTimeEnable,	"playMaxTimeEnable" },
+{ CTYPE_BOOL,	&xs_cfg.playMaxTimeUnknown,	"playMaxTimeUnknown" },
+{ CTYPE_INT,	&xs_cfg.playMaxTime,		"playMaxTime" },
+{ CTYPE_BOOL,	&xs_cfg.playMinTimeEnable,	"playMinTimeEnable" },
+{ CTYPE_INT,	&xs_cfg.playMinTime,		"playMinTime" },
+{ CTYPE_BOOL,	&xs_cfg.songlenDBEnable,	"songlenDBEnable" },
+{ CTYPE_STR,	&xs_cfg.songlenDBPath,		"songlenDBPath" },
 
-	{CTYPE_BOOL, &xs_cfg.stilDBEnable, "stilDBEnable"},
-	{CTYPE_STR, &xs_cfg.stilDBPath, "stilDBPath"},
-	{CTYPE_STR, &xs_cfg.hvscPath, "hvscPath"},
+{ CTYPE_BOOL,	&xs_cfg.stilDBEnable,		"stilDBEnable" },
+{ CTYPE_STR,	&xs_cfg.stilDBPath,		"stilDBPath" },
+{ CTYPE_STR,	&xs_cfg.hvscPath,		"hvscPath" },
 
-	{CTYPE_INT, &xs_cfg.subsongControl, "subsongControl"},
-	{CTYPE_BOOL, &xs_cfg.detectMagic, "detectMagic"},
+{ CTYPE_INT,	&xs_cfg.subsongControl,		"subsongControl" },
+{ CTYPE_BOOL,	&xs_cfg.detectMagic,		"detectMagic" },
 
-	{CTYPE_BOOL, &xs_cfg.titleOverride, "titleOverride"},
-	{CTYPE_STR, &xs_cfg.titleFormat, "titleFormat"},
+{ CTYPE_BOOL,	&xs_cfg.titleOverride,		"titleOverride" },
+{ CTYPE_STR,	&xs_cfg.titleFormat,		"titleFormat" },
 
-	{CTYPE_BOOL, &xs_cfg.subAutoEnable, "subAutoEnable"},
-	{CTYPE_BOOL, &xs_cfg.subAutoMinOnly, "subAutoMinOnly"},
-	{CTYPE_INT, &xs_cfg.subAutoMinTime, "subAutoMinTime"},
+{ CTYPE_BOOL,	&xs_cfg.subAutoEnable,		"subAutoEnable" },
+{ CTYPE_BOOL,	&xs_cfg.subAutoMinOnly,		"subAutoMinOnly" },
+{ CTYPE_INT,	&xs_cfg.subAutoMinTime,		"subAutoMinTime" },
 };
 
 static const gint xs_cfgtable_max = (sizeof(xs_cfgtable) / sizeof(t_xs_cfg_item));
 
 
 t_xs_wid_item xs_widtable[] = {
-	{WTYPE_BGROUP, CTYPE_INT, "cfg_res_16bit", &xs_cfg.audioBitsPerSample, XS_RES_16BIT}
-	,
-	{WTYPE_BGROUP, CTYPE_INT, "cfg_res_8bit", &xs_cfg.audioBitsPerSample, XS_RES_8BIT}
-	,
-	{WTYPE_BGROUP, CTYPE_INT, "cfg_chn_mono", &xs_cfg.audioChannels, XS_CHN_MONO}
-	,
-	{WTYPE_BGROUP, CTYPE_INT, "cfg_chn_stereo", &xs_cfg.audioChannels, XS_CHN_STEREO}
-	,
-	{WTYPE_BGROUP, CTYPE_INT, "cfg_chn_autopan", &xs_cfg.audioChannels, XS_CHN_AUTOPAN}
-	,
-	{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_res_16bit",	&xs_cfg.audioBitsPerSample,	XS_RES_16BIT },
+{ WTYPE_BGROUP,	CTYPE_INT,	"cfg_res_8bit",		&xs_cfg.audioBitsPerSample,	XS_RES_8BIT },
+{ WTYPE_BGROUP,	CTYPE_INT,	"cfg_chn_mono",		&xs_cfg.audioChannels,		XS_CHN_MONO },
+{ WTYPE_BGROUP,	CTYPE_INT,	"cfg_chn_stereo",	&xs_cfg.audioChannels,		XS_CHN_STEREO },
+{ WTYPE_BGROUP,	CTYPE_INT,	"cfg_chn_autopan",	&xs_cfg.audioChannels,		XS_CHN_AUTOPAN },
+{ 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_emu_sidplay1", &xs_cfg.playerEngine, XS_ENG_SIDPLAY1}
-	,
-	{WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sidplay2", &xs_cfg.playerEngine, XS_ENG_SIDPLAY2}
-	,
-	{WTYPE_BGROUP, CTYPE_INT, "cfg_emu_mem_real", &xs_cfg.memoryMode, XS_MPU_REAL}
-	,
-	{WTYPE_BGROUP, CTYPE_INT, "cfg_emu_mem_banksw", &xs_cfg.memoryMode, XS_MPU_BANK_SWITCHING}
-	,
-	{WTYPE_BGROUP, CTYPE_INT, "cfg_emu_mem_transrom", &xs_cfg.memoryMode, XS_MPU_TRANSPARENT_ROM}
-	,
-	{WTYPE_BGROUP, CTYPE_INT, "cfg_emu_mem_playsid", &xs_cfg.memoryMode, XS_MPU_PLAYSID_ENVIRONMENT}
-	,
+{ 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 },
+{ WTYPE_BGROUP,	CTYPE_INT,	"cfg_emu_mem_real",	&xs_cfg.memoryMode,		XS_MPU_REAL },
+{ WTYPE_BGROUP,	CTYPE_INT,	"cfg_emu_mem_banksw",	&xs_cfg.memoryMode,		XS_MPU_BANK_SWITCHING },
+{ WTYPE_BGROUP,	CTYPE_INT,	"cfg_emu_mem_transrom",	&xs_cfg.memoryMode,		XS_MPU_TRANSPARENT_ROM },
+{ WTYPE_BGROUP,	CTYPE_INT,	"cfg_emu_mem_playsid",	&xs_cfg.memoryMode,		XS_MPU_PLAYSID_ENVIRONMENT },
 
-	{WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_mos8580", &xs_cfg.mos8580, 0}
-	,
-	{WTYPE_BGROUP, CTYPE_INT, "cfg_emu_clock_ntsc", &xs_cfg.clockSpeed, XS_CLOCK_NTSC}
-	,
-	{WTYPE_BGROUP, CTYPE_INT, "cfg_emu_clock_pal", &xs_cfg.clockSpeed, XS_CLOCK_PAL}
-	,
-	{WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_clock_force", &xs_cfg.forceSpeed, 0}
-	,
-	{WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_sidplay2_opt", &xs_cfg.sid2OptLevel, 0}
-	,
+{ WTYPE_BUTTON,	CTYPE_BOOL,	"cfg_emu_mos8580",	&xs_cfg.mos8580,		0 },
+{ WTYPE_BUTTON,	CTYPE_BOOL,	"cfg_emu_sid_force",	&xs_cfg.forceModel,		0 },
+{ WTYPE_BGROUP,	CTYPE_INT,	"cfg_emu_clock_ntsc",	&xs_cfg.clockSpeed,		XS_CLOCK_NTSC },
+{ WTYPE_BGROUP,	CTYPE_INT,	"cfg_emu_clock_pal",	&xs_cfg.clockSpeed,		XS_CLOCK_PAL },
+{ WTYPE_BUTTON,	CTYPE_BOOL,	"cfg_emu_clock_force",	&xs_cfg.forceSpeed,		0 },
+{ WTYPE_BUTTON,	CTYPE_BOOL,	"cfg_emu_sidplay2_opt",	&xs_cfg.sid2OptLevel,		0 },
 
-	{WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sidplay2_resid", &xs_cfg.sid2Builder, XS_BLD_RESID}
-	,
-	{WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sidplay2_hardsid", &xs_cfg.sid2Builder, XS_BLD_HARDSID}
-	,
+{ WTYPE_BGROUP,	CTYPE_INT,	"cfg_emu_sidplay2_resid",&xs_cfg.sid2Builder,		XS_BLD_RESID },
+{ WTYPE_BGROUP,	CTYPE_INT,	"cfg_emu_sidplay2_hardsid",&xs_cfg.sid2Builder,		XS_BLD_HARDSID },
 
-	{WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_filters", &xs_cfg.emulateFilters, 0}
-	,
-	{WTYPE_SCALE, CTYPE_FLOAT, "cfg_emu_filt_fs", &xs_cfg.filterFs, 0}
-	,
-	{WTYPE_SCALE, CTYPE_FLOAT, "cfg_emu_filt_fm", &xs_cfg.filterFm, 0}
-	,
-	{WTYPE_SCALE, CTYPE_FLOAT, "cfg_emu_filt_ft", &xs_cfg.filterFt, 0}
-	,
+{ WTYPE_BUTTON,	CTYPE_BOOL,	"cfg_emu_filters",	&xs_cfg.emulateFilters,		0 },
+{ WTYPE_SCALE,	CTYPE_FLOAT,	"cfg_emu_filt_fs",	&xs_cfg.filterFs,		0 },
+{ WTYPE_SCALE,	CTYPE_FLOAT,	"cfg_emu_filt_fm",	&xs_cfg.filterFm,		0 },
+{ WTYPE_SCALE,	CTYPE_FLOAT,	"cfg_emu_filt_ft",	&xs_cfg.filterFt,		0 },
 
-	{WTYPE_BUTTON, CTYPE_BOOL, "cfg_maxtime_enable", &xs_cfg.playMaxTimeEnable, 0}
-	,
-	{WTYPE_BUTTON, CTYPE_BOOL, "cfg_maxtime_unknown", &xs_cfg.playMaxTimeUnknown, 0}
-	,
-	{WTYPE_SPIN, CTYPE_INT, "cfg_maxtime", &xs_cfg.playMaxTime, 0}
-	,
-	{WTYPE_BUTTON, CTYPE_BOOL, "cfg_mintime_enable", &xs_cfg.playMinTimeEnable, 0}
-	,
-	{WTYPE_SPIN, CTYPE_INT, "cfg_mintime", &xs_cfg.playMinTime, 0}
-	,
-	{WTYPE_BUTTON, CTYPE_BOOL, "cfg_sld_enable", &xs_cfg.songlenDBEnable, 0}
-	,
-	{WTYPE_TEXT, CTYPE_STR, "cfg_sld_dbpath", &xs_cfg.songlenDBPath, 0}
-	,
+{ WTYPE_BUTTON,	CTYPE_BOOL,	"cfg_maxtime_enable",	&xs_cfg.playMaxTimeEnable,	0 },
+{ WTYPE_BUTTON,	CTYPE_BOOL,	"cfg_maxtime_unknown",	&xs_cfg.playMaxTimeUnknown,	0 },
+{ WTYPE_SPIN,	CTYPE_INT,	"cfg_maxtime",		&xs_cfg.playMaxTime,		0 },
+{ WTYPE_BUTTON,	CTYPE_BOOL,	"cfg_mintime_enable",	&xs_cfg.playMinTimeEnable,	0 },
+{ WTYPE_SPIN,	CTYPE_INT,	"cfg_mintime",		&xs_cfg.playMinTime,		0 },
+{ WTYPE_BUTTON,	CTYPE_BOOL,	"cfg_sld_enable",	&xs_cfg.songlenDBEnable,	0 },
+{ WTYPE_TEXT,	CTYPE_STR,	"cfg_sld_dbpath",	&xs_cfg.songlenDBPath,		0 },
 
-	{WTYPE_BUTTON, CTYPE_BOOL, "cfg_stil_enable", &xs_cfg.stilDBEnable, 0}
-	,
-	{WTYPE_TEXT, CTYPE_STR, "cfg_stil_dbpath", &xs_cfg.stilDBPath, 0}
-	,
-	{WTYPE_TEXT, CTYPE_STR, "cfg_hvsc_path", &xs_cfg.hvscPath, 0}
-	,
+{ WTYPE_BUTTON,	CTYPE_BOOL,	"cfg_stil_enable",	&xs_cfg.stilDBEnable,		0 },
+{ WTYPE_TEXT,	CTYPE_STR,	"cfg_stil_dbpath",	&xs_cfg.stilDBPath,		0 },
+{ WTYPE_TEXT,	CTYPE_STR,	"cfg_hvsc_path",	&xs_cfg.hvscPath,		0 },
+
+{ WTYPE_BGROUP,	CTYPE_INT,	"cfg_subctrl_none",	&xs_cfg.subsongControl,		XS_SSC_NONE },
+{ WTYPE_BGROUP,	CTYPE_INT,	"cfg_subctrl_seek",	&xs_cfg.subsongControl,		XS_SSC_SEEK },
+{ WTYPE_BGROUP,	CTYPE_INT,	"cfg_subctrl_popup",	&xs_cfg.subsongControl,		XS_SSC_POPUP },
+{ WTYPE_BGROUP,	CTYPE_INT,	"cfg_subctrl_patch",	&xs_cfg.subsongControl,		XS_SSC_PATCH },
 
-	{WTYPE_BGROUP, CTYPE_INT, "cfg_subctrl_none", &xs_cfg.subsongControl, XS_SSC_NONE}
-	,
-	{WTYPE_BGROUP, CTYPE_INT, "cfg_subctrl_seek", &xs_cfg.subsongControl, XS_SSC_SEEK}
-	,
-	{WTYPE_BGROUP, CTYPE_INT, "cfg_subctrl_popup", &xs_cfg.subsongControl, XS_SSC_POPUP}
-	,
-	{WTYPE_BGROUP, CTYPE_INT, "cfg_subctrl_patch", &xs_cfg.subsongControl, XS_SSC_PATCH}
-	,
-
-	{WTYPE_BUTTON, CTYPE_BOOL, "cfg_detectmagic", &xs_cfg.detectMagic, 0}
-	,
+{ WTYPE_BUTTON,	CTYPE_BOOL,	"cfg_detectmagic",	&xs_cfg.detectMagic,		0 },
 
-	{WTYPE_BUTTON, CTYPE_BOOL, "cfg_ftitle_override", &xs_cfg.titleOverride, 0}
-	,
-	{WTYPE_TEXT, CTYPE_STR, "cfg_ftitle_format", &xs_cfg.titleFormat, 0}
-	,
+{ WTYPE_BUTTON,	CTYPE_BOOL,	"cfg_ftitle_override",	&xs_cfg.titleOverride,		0 },
+{ WTYPE_TEXT,	CTYPE_STR,	"cfg_ftitle_format",	&xs_cfg.titleFormat,		0 },
 
-	{WTYPE_BUTTON, CTYPE_BOOL, "cfg_subauto_enable", &xs_cfg.subAutoEnable, 0}
-	,
-	{WTYPE_BUTTON, CTYPE_BOOL, "cfg_subauto_min_only", &xs_cfg.subAutoMinOnly, 0}
-	,
-	{WTYPE_SPIN, CTYPE_INT, "cfg_subauto_mintime", &xs_cfg.subAutoMinTime, 0}
-	,
+{ WTYPE_BUTTON,	CTYPE_BOOL,	"cfg_subauto_enable",	&xs_cfg.subAutoEnable,		0 },
+{ WTYPE_BUTTON,	CTYPE_BOOL,	"cfg_subauto_min_only",	&xs_cfg.subAutoMinOnly,		0 },
+{ WTYPE_SPIN,	CTYPE_INT,	"cfg_subauto_mintime",	&xs_cfg.subAutoMinTime,		0 },
 };
 
 static const gint xs_widtable_max = (sizeof(xs_widtable) / sizeof(t_xs_wid_item));
--- a/src/xs_config.h	Mon Nov 07 09:50:04 2005 +0000
+++ b/src/xs_config.h	Mon Nov 07 10:29:02 2005 +0000
@@ -70,6 +70,7 @@
 
 	/* General libSIDPlay settings */
 	gboolean	mos8580;		/* TRUE = 8580, FALSE = 6581 */
+	gboolean	forceModel;
 	gboolean	emulateFilters;
 	gfloat		filterFs;
 	gfloat		filterFm;