diff options
| author | Jonathan Perkin <jperkin@joyent.com> | 2015-12-21 04:10:34 +0100 |
|---|---|---|
| committer | Arun Raghavan <git@arunraghavan.net> | 2016-01-22 13:25:29 +0530 |
| commit | 68216e8ff804dcbf1f5aad07eeae86403324435c (patch) | |
| tree | fd6297db36244badefa21c70120b217aede370fe | |
| parent | 81d3eb84672726e61d46dcb429a73422f43b691c (diff) | |
solaris: Catch up with newer API
Patch upstreamed from pkgsrc by Kamil Rytarowski <n54@gmx.com>.
See commit e4a7625ba884c5cce20468d75937857343751c35 for why this was
originally done.
| -rw-r--r-- | src/modules/module-solaris.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/modules/module-solaris.c b/src/modules/module-solaris.c index c79918abf..2fa0bffa6 100644 --- a/src/modules/module-solaris.c +++ b/src/modules/module-solaris.c @@ -412,10 +412,12 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse pa_smoother_resume(u->smoother, pa_rtclock_now(), true); if (!u->source || u->source_suspended) { + bool mute; if (unsuspend(u) < 0) return -1; u->sink->get_volume(u->sink); - u->sink->get_mute(u->sink); + if (u->sink->get_mute(u->sink, &mute) >= 0) + pa_sink_set_mute(u->sink, mute, false); } u->sink_suspended = false; } @@ -1033,8 +1035,12 @@ int pa__init(pa_module *m) { if (sink_new_data.muted_is_set) u->sink->set_mute(u->sink); - else - u->sink->get_mute(u->sink); + else { + bool mute; + + if (u->sink->get_mute(u->sink, &mute) >= 0) + pa_sink_set_mute(u->sink, mute, false); + } pa_sink_put(u->sink); } |