From: Richard Kettlewell <richard@fanticule>
Date: Sun, 30 Dec 2007 13:53:57 +0000 (+0000)
Subject: set default gap to 0
X-Git-Tag: 3.0~136
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/07bc035e2ec3e4fb109fb36ad5f1fd751a960e70?ds=sidebyside

set default gap to 0
---

diff --git a/CHANGES b/CHANGES
index 6b1fc20..023bd9b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,8 @@ Users are now stored in the database rather than a configuration file.
 The server now has a built-in list of stopwords, so only additions need
 be mentioned in the configuration file.
 
+The default inter-track gap is now 0s.
+
 ** Web Interface
 
 The web interface now uses cookies to remember user identity, and allows
diff --git a/debian/etc.disorder.config b/debian/etc.disorder.config
index 53f206c..2e97422 100644
--- a/debian/etc.disorder.config
+++ b/debian/etc.disorder.config
@@ -28,9 +28,6 @@ tracklength *.ogg disorder-tracklength
 tracklength *.wav disorder-tracklength
 tracklength *.flac disorder-tracklength
 
-# Don't leave a gap between tracks.
-gap 0
-
 # Trust the web user and root.  Trusted users can stop the server or
 # pretend to be other users.
 #
diff --git a/doc/disorder_config.5.in b/doc/disorder_config.5.in
index ffabeb8..78acb2a 100644
--- a/doc/disorder_config.5.in
+++ b/doc/disorder_config.5.in
@@ -326,7 +326,7 @@ the whatever the ALSA configured default is.
 .TP
 .B gap \fISECONDS\fR
 Specifies the number of seconds to leave between tracks.  The default
-is 2.
+is 0.
 .TP
 .B history \fIINTEGER\fR
 Specifies the number of recently played tracks to remember (including
diff --git a/examples/config.sample.in b/examples/config.sample.in
index ced7585..324f230 100644
--- a/examples/config.sample.in
+++ b/examples/config.sample.in
@@ -25,9 +25,6 @@ tracklength *.flac disorder-tracklength
 # is ISO-8859-1.
 collection fs ISO-8859-1 /export/mp3
 
-# Don't leave a gap between tracks.
-gap 0
-
 # Scratch tracks.  You can add your own tracks here.
 scratch pkgdatadir/slap.ogg
 scratch pkgdatadir/scratch.ogg
diff --git a/lib/configuration.c b/lib/configuration.c
index dde3d3c..95720a3 100644
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -1145,7 +1145,7 @@ static struct config *config_default(void) {
   cs.line = 0;
   cs.config = c;
   /* Strings had better be xstrdup'd as they will get freed at some point. */
-  c->gap = 2;
+  c->gap = 0;
   c->history = 60;
   c->home = xstrdup(pkgstatedir);
   if(!(pw = getpwuid(getuid())))