colin/sxmo-utils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop the ring before setting up the audio call mode

Browse Source 
Trigger hooks sync to prevent noise while picking up calls.
This commit is contained in:
Willow Barraco
2023-12-27 12:19:59 +01:00
parent 2f5fae6e10
commit 1eb155ce47
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
scripts/modem/sxmo_modemcall.sh
View File

@@ -42,6 +42,11 @@ pickup() {
)" )"
case "$DIRECTION" in case "$DIRECTION" in
outgoing) outgoing)
if ! sxmo_modemaudio.sh setup_audio; then
sxmo_notify_user.sh --urgency=critical "We failed to setup call audio"
return 1
fi
if ! mmcli -m any -o "$CALLID" --start; then if ! mmcli -m any -o "$CALLID" --start; then
sxmo_notify_user.sh --urgency=critical "We failed to start the call" sxmo_notify_user.sh --urgency=critical "We failed to start the call"
return 1 return 1
@@ -52,8 +57,13 @@ pickup() {
log_event "call_start" "$CALLID" log_event "call_start" "$CALLID"
;; ;;
incoming) incoming)
sxmo_log "Invoking pickup hook (async)" sxmo_log "Invoking pickup hook"
sxmo_hook_pickup.sh & sxmo_hook_pickup.sh
if ! sxmo_modemaudio.sh setup_audio; then
sxmo_notify_user.sh --urgency=critical "We failed to setup call audio"
return 1
fi
if ! mmcli -m any -o "$CALLID" --accept; then if ! mmcli -m any -o "$CALLID" --accept; then
sxmo_notify_user.sh --urgency=critical "We failed to accept the call" sxmo_notify_user.sh --urgency=critical "We failed to accept the call"
@@ -88,15 +98,15 @@ hangup() {
touch "$XDG_RUNTIME_DIR/sxmo_calls/${CALLID}.hangedupcall" touch "$XDG_RUNTIME_DIR/sxmo_calls/${CALLID}.hangedupcall"
log_event "call_hangup" "$CALLID" log_event "call_hangup" "$CALLID"
sxmo_log "sxmo_modemcall: Invoking hangup hook (async)" sxmo_log "sxmo_modemcall: Invoking hangup hook"
sxmo_hook_hangup.sh & sxmo_hook_hangup.sh
else else
#this call was never picked up and hung up immediately, so it is a discarded call #this call was never picked up and hung up immediately, so it is a discarded call
touch "$XDG_RUNTIME_DIR/sxmo_calls/${CALLID}.discardedcall" touch "$XDG_RUNTIME_DIR/sxmo_calls/${CALLID}.discardedcall"
log_event "call_discard" "$CALLID" log_event "call_discard" "$CALLID"
sxmo_log "sxmo_modemcall: Invoking discard hook (async)" sxmo_log "sxmo_modemcall: Invoking discard hook"
sxmo_hook_discard.sh & sxmo_hook_discard.sh
fi fi
if ! mmcli -m any -o "$CALLID" --hangup; then if ! mmcli -m any -o "$CALLID" --hangup; then
@@ -188,8 +198,8 @@ mute() {
# this signals that we muted this ring # this signals that we muted this ring
touch "$XDG_RUNTIME_DIR/sxmo_calls/${CALLID}.mutedring" touch "$XDG_RUNTIME_DIR/sxmo_calls/${CALLID}.mutedring"
sxmo_log "Invoking mute_ring hook (async)" sxmo_log "Invoking mute_ring hook"
sxmo_hook_mute_ring.sh & sxmo_hook_mute_ring.sh
log_event "ring_mute" "$1" log_event "ring_mute" "$1"
} }
@@ -215,11 +225,6 @@ EOF
case "$PICKED" in case "$PICKED" in
"$icon_phn Pickup") "$icon_phn Pickup")
if ! sxmo_modemaudio.sh setup_audio; then
sxmo_notify_user.sh --urgency=critical "We failed to setup call audio"
return 1
fi
if ! pickup "$1"; then if ! pickup "$1"; then
sxmo_notify_user.sh --urgency=critical "We failed to pickup the call" sxmo_notify_user.sh --urgency=critical "We failed to pickup the call"
sxmo_modemaudio.sh reset_audio sxmo_modemaudio.sh reset_audio