Mildly more vigorous uninstall rules

[disorder] / server / disorderd.c

diff --git a/server/disorderd.c b/server/disorderd.c
index 01d4efe7bac40d34419bbd452c77c5f6b2fa8e4e..e78c28fc69ea511f76f78b8d28803682b73445e8 100644 (file)
--- a/server/disorderd.c
+++ b/server/disorderd.c
@@ -17,47 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-
-#include <config.h>
-#include "types.h"
-
-#include <stdio.h>
-#include <getopt.h>
-#include <pwd.h>
-#include <grp.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <signal.h>
-#include <sys/socket.h>
-#include <time.h>
-#include <locale.h>
-#include <syslog.h>
-#include <sys/time.h>
-#include <pcre.h>
-#include <fcntl.h>
-#include <gcrypt.h>
-
-#include "daemonize.h"
-#include "event.h"
-#include "log.h"
-#include "configuration.h"
-#include "rights.h"
-#include "trackdb.h"
-#include "queue.h"
-#include "mem.h"
-#include "play.h"
-#include "server.h"
-#include "state.h"
-#include "syscalls.h"
-#include "defs.h"
-#include "user.h"
-#include "mixer.h"
-#include "eventlog.h"
-#include "printf.h"
-#include "version.h"
+#include "disorder-server.h"
 
 static ev_source *ev;
 
@@ -160,7 +120,7 @@ static void create_periodic(ev_source *ev_,
 }
 
 static void periodic_rescan(ev_source *ev_) {
-  trackdb_rescan(ev_, 1/*check*/);
+  trackdb_rescan(ev_, 1/*check*/, 0, 0);
 }
 
 static void periodic_database_gc(ev_source attribute((unused)) *ev_) {
@@ -171,7 +131,7 @@ static void periodic_volume_check(ev_source attribute((unused)) *ev_) {
   int l, r;
   char lb[32], rb[32];
 
-  if(!mixer_control(&l, &r, 0)) {
+  if(!mixer_control(-1/*as configured*/, &l, &r, 0)) {
     if(l != volume_left || r != volume_right) {
       volume_left = l;
       volume_right = r;
@@ -304,8 +264,8 @@ int main(int argc, char **argv) {
   create_periodic(ev, periodic_volume_check, 60, 1);
   /* Check for a playable track once a second */
   create_periodic(ev, periodic_play_check, 1, 0);
-  /* Try adding a random track immediately and once every ten seconds */
-  create_periodic(ev, periodic_add_random, 10, 1);
+  /* Try adding a random track immediately and once every two seconds */
+  create_periodic(ev, periodic_add_random, 2, 1);
   /* enter the event loop */
   n = ev_run(ev);
   /* if we exit the event loop, something must have gone wrong */