diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-08-20 01:31:51 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-08-20 01:31:51 -0700 |
| commit | 1b197e65232e1a51b853db53985e8eda61f1b196 (patch) | |
| tree | 2d85ff67ba79e32256a20d2d2bee7222352007fd /src/volume.c | |
| parent | 5a0216af3dc7c9dedc4dacb708191f0fd380bb73 (diff) | |
| parent | 508ae1c18d3bdc99a1bb06181762e5ec859cf072 (diff) | |
| download | mpd-1b197e65232e1a51b853db53985e8eda61f1b196.tar.gz mpd-1b197e65232e1a51b853db53985e8eda61f1b196.tar.xz mpd-1b197e65232e1a51b853db53985e8eda61f1b196.zip | |
Merge branch 'core-rewrite' of git://git.musicpd.org/normalperson/mpd
* 'core-rewrite' of git://git.musicpd.org/normalperson/mpd:
Remove ob_wait_sync and cleanup triggering in playlist
fix output buffer deadlock when daemonizing
log.c: thread-safety for warning log
core rewrite (decode,player,outputBuffer,playlist)
Diffstat (limited to '')
| -rw-r--r-- | src/volume.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/volume.c b/src/volume.c index 5b720651a..0da7d0360 100644 --- a/src/volume.c +++ b/src/volume.c @@ -20,7 +20,6 @@ #include "command.h" #include "conf.h" #include "log.h" -#include "player.h" #include "gcc.h" #include "utils.h" #include "ack.h" @@ -492,7 +491,7 @@ static int changeSoftwareVolume(int fd, int change, int rel) new = 1000.0 * (exp(new / 25.0) - 1) / (54.5981500331F - 1) + 0.5; - setPlayerSoftwareVolume(new); + ob_set_sw_volume(new); return 0; } |