chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge disorder.macros branch.
[disorder]
/
server
/
disorderd.c
diff --git
a/server/disorderd.c
b/server/disorderd.c
index c7703549c5a77d98b869c349a138e4af0734825e..9f444b683dd84d246cd6342f6804d5ea713c9d85 100644
(file)
--- a/
server/disorderd.c
+++ b/
server/disorderd.c
@@
-160,7
+160,7
@@
static void create_periodic(ev_source *ev_,
}
static void periodic_rescan(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_) {
}
static void periodic_database_gc(ev_source attribute((unused)) *ev_) {
@@
-171,7
+171,7
@@
static void periodic_volume_check(ev_source attribute((unused)) *ev_) {
int l, r;
char lb[32], rb[32];
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;
if(l != volume_left || r != volume_right) {
volume_left = l;
volume_right = r;