chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Source code reorganization:
[disorder]
/
disobedience
/
disobedience.c
diff --git
a/disobedience/disobedience.c
b/disobedience/disobedience.c
index 42eb190cf8b4c715fd704d2b60830c02aa141a8e..d6aa59976c602fd206dd968a7d396e4dc1b35a2d 100644
(file)
--- a/
disobedience/disobedience.c
+++ b/
disobedience/disobedience.c
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder.
/*
* This file is part of DisOrder.
- * Copyright (C) 2006, 2007 Richard Kettlewell
+ * Copyright (C) 2006, 2007
, 2008
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
@@
-312,9
+312,10
@@
static gboolean periodic_fast(gpointer attribute((unused)) data) {
}
last = now;
#endif
}
last = now;
#endif
- if(rtp_supported) {
+ if(rtp_supported
&& mixer_supported(DEFAULT_BACKEND)
) {
int nl, nr;
int nl, nr;
- if(!mixer_control(&nl, &nr, 0) && (nl != volume_l || nr != volume_r)) {
+ if(!mixer_control(DEFAULT_BACKEND, &nl, &nr, 0)
+ && (nl != volume_l || nr != volume_r)) {
volume_l = nl;
volume_r = nr;
volume_update();
volume_l = nl;
volume_r = nr;
volume_update();