X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/132a5a4a47f9dbc7c52ee15234d70258c59ccf8e..74f77840c54d893a70142b0c846005d9e982e4fc:/server/disorder-server.h diff --git a/server/disorder-server.h b/server/disorder-server.h index 09eafbc..8209adb 100644 --- a/server/disorder-server.h +++ b/server/disorder-server.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2008 Richard Kettlewell + * Copyright (C) 2008, 2009 Richard Kettlewell * * 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 @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -66,7 +67,6 @@ #include "logfd.h" #include "mem.h" #include "mime.h" -#include "mixer.h" #include "printf.h" #include "queue.h" #include "random.h" @@ -80,12 +80,15 @@ #include "trackdb-int.h" #include "trackdb.h" #include "trackname.h" +#include "uaudio.h" #include "unicode.h" #include "user.h" #include "vector.h" #include "version.h" #include "wstat.h" +extern const struct uaudio *api; + void daemonize(const char *tag, int fac, const char *pidfile); /* Go into background. Send stdout/stderr to syslog. * If @pri@ is non-null, it should be "facility.level" @@ -99,6 +102,8 @@ void quit(ev_source *ev) attribute((noreturn)); int reconfigure(ev_source *ev, int reload); /* reconfigure. If @reload@ is nonzero, update the configuration. */ +void dbparams_check(void); + extern struct queue_entry qhead; /* queue of things yet to be played. the head will be played * soonest. */ @@ -121,7 +126,7 @@ void recent_write(void); /* write the recently played list out. Calls @fatal@ on error. */ struct queue_entry *queue_add(const char *track, const char *submitter, - int where); + int where, enum track_origin origin); #define WHERE_START 0 /* Add to head of queue */ #define WHERE_END 1 /* Add to end of queue */ #define WHERE_BEFORE_RANDOM 2 /* End, or before random track */