diff options
| -rw-r--r-- | src/audio.c | 2 | ||||
| -rw-r--r-- | src/call.c | 4 | ||||
| -rw-r--r-- | src/cmd.c | 7 | ||||
| -rw-r--r-- | test/call.c | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/src/audio.c b/src/audio.c index 2b5be6e..c373cb8 100644 --- a/src/audio.c +++ b/src/audio.c @@ -1317,7 +1317,7 @@ int audio_send_digit(struct audio *a, char key) if (!a) return EINVAL; - if (key > 0) { + if (key != KEYCODE_REL) { info("audio: send DTMF digit: '%c'\n", key); err = telev_send(a->telev, telev_digit2code(key), false); } @@ -994,7 +994,7 @@ int call_info(struct re_printf *pf, const struct call *call) * Send a DTMF digit to the peer * * @param call Call object - * @param key DTMF digit to send (0x00 for key release) + * @param key DTMF digit to send (KEYCODE_REL for key release) * * @return 0 if success, otherwise errorcode */ @@ -1135,7 +1135,7 @@ static void dtmfend_handler(void *arg) struct call *call = arg; if (call->dtmfh) - call->dtmfh(call, 0x00, call->arg); + call->dtmfh(call, KEYCODE_REL, call->arg); } @@ -11,7 +11,6 @@ enum { - REL = 0x00, ESC = 0x1b, DEL = 0x7f, }; @@ -140,7 +139,7 @@ static int editor_input(struct mbuf *mb, char key, *del = true; return re_hprintf(pf, "\nCancel\n"); - case REL: + case KEYCODE_REL: break; case '\n': @@ -274,7 +273,7 @@ int cmd_process(struct cmd_ctx **ctxp, char key, struct re_printf *pf, /* are we in edit-mode? */ if (ctxp && *ctxp) { - if (key == REL) + if (key == KEYCODE_REL) return 0; return cmd_process_edit(ctxp, key, pf, data); @@ -306,7 +305,7 @@ int cmd_process(struct cmd_ctx **ctxp, char key, struct re_printf *pf, return cmd->h(pf, &arg); } - if (key == REL) + if (key == KEYCODE_REL) return 0; return cmd_print(pf, NULL); diff --git a/test/call.c b/test/call.c index cf17bb0..75d8c9f 100644 --- a/test/call.c +++ b/test/call.c @@ -598,7 +598,7 @@ static void dtmf_handler(struct call *call, char key, void *arg) (void)call; /* ignore key-release */ - if (key == 0) + if (key == KEYCODE_REL) return; ASSERT_EQ(dtmf_digits[ag->n_dtmf_recv], key); |