Mercurial > hg > xmms-sid
changeset 243:0cd0c02ed6c4
Added "apply min playtime only when song-length is unknown" option.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Tue, 21 Dec 2004 16:08:03 +0000 |
| parents | 1c743dcd6d84 |
| children | 5c76fec807c1 |
| files | src/xmms-sid.c src/xs_config.c src/xs_config.h xmms-sid.glade |
| diffstat | 4 files changed, 27 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xmms-sid.c Tue Dec 21 15:18:03 2004 +0000 +++ b/src/xmms-sid.c Tue Dec 21 16:08:03 2004 +0000 @@ -298,8 +298,14 @@ /* Check minimum playtime */ if (xs_cfg.playMinTimeEnable) { - if (songLength < xs_cfg.playMinTime) - songLength = xs_cfg.playMinTime; + if (xs_cfg.playMinTimeUnknown) + { + if (songLength < 0) + songLength = xs_cfg.playMinTime; + } else { + if (songLength < xs_cfg.playMinTime) + songLength = xs_cfg.playMinTime; + } } /* Initialize song */
--- a/src/xs_config.c Tue Dec 21 15:18:03 2004 +0000 +++ b/src/xs_config.c Tue Dec 21 16:08:03 2004 +0000 @@ -69,6 +69,7 @@ {CTYPE_BOOL, &xs_cfg.playMaxTimeUnknown, "playMaxTimeUnknown"}, {CTYPE_INT, &xs_cfg.playMaxTime, "playMaxTime"}, {CTYPE_BOOL, &xs_cfg.playMinTimeEnable, "playMinTimeEnable"}, + {CTYPE_BOOL, &xs_cfg.playMinTimeUnknown, "playMinTimeUnknown"}, {CTYPE_INT, &xs_cfg.playMinTime, "playMinTime"}, {CTYPE_BOOL, &xs_cfg.songlenDBEnable, "songlenDBEnable"}, {CTYPE_STR, &xs_cfg.songlenDBPath, "songlenDBPath"}, @@ -122,6 +123,7 @@ { 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_BUTTON, CTYPE_BOOL, "cfg_mintime_unknown", &xs_cfg.playMinTimeUnknown, 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 }, @@ -210,6 +212,7 @@ xs_cfg.playMaxTime = 150; xs_cfg.playMinTimeEnable = TRUE; + xs_cfg.playMinTimeUnknown = FALSE; xs_cfg.playMinTime = 15; xs_cfg.songlenDBEnable = FALSE;
--- a/src/xs_config.h Tue Dec 21 15:18:03 2004 +0000 +++ b/src/xs_config.h Tue Dec 21 16:08:03 2004 +0000 @@ -91,7 +91,8 @@ playMaxTimeUnknown; /* Use max-time only when song-length is unknown */ gint playMaxTime; /* MAX playtime in seconds */ - gboolean playMinTimeEnable; + gboolean playMinTimeEnable, + playMinTimeUnknown; /* Use min-time only when song-length is unknown */ gint playMinTime; /* MIN playtime in seconds */ gboolean songlenDBEnable;
--- a/xmms-sid.glade Tue Dec 21 15:18:03 2004 +0000 +++ b/xmms-sid.glade Tue Dec 21 16:08:03 2004 +0000 @@ -1028,6 +1028,20 @@ </widget> <widget> + <class>GtkCheckButton</class> + <name>cfg_mintime_unknown</name> + <can_focus>True</can_focus> + <label>Only when song-length is unknown</label> + <active>False</active> + <draw_indicator>True</draw_indicator> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> + </widget> + + <widget> <class>GtkHBox</class> <name>hbox18</name> <homogeneous>False</homogeneous>