X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/e7eb3a2744aa45179daea235800753d3d1955338..36c5e137f39bc1ec10274201c9a13c04dcc86259:/server/disorder-server.h
diff --git a/server/disorder-server.h b/server/disorder-server.h
index c3a0e69..6d04c26 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
@@ -15,6 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
+/** @file server/disorder-server.h
+ * @brief Definitions for server and allied utilities
+ */
#ifndef DISORDER_SERVER_H
#define DISORDER_SERVER_H
@@ -39,6 +42,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -63,7 +67,6 @@
#include "logfd.h"
#include "mem.h"
#include "mime.h"
-#include "mixer.h"
#include "printf.h"
#include "queue.h"
#include "random.h"
@@ -77,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"
@@ -118,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 */