# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1104076260 0
# Node ID ae5795ba5c77f716dcde504d3cb23ea21cd3ae36
# Parent  b6481d876ec217d628360bab7a9a9ab1be433f66
Remove "only when song-length unknown" option from minimum playtime, it
was bit illogical, thanks to HiSpeed for pointing that out.


diff -r b6481d876ec2 -r ae5795ba5c77 README
--- a/README	Sun Dec 26 15:33:03 2004 +0000
+++ b/README	Sun Dec 26 15:51:00 2004 +0000
@@ -106,10 +106,10 @@
 
 Songlength-tab
 --------------
-Most of song length settings should be self-explanatory. The
-respective "Only when song-length is unknown" options make
-maximum/minimum playtime limits work only when song length
-information is not found from song-length database.
+Most of song length settings should be self-explanatory.
+The "Only when song-length is unknown" option makes
+playtime limit effective only when song length information
+is not found from song-length database.
 
 - Use XSIDPLAY-compatible database: If enabled, you can specify
   song-length database file and it is used. If disabled, the
diff -r b6481d876ec2 -r ae5795ba5c77 src/xmms-sid.c
--- a/src/xmms-sid.c	Sun Dec 26 15:33:03 2004 +0000
+++ b/src/xmms-sid.c	Sun Dec 26 15:51:00 2004 +0000
@@ -409,16 +409,10 @@
 
  /* Check minimum playtime */
  songLength = myTune->subTunes[myStatus.currSong - 1].tuneLength;
- if (xs_cfg.playMinTimeEnable)
+ if (xs_cfg.playMinTimeEnable && (songLength >= 0))
  	{
-	if (xs_cfg.playMinTimeUnknown)
-		{
-		if (songLength < 0)
-			songLength = xs_cfg.playMinTime;
-		} else {
-		if (songLength < xs_cfg.playMinTime)
-			songLength = xs_cfg.playMinTime;
-		}
+	if (songLength < xs_cfg.playMinTime)
+		songLength = xs_cfg.playMinTime;
 	}
 
  /* Initialize song */
diff -r b6481d876ec2 -r ae5795ba5c77 src/xmms-sid.h
--- a/src/xmms-sid.h	Sun Dec 26 15:33:03 2004 +0000
+++ b/src/xmms-sid.h	Sun Dec 26 15:51:00 2004 +0000
@@ -49,7 +49,7 @@
 /* Define to ISO C99 macro for debugging instead of varargs function.
  * This provides more useful information.
  */
-#undef DEBUG_NP
+#define DEBUG_NP
 
 /* Define to enable non-portable thread and mutex debugging code.
  * You need to #define DEBUG also to make this useful.
diff -r b6481d876ec2 -r ae5795ba5c77 src/xs_config.c
--- a/src/xs_config.c	Sun Dec 26 15:33:03 2004 +0000
+++ b/src/xs_config.c	Sun Dec 26 15:51:00 2004 +0000
@@ -69,7 +69,6 @@
 	{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"},
@@ -127,7 +126,6 @@
 { 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 },
@@ -216,7 +214,6 @@
  xs_cfg.playMaxTime		= 150;
 
  xs_cfg.playMinTimeEnable	= FALSE;
- xs_cfg.playMinTimeUnknown	= FALSE;
  xs_cfg.playMinTime		= 15;
  
  xs_cfg.songlenDBEnable		= FALSE;
@@ -691,7 +688,6 @@
 {
  gboolean isActive = GTK_TOGGLE_BUTTON(LUW("cfg_mintime_enable"))->active;
 
- gtk_widget_set_sensitive(LUW("cfg_mintime_unknown"), isActive);
  gtk_widget_set_sensitive(LUW("cfg_mintime"), isActive);
  gtk_widget_set_sensitive(LUW("cfg_mintime_label1"), isActive);
  gtk_widget_set_sensitive(LUW("cfg_mintime_label2"), isActive);
diff -r b6481d876ec2 -r ae5795ba5c77 src/xs_config.h
--- a/src/xs_config.h	Sun Dec 26 15:33:03 2004 +0000
+++ b/src/xs_config.h	Sun Dec 26 15:51:00 2004 +0000
@@ -91,8 +91,7 @@
 			playMaxTimeUnknown;	/* Use max-time only when song-length is unknown */
 	gint		playMaxTime;		/* MAX playtime in seconds */
 
-	gboolean	playMinTimeEnable,
-			playMinTimeUnknown;	/* Use min-time only when song-length is unknown */
+	gboolean	playMinTimeEnable;
 	gint		playMinTime;		/* MIN playtime in seconds */
 
 	gboolean	songlenDBEnable;
diff -r b6481d876ec2 -r ae5795ba5c77 xmms-sid.glade
--- a/xmms-sid.glade	Sun Dec 26 15:33:03 2004 +0000
+++ b/xmms-sid.glade	Sun Dec 26 15:51:00 2004 +0000
@@ -998,7 +998,7 @@
 	  <child>
 	    <padding>0</padding>
 	    <expand>False</expand>
-	    <fill>True</fill>
+	    <fill>False</fill>
 	  </child>
 
 	  <widget>
@@ -1028,20 +1028,6 @@
 	    </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>