mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Solaris: build fixes (resent)

Browse source 
Fix bit rot due to recent flat volume changes.
This commit is contained in:
Finn Thain 2009-08-21 13:15:38 +10:00 • committed by Lennart Poettering
parent b96390fc98
commit 44c7aa55e2
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/module-solaris.c
View file

@ -479,7 +479,7 @@ static void sink_set_volume(pa_sink *s) {
if (u->fd >= 0) { if (u->fd >= 0) {
AUDIO_INITINFO(&info); AUDIO_INITINFO(&info);
info.play.gain = pa_cvolume_max(&s->virtual_volume) * AUDIO_MAX_GAIN / PA_VOLUME_NORM; info.play.gain = pa_cvolume_max(&s->real_volume) * AUDIO_MAX_GAIN / PA_VOLUME_NORM;
assert(info.play.gain <= AUDIO_MAX_GAIN); assert(info.play.gain <= AUDIO_MAX_GAIN);
if (ioctl(u->fd, AUDIO_SETINFO, &info) < 0) { if (ioctl(u->fd, AUDIO_SETINFO, &info) < 0) {
@ -501,8 +501,7 @@ static void sink_get_volume(pa_sink *s) {
if (ioctl(u->fd, AUDIO_GETINFO, &info) < 0) if (ioctl(u->fd, AUDIO_GETINFO, &info) < 0)
pa_log("AUDIO_SETINFO: %s", pa_cstrerror(errno)); pa_log("AUDIO_SETINFO: %s", pa_cstrerror(errno));
else else
pa_cvolume_set(&s->virtual_volume, s->sample_spec.channels, pa_cvolume_set(&s->real_volume, s->sample_spec.channels, info.play.gain * PA_VOLUME_NORM / AUDIO_MAX_GAIN);
info.play.gain * PA_VOLUME_NORM / AUDIO_MAX_GAIN);
} }
} }
@ -515,7 +514,7 @@ static void source_set_volume(pa_source *s) {
if (u->fd >= 0) { if (u->fd >= 0) {
AUDIO_INITINFO(&info); AUDIO_INITINFO(&info);
info.play.gain = pa_cvolume_max(&s->virtual_volume) * AUDIO_MAX_GAIN / PA_VOLUME_NORM; info.play.gain = pa_cvolume_max(&s->volume) * AUDIO_MAX_GAIN / PA_VOLUME_NORM;
assert(info.play.gain <= AUDIO_MAX_GAIN); assert(info.play.gain <= AUDIO_MAX_GAIN);
if (ioctl(u->fd, AUDIO_SETINFO, &info) < 0) { if (ioctl(u->fd, AUDIO_SETINFO, &info) < 0) {
@ -537,8 +536,7 @@ static void source_get_volume(pa_source *s) {
if (ioctl(u->fd, AUDIO_GETINFO, &info) < 0) if (ioctl(u->fd, AUDIO_GETINFO, &info) < 0)
pa_log("AUDIO_SETINFO: %s", pa_cstrerror(errno)); pa_log("AUDIO_SETINFO: %s", pa_cstrerror(errno));
else else
pa_cvolume_set(&s->virtual_volume, s->sample_spec.channels, pa_cvolume_set(&s->volume, s->sample_spec.channels, info.play.gain * PA_VOLUME_NORM / AUDIO_MAX_GAIN);
info.play.gain * PA_VOLUME_NORM / AUDIO_MAX_GAIN);
} }
} }
@ -797,7 +795,7 @@ static void sig_callback(pa_mainloop_api *api, pa_signal_event*e, int sig, void
pa_log_debug("caught signal"); pa_log_debug("caught signal");
if (u->sink) { if (u->sink) {
pa_sink_get_volume(u->sink, TRUE, FALSE); pa_sink_get_volume(u->sink, TRUE);
pa_sink_get_mute(u->sink, TRUE); pa_sink_get_mute(u->sink, TRUE);
} }