chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
'api' configuration command now uses uaudio. The list of APIs is only
[disorder]
/
disobedience
/
control.c
diff --git
a/disobedience/control.c
b/disobedience/control.c
index c51205966057c1aae229cdedd6a3abd4d0bb45a7..852885f7198827f79680ebf739c040545ba0a1ad 100644
(file)
--- a/
disobedience/control.c
+++ b/
disobedience/control.c
@@
-20,7
+20,6
@@
*/
#include "disobedience.h"
*/
#include "disobedience.h"
-#include "mixer.h"
/* Forward declarations ---------------------------------------------------- */
/* Forward declarations ---------------------------------------------------- */
@@
-323,7
+322,7
@@
static void volume_changed(const char attribute((unused)) *event,
++suppress_actions;
/* Only display volume/balance controls if they will work */
if(!rtp_supported
++suppress_actions;
/* Only display volume/balance controls if they will work */
if(!rtp_supported
- || (rtp_supported &&
mixer_supported(DEFAULT_BACKEND)
))
+ || (rtp_supported &&
backend && backend->set_volume
))
volume_supported = TRUE;
else
volume_supported = FALSE;
volume_supported = TRUE;
else
volume_supported = FALSE;
@@
-444,7
+443,8
@@
static void volume_adjusted(GtkAdjustment attribute((unused)) *a,
* from the log. */
if(rtp_supported) {
int l = nearbyint(left(v, b) * 100), r = nearbyint(right(v, b) * 100);
* from the log. */
if(rtp_supported) {
int l = nearbyint(left(v, b) * 100), r = nearbyint(right(v, b) * 100);
- mixer_control(DEFAULT_BACKEND, &l, &r, 1);
+ if(backend && backend->set_volume)
+ backend->set_volume(&l, &r);
} else
disorder_eclient_volume(client, volume_completed,
nearbyint(left(v, b) * 100),
} else
disorder_eclient_volume(client, volume_completed,
nearbyint(left(v, b) * 100),