# HG changeset patch # User Matti Hamalainen # Date 1092240181 0 # Node ID 676ec1a1ab93e529422b8c68fbe18eb9ffcb84bd # Parent 0ccef55966fab7756e075a8dcda3ac2c22e0c7a2 Minimum playtime option diff -r 0ccef55966fa -r 676ec1a1ab93 src/xs_config.c --- a/src/xs_config.c Wed Aug 11 03:04:02 2004 +0000 +++ b/src/xs_config.c Wed Aug 11 16:03:01 2004 +0000 @@ -62,8 +62,10 @@ {CTYPE_INT, &xs_cfg.oversampleFilter, "oversampleFilter"}, {CTYPE_BOOL, &xs_cfg.playMaxTimeEnable, "playMaxTimeEnable"}, + {CTYPE_BOOL, &xs_cfg.playMaxTimeUnknown, "playMaxTimeUnknown"}, {CTYPE_INT, &xs_cfg.playMaxTime, "playMaxTime"}, - {CTYPE_BOOL, &xs_cfg.playMaxTimeUnknown, "playMaxTimeUnknown"}, + {CTYPE_BOOL, &xs_cfg.playMinTimeEnable, "playMinTimeEnable"}, + {CTYPE_INT, &xs_cfg.playMinTime, "playMinTime"}, {CTYPE_BOOL, &xs_cfg.songlenDBEnable, "songlenDBEnable"}, {CTYPE_STR, &xs_cfg.songlenDBPath, "songlenDBPath"}, @@ -118,8 +120,10 @@ { 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_maxtime_unknown", &xs_cfg.playMaxTimeUnknown, 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 }, @@ -211,7 +215,12 @@ xs_cfg.oversampleFilter = XS_FILTER_AVERAGE; xs_cfg.playMaxTimeEnable = FALSE; + xs_cfg.playMaxTimeUnknown = FALSE; xs_cfg.playMaxTime = 150; + + xs_cfg.playMinTimeEnable = TRUE; + xs_cfg.playMinTime = 15; + xs_cfg.songlenDBEnable = FALSE; xs_strcalloc(&xs_cfg.songlenDBPath, "~/C64Music/Songlengths.txt"); diff -r 0ccef55966fa -r 676ec1a1ab93 src/xs_config.h --- a/src/xs_config.h Wed Aug 11 03:04:02 2004 +0000 +++ b/src/xs_config.h Wed Aug 11 16:03:01 2004 +0000 @@ -86,15 +86,16 @@ gint oversampleFilter; /* Oversampling filter type */ /* Playing settings */ - gboolean playMaxTimeEnable; + gboolean playMaxTimeEnable, + playMaxTimeUnknown; /* Use max-time only when song-length is unknown */ gint playMaxTime; /* MAX playtime in seconds */ - gboolean playMaxTimeUnknown; /* Use max-time only when song-length is unknown */ + + gboolean playMinTimeEnable; + gint playMinTime; /* MIN playtime in seconds */ + gboolean songlenDBEnable; gchar *songlenDBPath; /* Path to Songlengths.txt */ - gboolean silenceEnable; /* Silence detection */ - gint silenceMinTime; - gint silenceMaxCheck; /* Miscellaneous settings */ gboolean stilDBEnable; diff -r 0ccef55966fa -r 676ec1a1ab93 xmms-sid.glade --- a/xmms-sid.glade Wed Aug 11 03:04:02 2004 +0000 +++ b/xmms-sid.glade Wed Aug 11 16:03:01 2004 +0000 @@ -1091,7 +1091,7 @@ GTK_UPDATE_ALWAYS False False - 30 + 15 1 32767 1 @@ -1213,7 +1213,7 @@ GTK_UPDATE_ALWAYS False False - 60 + 150 1 32767 1