set default gap to 0

diff --git a/CHANGES b/CHANGES
index 6b1fc202315bd9fa282729e9bd185dd49b47b339..023bd9b5345f7f68368e99cad85613be5202a19f 100644 (file)
--- 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 53f206cb3654b6a16a06ef98a399de58e44e7a7f..2e974223c8232266bd8d86b33fbbc14c8e0e8f85 100644 (file)
--- 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 ffabeb8d8d6dc273b5b73fc3e4256e29b90d6f2b..78acb2a68d06738b727921536227c349d47f500c 100644 (file)
--- 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 ced7585684e2eed3d15ec5ff16b0dfc6c3bda0e3..324f2308b3de9321e8e765443885cf77f5723c25 100644 (file)
--- 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 dde3d3c67a8bc30148c0012d5b9415d85165ed9f..95720a3fdca228601b3ddc70e26056eb9ba0a522 100644 (file)
--- 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())))