* 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;
}
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_) {
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;