diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2008-03-30 08:49:38 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2008-03-30 08:49:38 +0000 |
| commit | 62feb507e082f6e05dec76d30bd363e8aff2fd38 (patch) | |
| tree | 5e99adb97cc7e5ab57cb55d4d56fe9fbf999b971 | |
| parent | bd34bf174fdc67275100a43da5eb0aab483488d3 (diff) | |
| download | qmmp-62feb507e082f6e05dec76d30bd363e8aff2fd38.tar.gz qmmp-62feb507e082f6e05dec76d30bd363e8aff2fd38.tar.bz2 qmmp-62feb507e082f6e05dec76d30bd363e8aff2fd38.zip | |
fixed alsa plugin
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@299 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/plugins/Output/alsa/outputalsa.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/plugins/Output/alsa/outputalsa.cpp b/src/plugins/Output/alsa/outputalsa.cpp index 453bcc1ea..604a054e0 100644 --- a/src/plugins/Output/alsa/outputalsa.cpp +++ b/src/plugins/Output/alsa/outputalsa.cpp @@ -487,18 +487,17 @@ void OutputALSA::setVolume(int l, int r) void OutputALSA::volume(int *l, int *r) { - if (!pcm_element) - return; - - long ll = *l, lr = *r; - snd_mixer_handle_events(mixer); - snd_mixer_selem_get_playback_volume(pcm_element, - SND_MIXER_SCHN_FRONT_LEFT, &ll); - snd_mixer_selem_get_playback_volume(pcm_element, - SND_MIXER_SCHN_FRONT_RIGHT, &lr); - *l = ll; - *l = lr; + if (!pcm_element) + return; + long ll = *l, lr = *r; + snd_mixer_handle_events(mixer); + snd_mixer_selem_get_playback_volume(pcm_element, + SND_MIXER_SCHN_FRONT_LEFT, &ll); + snd_mixer_selem_get_playback_volume(pcm_element, + SND_MIXER_SCHN_FRONT_RIGHT, &lr); + *l = ll; + *r = lr; } int OutputALSA::getMixer(snd_mixer_t **mixer, QString card) |