sxmo-utils: fix conflicting audio settings (#502) v1 SUPERSEDED

ArenM: 1
 fix conflicting audio settings (#502)

 1 files changed, 14 insertions(+), 28 deletions(-)

Nevermind, I misread your comment... this seems good, but why is there a 
'TODO'...

--
sic dicit magister P
https://phartman.sites.luc.edu/
GPG keyID 0xE0DBD3D6 (CAE6 3A6F 755F 7BC3 36CA  330D B3E6 39C6 E0DB D3D6)

The todo is about having callaudiocli report errors it encounters,
rather than us needing to check its work. Sorry the comment wasn't very
descriptive, I need to get better about that.

[PATCH sxmo-utils] fix conflicting audio settings (#502) Export this patch

When callaudiod disables call audio mode it always enables the mic.
Because we were disabling the mic before disabling call audio mode
reset_audio always fails.

I also removed the retry loop; if the software we rely on breaks we
should fix it upstream, rather than hitting it with a hammer until it
works.

Stacy Harper <contact@stacyharper.net>

3 months ago

Yes but things arent reliable yet. I'd rather have those loops than
risking not being able to speak while in call.

This should fix https://todo.sr.ht/~mil/sxmo-tickets/502
---
 scripts/modem/sxmo_modemaudio.sh | 42 +++++++++++---------------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/scripts/modem/sxmo_modemaudio.sh b/scripts/modem/sxmo_modemaudio.sh
index 1bdfedc..8e02ad8 100644
--- a/scripts/modem/sxmo_modemaudio.sh
+++ b/scripts/modem/sxmo_modemaudio.sh
@@ -3,44 +3,30 @@
 # shellcheck source=scripts/core/sxmo_common.sh
 . sxmo_common.sh
 
+set -e
+
 setup_audio() {
-	unmute_mic
 	enable_call_audio_mode
 	disable_speaker
+	unmute_mic
 
-	i=0
-	while (! is_unmuted_mic) || (! is_call_audio_mode) || (! is_disabled_speaker); do
-		i=$((i+1))
-		if [ "$i" -gt 5 ]; then
-			return 1
-		fi
-
-		sleep 0.2
-
-		unmute_mic
-		enable_call_audio_mode
-		disable_speaker
-	done
+	# TODO: callaudiocli should error if it doesn't set these
+	# Since we set -e this script will error if these aren't true
+	is_call_audio_mode
+	is_disabled_speaker
+	is_unmuted_mic
 }
 
 reset_audio() {
-	mute_mic
 	disable_call_audio_mode
 	enable_speaker
+	mute_mic
 
-	i=0
-	while (! is_muted_mic) || (! is_default_audio_mode) || (! is_enabled_speaker); do
-		i=$((i+1))
-		if [ "$i" -gt 5 ]; then
-			return 1
-		fi
-
-		sleep 0.2
-
-		mute_mic
-		disable_call_audio_mode
-		enable_speaker
-	done
+	# TODO: callaudiocli should error if it doesn't set these
+	# Since we set -e this script will error if these aren't true
+	is_default_audio_mode
+	is_enabled_speaker
+	is_muted_mic

Hartman, Peter <phartman@luc.edu>

3 months ago

Why not add: 

|| sxmo_notify_user.sh "Error..."

?

I think in this particular case, hitting it with a hammer might be 
warranted.  Modem audio is kind of crucial on a phone!

Maybe we split this into two patches.

Next

 }
 
 is_muted_mic() {
-- 
2.36.0

Hartman, Peter <phartman@luc.edu>

3 months ago

--
sic dicit magister P
https://phartman.sites.luc.edu/
GPG keyID 0xE0DBD3D6 (CAE6 3A6F 755F 7BC3 36CA  330D B3E6 39C6 E0DB D3D6)

builds.sr.ht <builds@sr.ht>

3 months ago

sxmo-utils/patches/.build.yml: SUCCESS in 24s

[fix conflicting audio settings (#502)][0] from [ArenM][1]

[0]: https://lists.sr.ht/~mil/sxmo-devel/patches/31955
[1]: mailto:aren@peacevolution.org

✓ #751363 SUCCESS sxmo-utils/patches/.build.yml https://builds.sr.ht/~mil/job/751363

Hartman, Peter <phartman@luc.edu>

3 months ago

Thanks! Comments below:

On Thu, May 05, 2022 at 12:06:01AM -0400, ArenM wrote: