equal
deleted
inserted
replaced
1 Fixes compilation of Solaris backend, but unclear if the fixes are complete or |
|
2 if the resulting code works as expected. |
|
3 |
|
4 Needs further investigation. |
|
5 |
|
6 XXX file upstream bug |
|
7 |
|
8 --- pulseaudio-6.0/src/modules/module-solaris.c 2015-06-05 14:16:44.723061189 -0700 |
|
9 +++ pulseaudio-6.0/src/modules/module-solaris.c 2015-06-05 14:28:00.409910003 -0700 |
|
10 @@ -412,10 +412,11 @@ |
|
11 pa_smoother_resume(u->smoother, pa_rtclock_now(), true); |
|
12 |
|
13 if (!u->source || u->source_suspended) { |
|
14 + bool mute; |
|
15 if (unsuspend(u) < 0) |
|
16 return -1; |
|
17 u->sink->get_volume(u->sink); |
|
18 - u->sink->get_mute(u->sink); |
|
19 + u->sink->get_mute(u->sink, &mute); |
|
20 } |
|
21 u->sink_suspended = false; |
|
22 } |
|
23 @@ -1026,6 +1027,7 @@ |
|
24 |
|
25 /* Read mixer settings */ |
|
26 if (u->sink) { |
|
27 + bool mute; |
|
28 if (sink_new_data.volume_is_set) |
|
29 u->sink->set_volume(u->sink); |
|
30 else |
|
31 @@ -1034,7 +1036,7 @@ |
|
32 if (sink_new_data.muted_is_set) |
|
33 u->sink->set_mute(u->sink); |
|
34 else |
|
35 - u->sink->get_mute(u->sink); |
|
36 + u->sink->get_mute(u->sink, &mute); |
|
37 |
|
38 pa_sink_put(u->sink); |
|
39 } |
|