X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/d867af1072e19ac8326846792e97f482113e7473..42f738c244c06450e25775631b73ac2fa0878da5:/server/disorder-server.h
diff --git a/server/disorder-server.h b/server/disorder-server.h
index d09420c..6d04c26 100644
--- a/server/disorder-server.h
+++ b/server/disorder-server.h
@@ -1,21 +1,22 @@
/*
* 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
+ * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program. If not, see .
+ */
+/** @file server/disorder-server.h
+ * @brief Definitions for server and allied utilities
*/
#ifndef DISORDER_SERVER_H
@@ -41,7 +42,7 @@
#include
#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"
@@ -121,7 +124,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 */