chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build fixes for uaudio ALSA/OSS backends.
[disorder]
/
server
/
state.c
diff --git
a/server/state.c
b/server/state.c
index f23c06cf928e58f1a5672ad8ffa9bdded8df866d..a0ea660dfd95d5a88c667fd54edd8a77c410e009 100644
(file)
--- a/
server/state.c
+++ b/
server/state.c
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder.
/*
* This file is part of DisOrder.
- * Copyright (C) 2004, 2005, 2007
, 2008
Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007
-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
*
* 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,7
+15,9
@@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
+/** @file server/state.c
+ * @brief Global server state
+ */
#include "disorder-server.h"
static const char *current_unix;
#include "disorder-server.h"
static const char *current_unix;
@@
-24,6
+26,9
@@
static int current_unix_fd;
static struct addrinfo *current_listen_addrinfo;
static int current_listen_fd;
static struct addrinfo *current_listen_addrinfo;
static int current_listen_fd;
+/** @brief Current audio API */
+const struct uaudio *api;
+
void quit(ev_source *ev) {
info("shutting down...");
quitting(ev);
void quit(ev_source *ev) {
info("shutting down...");
quitting(ev);
@@
-110,6
+115,11
@@
int reconfigure(ev_source *ev, int reload) {
int ret = 0;
D(("reconfigure(%d)", reload));
int ret = 0;
D(("reconfigure(%d)", reload));
+ if(api) {
+ if(api->close_mixer)
+ api->close_mixer();
+ api = NULL;
+ }
if(reload) {
need_another_rescan = trackdb_rescan_cancel();
trackdb_close();
if(reload) {
need_another_rescan = trackdb_rescan_cancel();
trackdb_close();
@@
-124,6
+134,9
@@
int reconfigure(ev_source *ev, int reload) {
} else
/* We only allow for upgrade at startup */
trackdb_open(TRACKDB_CAN_UPGRADE);
} else
/* We only allow for upgrade at startup */
trackdb_open(TRACKDB_CAN_UPGRADE);
+ api = uaudio_find(config->api);
+ if(api->open_mixer)
+ api->open_mixer();
if(need_another_rescan)
trackdb_rescan(ev, 1/*check*/, 0, 0);
/* Arrange timeouts for schedule actions */
if(need_another_rescan)
trackdb_rescan(ev, 1/*check*/, 0, 0);
/* Arrange timeouts for schedule actions */