diff options
| author |   George Kiagiadakis <george.kiagiadakis@collabora.com> | 2021-02-25 14:55:58 -0500 |
|---|---|---|
| committer | George Kiagiadakis <george.kiagiadakis@collabora.com> | 2021-05-25 15:51:00 +0300 |
| commit | 5b1a74b1ea6cfc49e20300bdf5b3806bcb41343d (patch) | |
| tree | 282d531ca6763a366f1503114a92abc1290d263a /binding/audiomixer-binding.c | |
| parent | 73e7b8efc188c36b45c68421c663e6fc32b803f9 (diff) | |
audiomixer: port to wireplumber 0.4koi_11.0.2koi/11.0.211.0.2
* use module-mixer-api and module-default-nodes-api
* use endpoints without endpoint streams (new design)
* improve thread safety a little bit
Bug-AGL: SPEC-3844
Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com>
Change-Id: Ia180d607698d7a8875c19cc48bd2b2c503772945
Diffstat (limited to 'binding/audiomixer-binding.c')
| -rw-r--r-- | binding/audiomixer-binding.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/binding/audiomixer-binding.c b/binding/audiomixer-binding.c index 80c4482..2c8981a 100644 --- a/binding/audiomixer-binding.c +++ b/binding/audiomixer-binding.c @@ -149,12 +149,6 @@ list_controls_cb(afb_req_t request) audiomixer_lock(audiomixer); - if (audiomixer_ensure_connected(audiomixer, 3) < 0) { - afb_req_fail(request, "failed", - "Could not connect to the PipeWire daemon"); - goto unlock; - } - if (audiomixer_ensure_controls(audiomixer, 3) < 0) { AFB_REQ_NOTICE(request, "No mixer controls were exposed " "in PipeWire after 3 seconds"); @@ -175,7 +169,6 @@ list_controls_cb(afb_req_t request) } afb_req_success(request, ret_json, NULL); -unlock: audiomixer_unlock(audiomixer); } @@ -196,12 +189,6 @@ volume_cb(afb_req_t request) goto unlock; } - if (audiomixer_ensure_connected(audiomixer, 3) < 0) { - afb_req_fail(request, "failed", - "Could not connect to the PipeWire daemon"); - goto unlock; - } - if (audiomixer_ensure_controls(audiomixer, 3) < 0) { AFB_REQ_NOTICE(request, "No mixer controls were exposed " "in PipeWire after 3 seconds"); @@ -252,12 +239,6 @@ mute_cb(afb_req_t request) goto unlock; } - if (audiomixer_ensure_connected(audiomixer, 3) < 0) { - afb_req_fail(request, "failed", - "Could not connect to the PipeWire daemon"); - goto unlock; - } - if (audiomixer_ensure_controls(audiomixer, 3) < 0) { AFB_REQ_NOTICE(request, "No mixer controls were exposed " "in PipeWire after 3 seconds"); @@ -375,7 +356,7 @@ onevent(afb_api_t api, const char *event, struct json_object *object) audiomixer_lock(audiomixer); - ctl = audiomixer_find_control(audiomixer, "Master"); + ctl = audiomixer_find_control(audiomixer, "Master Playback"); if (!ctl) goto unlock; |