Use users.db. trackdb* moves to lib/, as it's now used by client.c to

[disorder] / server / speaker.c

diff --git a/server/speaker.c b/server/speaker.c
index dc9b9813fd17ab591e03f63a25b33df7dcce56ff..d21ad7cd8c4e976eff06580ab2e20de92896c9c6 100644 (file)
--- a/server/speaker.c
+++ b/server/speaker.c
@@ -1,6 +1,7 @@
 /*
  * This file is part of DisOrder
  * Copyright (C) 2005, 2006, 2007 Richard Kettlewell
+ * Portions (C) 2007 Mark Wooding
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -141,7 +142,7 @@ static void help(void) {
 
 /* Display version number and terminate. */
 static void version(void) {
-  xprintf("disorder-speaker version %s\n", disorder_version_string);
+  xprintf("%s", disorder_version_string);
   xfclose(stdout);
   exit(0);
 }
@@ -351,8 +352,10 @@ static void speaker_play(size_t frames) {
   if(!playing->used || playing->start == (sizeof playing->buffer))
     playing->start = 0;
   /* If the buffer emptied out mark the track as unplayably */
-  if(!playing->used)
+  if(!playing->used && !playing->eof) {
+    error(0, "track buffer emptied");
     playing->playable = 0;
+  }
   frames -= written_frames;
   return;
 }