diff options
| -rw-r--r-- | audio/headset.c | 12 | ||||
| -rw-r--r-- | audio/telephony-dummy.c | 12 | ||||
| -rw-r--r-- | audio/telephony.h | 12 |
3 files changed, 18 insertions, 18 deletions
diff --git a/audio/headset.c b/audio/headset.c index 89511f71..597fd69a 100644 --- a/audio/headset.c +++ b/audio/headset.c @@ -603,7 +603,7 @@ static int answer_call(struct audio_device *device, const char *buf) ag.ev_buf_active = TRUE; - if (telephony_answer_call() < 0) { + if (telephony_answer_call_req() < 0) { headset_send(hs, "\r\nERROR\r\n"); return 0; } @@ -630,7 +630,7 @@ static int terminate_call(struct audio_device *device, const char *buf) ag.ev_buf_active = TRUE; - if (telephony_terminate_call() < 0) { + if (telephony_terminate_call_req() < 0) { headset_send(hs, "\r\nERROR\r\n"); return 0; } @@ -691,7 +691,7 @@ static int last_dialed_number(struct audio_device *device, const char *buf) ag.ev_buf_active = TRUE; - if (telephony_last_dialed_number() < 0) { + if (telephony_last_dialed_number_req() < 0) { headset_send(hs, "\r\nERROR\r\n"); return 0; } @@ -708,7 +708,7 @@ static int dial_number(struct audio_device *device, const char *buf) ag.ev_buf_active = TRUE; - if (telephony_dial_number(&buf[3]) < 0) { + if (telephony_dial_number_req(&buf[3]) < 0) { headset_send(hs, "\r\nERROR\r\n"); return 0; } @@ -2126,7 +2126,7 @@ int telephony_response_and_hold_ind(int rh) return headset_send(hs, "\r\n+BTRH:%d\r\n", ag.rh); } -int telephony_notify_call(const char *number) +int telephony_calling_started_ind(const char *number) { struct headset *hs; @@ -2160,7 +2160,7 @@ int telephony_notify_call(const char *number) return 0; } -int telephony_stop_calling(void) +int telephony_calling_stopped_ind(void) { struct headset *hs; diff --git a/audio/telephony-dummy.c b/audio/telephony-dummy.c index f5c1a0d2..109cbf50 100644 --- a/audio/telephony-dummy.c +++ b/audio/telephony-dummy.c @@ -76,7 +76,7 @@ int telephony_response_and_hold_req(int rh) return 0; } -int telephony_last_dialed_number(void) +int telephony_last_dialed_number_req(void) { /* Notify outgoing call set-up successfully initiated */ telephony_update_indicator(dummy_indicators, "callsetup", @@ -84,7 +84,7 @@ int telephony_last_dialed_number(void) return 0; } -int telephony_terminate_call(void) +int telephony_terminate_call_req(void) { if (telephony_get_indicator(dummy_indicators, "callsetup") > 0) telephony_update_indicator(dummy_indicators, "callsetup", @@ -95,7 +95,7 @@ int telephony_terminate_call(void) return 0; } -int telephony_answer_call(void) +int telephony_answer_call_req(void) { telephony_update_indicator(dummy_indicators, "call", EV_CALL_ACTIVE); telephony_update_indicator(dummy_indicators, "callsetup", @@ -103,7 +103,7 @@ int telephony_answer_call(void) return 0; } -int telephony_dial_number(const char *number) +int telephony_dial_number_req(const char *number) { /* Notify outgoing call set-up successfully initiated */ telephony_update_indicator(dummy_indicators, "callsetup", @@ -143,7 +143,7 @@ static DBusMessage *incoming_call(DBusConnection *conn, DBusMessage *msg, telephony_update_indicator(dummy_indicators, "callsetup", EV_CALLSETUP_INCOMING); - telephony_notify_call(number); + telephony_calling_started_ind(number); return dbus_message_new_method_return(msg);; } @@ -156,7 +156,7 @@ static DBusMessage *cancel_call(DBusConnection *conn, DBusMessage *msg, if (telephony_get_indicator(dummy_indicators, "callsetup") > 0) { telephony_update_indicator(dummy_indicators, "callsetup", EV_CALLSETUP_INACTIVE); - telephony_stop_calling(); + telephony_calling_stopped_ind(); } if (telephony_get_indicator(dummy_indicators, "call") > 0) diff --git a/audio/telephony.h b/audio/telephony.h index ea4b2eac..f71d52bd 100644 --- a/audio/telephony.h +++ b/audio/telephony.h @@ -70,17 +70,17 @@ int telephony_response_and_hold_req(int rh); int telephony_response_and_hold_ind(int rh); -int telephony_last_dialed_number(void); +int telephony_last_dialed_number_req(void); -int telephony_terminate_call(void); +int telephony_terminate_call_req(void); -int telephony_answer_call(void); +int telephony_answer_call_req(void); -int telephony_dial_number(const char *number); +int telephony_dial_number_req(const char *number); -int telephony_notify_call(const char *number); +int telephony_calling_started_ind(const char *number); -int telephony_stop_calling(void); +int telephony_calling_stopped_ind(void); int telephony_ready(uint32_t features, const struct indicator *indicators, int rh); |