Return-Path: From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= To: linux-bluetooth@vger.kernel.org Subject: [RFC v7 2/8] audio: Simplify org.bluez.Headset Date: Fri, 6 Jan 2012 16:07:49 +0100 Message-Id: <1325862475-11607-3-git-send-email-frederic.danis@linux.intel.com> In-Reply-To: <1325862475-11607-1-git-send-email-frederic.danis@linux.intel.com> References: <1325862475-11607-1-git-send-email-frederic.danis@linux.intel.com> Content-Type: text/plain; charset="utf-8" Sender: linux-bluetooth-owner@vger.kernel.org List-ID: Simplify org.bluez.Headset interface by removing methods, signal and properties which should be managed by external telephony program. In audio/headset.[ch], remove functions no more used by telephony drivers. Move SpeakerGain and MicrophoneGain properties to Media Transport. --- Makefile.am | 4 +- audio/headset.c | 943 +---------------------------------------------------- audio/headset.h | 5 - audio/telephony.h | 171 ---------- audio/transport.c | 87 +++-- audio/unix.c | 2 + doc/audio-api.txt | 75 +----- doc/media-api.txt | 15 +- 8 files changed, 72 insertions(+), 1230 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5f8952a..2c1806a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -335,9 +335,7 @@ endif EXTRA_DIST += src/genbuiltin src/bluetooth.conf \ src/main.conf network/network.conf \ input/input.conf serial/serial.conf \ - audio/audio.conf audio/telephony-dummy.c \ - audio/telephony-maemo5.c audio/telephony-ofono.c \ - audio/telephony-maemo6.c sap/sap-dummy.c sap/sap-u8500.c \ + audio/audio.conf sap/sap-dummy.c sap/sap-u8500.c \ proximity/proximity.conf if ALSA diff --git a/audio/headset.c b/audio/headset.c index f24f28d..89a1de0 100644 --- a/audio/headset.c +++ b/audio/headset.c @@ -62,35 +62,7 @@ #define DC_TIMEOUT 3 -#define RING_INTERVAL 3 - -#define BUF_SIZE 1024 - -#define HEADSET_GAIN_SPEAKER 'S' -#define HEADSET_GAIN_MICROPHONE 'M' - -static struct { - const struct indicator *indicators; /* Available HFP indicators */ - int er_mode; /* Event reporting mode */ - int er_ind; /* Event reporting for indicators */ - int rh; /* Response and Hold state */ - char *number; /* Incoming phone number */ - int number_type; /* Incoming number type */ - guint ring_timer; /* For incoming call indication */ - const char *chld; /* Response to AT+CHLD=? */ -} ag = { - .er_mode = 3, - .er_ind = 0, - .rh = BTRH_NOT_SUPPORTED, - .number = NULL, - .number_type = 0, - .ring_timer = 0, -}; - static gboolean sco_hci = TRUE; -static gboolean fast_connectable = FALSE; - -static GSList *active_devices = NULL; static char *str_state[] = { "HEADSET_STATE_DISCONNECTED", @@ -128,23 +100,6 @@ struct pending_connect { uint16_t svclass; }; -struct headset_slc { - void *slc; - - gboolean cli_active; - gboolean cme_enabled; - gboolean cwa_enabled; - gboolean pending_ring; - gboolean inband_ring; - gboolean nrec; - gboolean nrec_req; - - int sp_gain; - int mic_gain; - - unsigned int hf_features; -}; - struct headset { uint32_t hsp_handle; uint32_t hfp_handle; @@ -169,15 +124,10 @@ struct headset { struct pending_connect *pending; headset_lock_t lock; - struct headset_slc *slc; + void *slc; GSList *nrec_cbs; }; -struct event { - const char *cmd; - int (*callback) (struct audio_device *device, const char *buf); -}; - static GSList *headset_callbacks = NULL; static void error_connect_failed(DBusConnection *conn, DBusMessage *msg, @@ -193,44 +143,6 @@ static int rfcomm_connect(struct audio_device *device, headset_stream_cb_t cb, static int get_records(struct audio_device *device, headset_stream_cb_t cb, void *user_data, unsigned int *cb_id); -static void print_ag_features(uint32_t features) -{ - GString *gstr; - char *str; - - if (features == 0) { - DBG("HFP AG features: (none)"); - return; - } - - gstr = g_string_new("HFP AG features: "); - - if (features & AG_FEATURE_THREE_WAY_CALLING) - g_string_append(gstr, "\"Three-way calling\" "); - if (features & AG_FEATURE_EC_ANDOR_NR) - g_string_append(gstr, "\"EC and/or NR function\" "); - if (features & AG_FEATURE_VOICE_RECOGNITION) - g_string_append(gstr, "\"Voice recognition function\" "); - if (features & AG_FEATURE_INBAND_RINGTONE) - g_string_append(gstr, "\"In-band ring tone capability\" "); - if (features & AG_FEATURE_ATTACH_NUMBER_TO_VOICETAG) - g_string_append(gstr, "\"Attach a number to a voice tag\" "); - if (features & AG_FEATURE_REJECT_A_CALL) - g_string_append(gstr, "\"Ability to reject a call\" "); - if (features & AG_FEATURE_ENHANCED_CALL_STATUS) - g_string_append(gstr, "\"Enhanced call status\" "); - if (features & AG_FEATURE_ENHANCED_CALL_CONTROL) - g_string_append(gstr, "\"Enhanced call control\" "); - if (features & AG_FEATURE_EXTENDED_ERROR_RESULT_CODES) - g_string_append(gstr, "\"Extended Error Result Codes\" "); - - str = g_string_free(gstr, FALSE); - - DBG("%s", str); - - g_free(str); -} - static const char *state2str(headset_state_t state) { switch (state) { @@ -248,52 +160,6 @@ static const char *state2str(headset_state_t state) return NULL; } -static int headset_send_valist(struct headset *hs, char *format, va_list ap) -{ - char rsp[BUF_SIZE]; - ssize_t total_written, count; - int fd; - - count = vsnprintf(rsp, sizeof(rsp), format, ap); - - if (count < 0) - return -EINVAL; - - if (!hs->rfcomm) { - error("headset_send: the headset is not connected"); - return -EIO; - } - - total_written = 0; - fd = g_io_channel_unix_get_fd(hs->rfcomm); - - while (total_written < count) { - ssize_t written; - - written = write(fd, rsp + total_written, - count - total_written); - if (written < 0) - return -errno; - - total_written += written; - } - - return 0; -} - -static int __attribute__((format(printf, 2, 3))) - headset_send(struct headset *hs, char *format, ...) -{ - va_list ap; - int ret; - - va_start(ap, format); - ret = headset_send_valist(hs, format, ap); - va_end(ap); - - return ret; -} - static void pending_connect_complete(struct connect_cb *cb, struct audio_device *dev) { struct headset *hs = dev->headset; @@ -374,64 +240,11 @@ static unsigned int connect_cb_new(struct headset *hs, return cb->id; } -static void __attribute__((format(printf, 3, 4))) - send_foreach_headset(GSList *devices, - int (*cmp) (struct headset *hs), - char *format, ...) -{ - GSList *l; - va_list ap; - - for (l = devices; l != NULL; l = l->next) { - struct audio_device *device = l->data; - struct headset *hs = device->headset; - int ret; - - assert(hs != NULL); - - if (cmp && cmp(hs) != 0) - continue; - - va_start(ap, format); - ret = headset_send_valist(hs, format, ap); - if (ret < 0) - error("Failed to send to headset: %s (%d)", - strerror(-ret), -ret); - va_end(ap); - } -} - -static int cli_cmp(struct headset *hs) -{ - struct headset_slc *slc = hs->slc; - - if (!hs->hfp_active) - return -1; - - if (slc->cli_active) - return 0; - else - return -1; -} - -static gboolean ring_timer_cb(gpointer data) -{ - send_foreach_headset(active_devices, NULL, "\r\nRING\r\n"); - - if (ag.number) - send_foreach_headset(active_devices, cli_cmp, - "\r\n+CLIP: \"%s\",%d\r\n", - ag.number, ag.number_type); - - return TRUE; -} - static void sco_connect_cb(GIOChannel *chan, GError *err, gpointer user_data) { int sk; struct audio_device *dev = user_data; struct headset *hs = dev->headset; - struct headset_slc *slc = hs->slc; struct pending_connect *p = hs->pending; if (err) { @@ -472,14 +285,6 @@ static void sco_connect_cb(GIOChannel *chan, GError *err, gpointer user_data) fcntl(sk, F_SETFL, 0); headset_set_state(dev, HEADSET_STATE_PLAYING); - - if (slc->pending_ring) { - ring_timer_cb(NULL); - ag.ring_timer = g_timeout_add_seconds(RING_INTERVAL, - ring_timer_cb, - NULL); - slc->pending_ring = FALSE; - } } static int sco_connect(struct audio_device *dev, headset_stream_cb_t cb, @@ -518,14 +323,6 @@ static int sco_connect(struct audio_device *dev, headset_stream_cb_t cb, return 0; } -static int hfp_cmp(struct headset *hs) -{ - if (hs->hfp_active) - return 0; - else - return -1; -} - void headset_slc_complete(struct audio_device *dev) { struct headset *hs = dev->headset; @@ -555,202 +352,6 @@ void headset_slc_complete(struct audio_device *dev) } } -static int telephony_generic_rsp(struct audio_device *device, cme_error_t err) -{ - struct headset *hs = device->headset; - struct headset_slc *slc = hs->slc; - - if ((err != CME_ERROR_NONE) && slc->cme_enabled) - return headset_send(hs, "\r\n+CME ERROR: %d\r\n", err); - - switch (err) { - case CME_ERROR_NONE: - return headset_send(hs, "\r\nOK\r\n"); - case CME_ERROR_NO_NETWORK_SERVICE: - return headset_send(hs, "\r\nNO CARRIER\r\n"); - default: - return headset_send(hs, "\r\nERROR\r\n"); - } -} - -int telephony_event_reporting_rsp(void *telephony_device, cme_error_t err) -{ - struct audio_device *device = telephony_device; - struct headset *hs = device->headset; - struct headset_slc *slc = hs->slc; - uint32_t ag_features; - int ret; - - if (err != CME_ERROR_NONE) - return telephony_generic_rsp(telephony_device, err); - - ret = headset_send(hs, "\r\nOK\r\n"); - if (ret < 0) - return ret; - - if (hs->state != HEADSET_STATE_CONNECTING) - return 0; - - ag_features = telephony_get_ag_features(); - if (slc->hf_features & HF_FEATURE_CALL_WAITING_AND_3WAY && - ag_features & AG_FEATURE_THREE_WAY_CALLING) - return 0; - - headset_slc_complete(device); - - return 0; -} - -int telephony_key_press_rsp(void *telephony_device, cme_error_t err) -{ - return telephony_generic_rsp(telephony_device, err); -} - -int telephony_answer_call_rsp(void *telephony_device, cme_error_t err) -{ - return telephony_generic_rsp(telephony_device, err); -} - -int telephony_terminate_call_rsp(void *telephony_device, - cme_error_t err) -{ - struct audio_device *device = telephony_device; - struct headset *hs = device->headset; - - if (err != CME_ERROR_NONE) - return telephony_generic_rsp(telephony_device, err); - - g_dbus_emit_signal(device->conn, device->path, - AUDIO_HEADSET_INTERFACE, "CallTerminated", - DBUS_TYPE_INVALID); - - return headset_send(hs, "\r\nOK\r\n"); -} - -int telephony_response_and_hold_rsp(void *telephony_device, cme_error_t err) -{ - return telephony_generic_rsp(telephony_device, err); -} - -int telephony_last_dialed_number_rsp(void *telephony_device, cme_error_t err) -{ - return telephony_generic_rsp(telephony_device, err); -} - -int telephony_dial_number_rsp(void *telephony_device, cme_error_t err) -{ - return telephony_generic_rsp(telephony_device, err); -} - -static int headset_set_gain(struct audio_device *device, uint16_t gain, char type) -{ - struct headset *hs = device->headset; - struct headset_slc *slc = hs->slc; - const char *name, *property; - - if (gain > 15) { - error("Invalid gain value: %u", gain); - return -EINVAL; - } - - switch (type) { - case HEADSET_GAIN_SPEAKER: - if (slc->sp_gain == gain) { - DBG("Ignoring no-change in speaker gain"); - return -EALREADY; - } - name = "SpeakerGainChanged"; - property = "SpeakerGain"; - slc->sp_gain = gain; - break; - case HEADSET_GAIN_MICROPHONE: - if (slc->mic_gain == gain) { - DBG("Ignoring no-change in microphone gain"); - return -EALREADY; - } - name = "MicrophoneGainChanged"; - property = "MicrophoneGain"; - slc->mic_gain = gain; - break; - default: - error("Unknown gain setting"); - return -EINVAL; - } - - g_dbus_emit_signal(device->conn, device->path, - AUDIO_HEADSET_INTERFACE, name, - DBUS_TYPE_UINT16, &gain, - DBUS_TYPE_INVALID); - - emit_property_changed(device->conn, device->path, - AUDIO_HEADSET_INTERFACE, property, - DBUS_TYPE_UINT16, &gain); - - return 0; -} - -int telephony_transmit_dtmf_rsp(void *telephony_device, cme_error_t err) -{ - return telephony_generic_rsp(telephony_device, err); -} - -int telephony_subscriber_number_rsp(void *telephony_device, cme_error_t err) -{ - return telephony_generic_rsp(telephony_device, err); -} - -int telephony_list_current_calls_rsp(void *telephony_device, cme_error_t err) -{ - return telephony_generic_rsp(telephony_device, err); -} - -int telephony_operator_selection_rsp(void *telephony_device, cme_error_t err) -{ - return telephony_generic_rsp(telephony_device, err); -} - -int telephony_call_hold_rsp(void *telephony_device, cme_error_t err) -{ - return telephony_generic_rsp(telephony_device, err); -} - -int telephony_nr_and_ec_rsp(void *telephony_device, cme_error_t err) -{ - struct audio_device *device = telephony_device; - struct headset *hs = device->headset; - struct headset_slc *slc = hs->slc; - - if (err == CME_ERROR_NONE) { - GSList *l; - - for (l = hs->nrec_cbs; l; l = l->next) { - struct headset_nrec_callback *nrec_cb = l->data; - - nrec_cb->cb(device, slc->nrec_req, nrec_cb->user_data); - } - - slc->nrec = hs->slc->nrec_req; - } - - return telephony_generic_rsp(telephony_device, err); -} - -int telephony_voice_dial_rsp(void *telephony_device, cme_error_t err) -{ - return telephony_generic_rsp(telephony_device, err); -} - -int telephony_operator_selection_ind(int mode, const char *oper) -{ - if (!active_devices) - return -ENODEV; - - send_foreach_headset(active_devices, hfp_cmp, - "\r\n+COPS: %d,0,\"%s\"\r\n", - mode, oper); - return 0; -} - static void close_sco(struct audio_device *device) { struct headset *hs = device->headset; @@ -790,7 +391,6 @@ void headset_connect_cb(GIOChannel *chan, GError *err, gpointer user_data) struct btd_adapter *adapter; struct pending_connect *p = hs->pending; char hs_address[18]; - void *slc; if (err) { error("%s", err->message); @@ -816,17 +416,11 @@ void headset_connect_cb(GIOChannel *chan, GError *err, gpointer user_data) else hs->auto_dc = FALSE; - slc = telephony_device_connecting(chan, dev); + hs->slc = telephony_device_connecting(chan, dev); hs->connecting_uuid = NULL; DBG("%s: Connected to %s", dev->path, hs_address); - hs->slc = g_new0(struct headset_slc, 1); - hs->slc->slc = slc; - hs->slc->sp_gain = 15; - hs->slc->mic_gain = 15; - hs->slc->nrec = TRUE; - return; failed: @@ -1165,63 +759,6 @@ static DBusMessage *hs_connect(DBusConnection *conn, DBusMessage *msg, return NULL; } -static DBusMessage *hs_ring(DBusConnection *conn, DBusMessage *msg, - void *data) -{ - struct audio_device *device = data; - struct headset *hs = device->headset; - DBusMessage *reply = NULL; - int err; - - if (hs->state < HEADSET_STATE_CONNECTED) - return btd_error_not_connected(msg); - - reply = dbus_message_new_method_return(msg); - if (!reply) - return NULL; - - if (ag.ring_timer) { - DBG("IndicateCall received when already indicating"); - return reply; - } - - err = headset_send(hs, "\r\nRING\r\n"); - if (err < 0) { - dbus_message_unref(reply); - return btd_error_failed(msg, strerror(-err)); - } - - ring_timer_cb(NULL); - ag.ring_timer = g_timeout_add_seconds(RING_INTERVAL, ring_timer_cb, - NULL); - - return reply; -} - -static DBusMessage *hs_cancel_call(DBusConnection *conn, - DBusMessage *msg, - void *data) -{ - struct audio_device *device = data; - struct headset *hs = device->headset; - DBusMessage *reply = NULL; - - if (hs->state < HEADSET_STATE_CONNECTED) - return btd_error_not_connected(msg); - - reply = dbus_message_new_method_return(msg); - if (!reply) - return NULL; - - if (ag.ring_timer) { - g_source_remove(ag.ring_timer); - ag.ring_timer = 0; - } else - DBG("Got CancelCall method call but no call is active"); - - return reply; -} - static DBusMessage *hs_play(DBusConnection *conn, DBusMessage *msg, void *data) { @@ -1261,114 +798,6 @@ static DBusMessage *hs_play(DBusConnection *conn, DBusMessage *msg, return NULL; } -static DBusMessage *hs_get_speaker_gain(DBusConnection *conn, - DBusMessage *msg, - void *data) -{ - struct audio_device *device = data; - struct headset *hs = device->headset; - struct headset_slc *slc = hs->slc; - DBusMessage *reply; - dbus_uint16_t gain; - - if (hs->state < HEADSET_STATE_CONNECTED) - return btd_error_not_available(msg); - - reply = dbus_message_new_method_return(msg); - if (!reply) - return NULL; - - gain = (dbus_uint16_t) slc->sp_gain; - - dbus_message_append_args(reply, DBUS_TYPE_UINT16, &gain, - DBUS_TYPE_INVALID); - - return reply; -} - -static DBusMessage *hs_get_mic_gain(DBusConnection *conn, - DBusMessage *msg, - void *data) -{ - struct audio_device *device = data; - struct headset *hs = device->headset; - struct headset_slc *slc = hs->slc; - DBusMessage *reply; - dbus_uint16_t gain; - - if (hs->state < HEADSET_STATE_CONNECTED || slc == NULL) - return btd_error_not_available(msg); - - reply = dbus_message_new_method_return(msg); - if (!reply) - return NULL; - - gain = (dbus_uint16_t) slc->mic_gain; - - dbus_message_append_args(reply, DBUS_TYPE_UINT16, &gain, - DBUS_TYPE_INVALID); - - return reply; -} - -static DBusMessage *hs_set_gain(DBusConnection *conn, - DBusMessage *msg, - void *data, uint16_t gain, - char type) -{ - struct audio_device *device = data; - struct headset *hs = device->headset; - DBusMessage *reply; - int err; - - if (hs->state < HEADSET_STATE_CONNECTED) - return btd_error_not_connected(msg); - - err = headset_set_gain(device, gain, type); - if (err < 0) - return btd_error_invalid_args(msg); - - reply = dbus_message_new_method_return(msg); - if (!reply) - return NULL; - - if (hs->state == HEADSET_STATE_PLAYING) { - err = headset_send(hs, "\r\n+VG%c=%u\r\n", type, gain); - if (err < 0) { - dbus_message_unref(reply); - return btd_error_failed(msg, strerror(-err)); - } - } - - return reply; -} - -static DBusMessage *hs_set_speaker_gain(DBusConnection *conn, - DBusMessage *msg, - void *data) -{ - uint16_t gain; - - if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_UINT16, &gain, - DBUS_TYPE_INVALID)) - return NULL; - - return hs_set_gain(conn, msg, data, gain, HEADSET_GAIN_SPEAKER); -} - -static DBusMessage *hs_set_mic_gain(DBusConnection *conn, - DBusMessage *msg, - void *data) -{ - uint16_t gain; - - if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_UINT16, &gain, - DBUS_TYPE_INVALID)) - return NULL; - - return hs_set_gain(conn, msg, data, gain, HEADSET_GAIN_MICROPHONE); -} - static DBusMessage *hs_get_properties(DBusConnection *conn, DBusMessage *msg, void *data) { @@ -1404,100 +833,27 @@ static DBusMessage *hs_get_properties(DBusConnection *conn, value = (device->headset->state >= HEADSET_STATE_CONNECTED); dict_append_entry(&dict, "Connected", DBUS_TYPE_BOOLEAN, &value); - if (!value) - goto done; - - /* SpeakerGain */ - dict_append_entry(&dict, "SpeakerGain", - DBUS_TYPE_UINT16, - &device->headset->slc->sp_gain); - - /* MicrophoneGain */ - dict_append_entry(&dict, "MicrophoneGain", - DBUS_TYPE_UINT16, - &device->headset->slc->mic_gain); - -done: dbus_message_iter_close_container(&iter, &dict); return reply; } -static DBusMessage *hs_set_property(DBusConnection *conn, - DBusMessage *msg, void *data) -{ - const char *property; - DBusMessageIter iter; - DBusMessageIter sub; - uint16_t gain; - - if (!dbus_message_iter_init(msg, &iter)) - return btd_error_invalid_args(msg); - - if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING) - return btd_error_invalid_args(msg); - - dbus_message_iter_get_basic(&iter, &property); - dbus_message_iter_next(&iter); - - if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT) - return btd_error_invalid_args(msg); - dbus_message_iter_recurse(&iter, &sub); - - if (g_str_equal("SpeakerGain", property)) { - if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_UINT16) - return btd_error_invalid_args(msg); - - dbus_message_iter_get_basic(&sub, &gain); - return hs_set_gain(conn, msg, data, gain, - HEADSET_GAIN_SPEAKER); - } else if (g_str_equal("MicrophoneGain", property)) { - if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_UINT16) - return btd_error_invalid_args(msg); - - dbus_message_iter_get_basic(&sub, &gain); - return hs_set_gain(conn, msg, data, gain, - HEADSET_GAIN_MICROPHONE); - } - - return btd_error_invalid_args(msg); -} - static GDBusMethodTable headset_methods[] = { { "Connect", "", "", hs_connect, G_DBUS_METHOD_FLAG_ASYNC }, { "Disconnect", "", "", hs_disconnect }, { "IsConnected", "", "b", hs_is_connected }, - { "IndicateCall", "", "", hs_ring }, - { "CancelCall", "", "", hs_cancel_call }, { "Play", "", "", hs_play, G_DBUS_METHOD_FLAG_ASYNC | G_DBUS_METHOD_FLAG_DEPRECATED }, { "Stop", "", "", hs_stop }, { "IsPlaying", "", "b", hs_is_playing, G_DBUS_METHOD_FLAG_DEPRECATED }, - { "GetSpeakerGain", "", "q", hs_get_speaker_gain, - G_DBUS_METHOD_FLAG_DEPRECATED }, - { "GetMicrophoneGain", "", "q", hs_get_mic_gain, - G_DBUS_METHOD_FLAG_DEPRECATED }, - { "SetSpeakerGain", "q", "", hs_set_speaker_gain, - G_DBUS_METHOD_FLAG_DEPRECATED }, - { "SetMicrophoneGain", "q", "", hs_set_mic_gain, - G_DBUS_METHOD_FLAG_DEPRECATED }, { "GetProperties", "", "a{sv}",hs_get_properties }, - { "SetProperty", "sv", "", hs_set_property }, { NULL, NULL, NULL, NULL } }; static GDBusSignalTable headset_signals[] = { - { "Connected", "", G_DBUS_SIGNAL_FLAG_DEPRECATED }, - { "Disconnected", "", G_DBUS_SIGNAL_FLAG_DEPRECATED }, - { "AnswerRequested", "" }, - { "Stopped", "", G_DBUS_SIGNAL_FLAG_DEPRECATED }, - { "Playing", "", G_DBUS_SIGNAL_FLAG_DEPRECATED }, - { "SpeakerGainChanged", "q", G_DBUS_SIGNAL_FLAG_DEPRECATED }, - { "MicrophoneGainChanged", "q", G_DBUS_SIGNAL_FLAG_DEPRECATED }, - { "CallTerminated", "" }, { "PropertyChanged", "sv" }, { NULL, NULL } }; @@ -1668,19 +1024,6 @@ uint32_t headset_config_init(GKeyFile *config) g_free(str); } - /* Init fast connectable option */ - str = g_key_file_get_string(config, "Headset", "FastConnectable", - &err); - if (err) { - DBG("audio.conf: %s", err->message); - g_clear_error(&err); - } else { - fast_connectable = strcmp(str, "true") == 0; - if (fast_connectable) - manager_set_fast_connectable(FALSE); - g_free(str); - } - return telephony_get_ag_features(); } @@ -1902,28 +1245,18 @@ int headset_connect_rfcomm(struct audio_device *dev, GIOChannel *io) int headset_connect_sco(struct audio_device *dev, GIOChannel *io) { struct headset *hs = dev->headset; - struct headset_slc *slc = hs->slc; if (hs->sco) return -EISCONN; hs->sco = g_io_channel_ref(io); - if (slc->pending_ring) { - ring_timer_cb(NULL); - ag.ring_timer = g_timeout_add_seconds(RING_INTERVAL, - ring_timer_cb, - NULL); - slc->pending_ring = FALSE; - } - return 0; } void headset_set_state(struct audio_device *dev, headset_state_t state) { struct headset *hs = dev->headset; - struct headset_slc *slc = hs->slc; gboolean value; const char *state_str; headset_state_t old_state = hs->state; @@ -1940,25 +1273,20 @@ void headset_set_state(struct audio_device *dev, headset_state_t state) close_sco(dev); if (dev->headset->slc) { - telephony_device_disconnect(dev->headset->slc->slc); - dev->headset->slc->slc = NULL; + telephony_device_disconnect(dev->headset->slc); + dev->headset->slc = NULL; } headset_close_rfcomm(dev); emit_property_changed(dev->conn, dev->path, AUDIO_HEADSET_INTERFACE, "State", DBUS_TYPE_STRING, &state_str); - g_dbus_emit_signal(dev->conn, dev->path, - AUDIO_HEADSET_INTERFACE, - "Disconnected", - DBUS_TYPE_INVALID); if (hs->state > HEADSET_STATE_CONNECTING) { emit_property_changed(dev->conn, dev->path, AUDIO_HEADSET_INTERFACE, "Connected", DBUS_TYPE_BOOLEAN, &value); telephony_device_disconnected(dev); } - active_devices = g_slist_remove(active_devices, dev); break; case HEADSET_STATE_CONNECTING: emit_property_changed(dev->conn, dev->path, @@ -1972,28 +1300,14 @@ void headset_set_state(struct audio_device *dev, headset_state_t state) AUDIO_HEADSET_INTERFACE, "State", DBUS_TYPE_STRING, &state_str); if (hs->state < state) { - if (telephony_get_ag_features() & - AG_FEATURE_INBAND_RINGTONE) - slc->inband_ring = TRUE; - else - slc->inband_ring = FALSE; - g_dbus_emit_signal(dev->conn, dev->path, - AUDIO_HEADSET_INTERFACE, - "Connected", - DBUS_TYPE_INVALID); value = TRUE; emit_property_changed(dev->conn, dev->path, AUDIO_HEADSET_INTERFACE, "Connected", DBUS_TYPE_BOOLEAN, &value); - active_devices = g_slist_append(active_devices, dev); telephony_device_connected(dev); } else if (hs->state == HEADSET_STATE_PLAYING) { value = FALSE; - g_dbus_emit_signal(dev->conn, dev->path, - AUDIO_HEADSET_INTERFACE, - "Stopped", - DBUS_TYPE_INVALID); emit_property_changed(dev->conn, dev->path, AUDIO_HEADSET_INTERFACE, "Playing", @@ -2014,17 +1328,9 @@ void headset_set_state(struct audio_device *dev, headset_state_t state) G_IO_ERR | G_IO_NVAL, (GIOFunc) sco_cb, dev); - g_dbus_emit_signal(dev->conn, dev->path, - AUDIO_HEADSET_INTERFACE, "Playing", - DBUS_TYPE_INVALID); emit_property_changed(dev->conn, dev->path, AUDIO_HEADSET_INTERFACE, "Playing", DBUS_TYPE_BOOLEAN, &value); - - if (slc->sp_gain >= 0) - headset_send(hs, "\r\n+VGS=%u\r\n", slc->sp_gain); - if (slc->mic_gain >= 0) - headset_send(hs, "\r\n+VGM=%u\r\n", slc->mic_gain); break; } @@ -2129,60 +1435,6 @@ int headset_get_sco_fd(struct audio_device *dev) return g_io_channel_unix_get_fd(hs->sco); } -gboolean headset_get_nrec(struct audio_device *dev) -{ - struct headset *hs = dev->headset; - - if (!hs->slc) - return TRUE; - - return hs->slc->nrec; -} - -unsigned int headset_add_nrec_cb(struct audio_device *dev, - headset_nrec_cb cb, void *user_data) -{ - struct headset *hs = dev->headset; - struct headset_nrec_callback *nrec_cb; - static unsigned int id = 0; - - nrec_cb = g_new(struct headset_nrec_callback, 1); - nrec_cb->cb = cb; - nrec_cb->user_data = user_data; - nrec_cb->id = ++id; - - hs->nrec_cbs = g_slist_prepend(hs->nrec_cbs, nrec_cb); - - return nrec_cb->id; -} - -gboolean headset_remove_nrec_cb(struct audio_device *dev, unsigned int id) -{ - struct headset *hs = dev->headset; - GSList *l; - - for (l = hs->nrec_cbs; l != NULL; l = l->next) { - struct headset_nrec_callback *cb = l->data; - if (cb && cb->id == id) { - hs->nrec_cbs = g_slist_remove(hs->nrec_cbs, cb); - g_free(cb); - return TRUE; - } - } - - return FALSE; -} - -gboolean headset_get_inband(struct audio_device *dev) -{ - struct headset *hs = dev->headset; - - if (!hs->slc) - return TRUE; - - return hs->slc->inband_ring; -} - gboolean headset_get_sco_hci(struct audio_device *dev) { return sco_hci; @@ -2199,193 +1451,6 @@ void headset_shutdown(struct audio_device *dev) headset_set_state(dev, HEADSET_STATE_DISCONNECTED); } -int telephony_event_ind(int index) -{ - if (!active_devices) - return -ENODEV; - - if (!ag.er_ind) { - DBG("telephony_report_event called but events are disabled"); - return -EINVAL; - } - - send_foreach_headset(active_devices, hfp_cmp, - "\r\n+CIEV: %d,%d\r\n", index + 1, - ag.indicators[index].val); - - return 0; -} - -int telephony_response_and_hold_ind(int rh) -{ - if (!active_devices) - return -ENODEV; - - ag.rh = rh; - - /* If we aren't in any response and hold state don't send anything */ - if (ag.rh < 0) - return 0; - - send_foreach_headset(active_devices, hfp_cmp, "\r\n+BTRH: %d\r\n", - ag.rh); - - return 0; -} - -int telephony_incoming_call_ind(const char *number, int type) -{ - struct audio_device *dev; - struct headset *hs; - struct headset_slc *slc; - - if (fast_connectable) - manager_set_fast_connectable(TRUE); - - if (!active_devices) - return -ENODEV; - - /* Get the latest connected device */ - dev = active_devices->data; - hs = dev->headset; - slc = hs->slc; - - if (ag.ring_timer) { - DBG("telephony_incoming_call_ind: already calling"); - return -EBUSY; - } - - /* With HSP 1.2 the RING messages should *not* be sent if inband - * ringtone is being used */ - if (!hs->hfp_active && slc->inband_ring) - return 0; - - g_free(ag.number); - ag.number = g_strdup(number); - ag.number_type = type; - - if (slc->inband_ring && hs->hfp_active && - hs->state != HEADSET_STATE_PLAYING) { - slc->pending_ring = TRUE; - return 0; - } - - ring_timer_cb(NULL); - ag.ring_timer = g_timeout_add_seconds(RING_INTERVAL, ring_timer_cb, - NULL); - - return 0; -} - -int telephony_calling_stopped_ind(void) -{ - struct audio_device *dev; - - if (fast_connectable) - manager_set_fast_connectable(FALSE); - - if (ag.ring_timer) { - g_source_remove(ag.ring_timer); - ag.ring_timer = 0; - } - - if (!active_devices) - return 0; - - /* In case SCO isn't fully up yet */ - dev = active_devices->data; - - if (!dev->headset->slc->pending_ring && !ag.ring_timer) - return -EINVAL; - - dev->headset->slc->pending_ring = FALSE; - - return 0; -} - -int telephony_ready_ind(uint32_t features, - const struct indicator *indicators, int rh, - const char *chld) -{ - ag.indicators = indicators; - ag.rh = rh; - ag.chld = chld; - - DBG("Telephony plugin initialized"); - - print_ag_features(telephony_get_ag_features()); - - return 0; -} - -int telephony_deinit(void) -{ - g_free(ag.number); - - memset(&ag, 0, sizeof(ag)); - - ag.er_mode = 3; - ag.rh = BTRH_NOT_SUPPORTED; - - DBG("Telephony deinitialized"); - - return 0; -} - -int telephony_list_current_call_ind(int idx, int dir, int status, int mode, - int mprty, const char *number, - int type) -{ - if (!active_devices) - return -ENODEV; - - if (number && strlen(number) > 0) - send_foreach_headset(active_devices, hfp_cmp, - "\r\n+CLCC: %d,%d,%d,%d,%d,\"%s\",%d\r\n", - idx, dir, status, mode, mprty, number, type); - else - send_foreach_headset(active_devices, hfp_cmp, - "\r\n+CLCC: %d,%d,%d,%d,%d\r\n", - idx, dir, status, mode, mprty); - - return 0; -} - -int telephony_subscriber_number_ind(const char *number, int type, int service) -{ - if (!active_devices) - return -ENODEV; - - send_foreach_headset(active_devices, hfp_cmp, - "\r\n+CNUM: ,%s,%d,,%d\r\n", - number, type, service); - - return 0; -} - -static int cwa_cmp(struct headset *hs) -{ - if (!hs->hfp_active) - return -1; - - if (hs->slc->cwa_enabled) - return 0; - else - return -1; -} - -int telephony_call_waiting_ind(const char *number, int type) -{ - if (!active_devices) - return -ENODEV; - - send_foreach_headset(active_devices, cwa_cmp, - "\r\n+CCWA: \"%s\",%d\r\n", - number, type); - - return 0; -} - unsigned int headset_add_state_cb(headset_state_cb cb, void *user_data) { struct headset_state_callback *state_cb; diff --git a/audio/headset.h b/audio/headset.h index 5591b36..43e8135 100644 --- a/audio/headset.h +++ b/audio/headset.h @@ -96,11 +96,6 @@ void headset_set_state(struct audio_device *dev, headset_state_t state); int headset_get_channel(struct audio_device *dev); int headset_get_sco_fd(struct audio_device *dev); -gboolean headset_get_nrec(struct audio_device *dev); -unsigned int headset_add_nrec_cb(struct audio_device *dev, - headset_nrec_cb cb, void *user_data); -gboolean headset_remove_nrec_cb(struct audio_device *dev, unsigned int id); -gboolean headset_get_inband(struct audio_device *dev); gboolean headset_get_sco_hci(struct audio_device *dev); gboolean headset_is_active(struct audio_device *dev); diff --git a/audio/telephony.h b/audio/telephony.h index c248d1e..76d02dd 100644 --- a/audio/telephony.h +++ b/audio/telephony.h @@ -26,13 +26,6 @@ #include #include -/* Response and hold values */ -#define BTRH_NOT_SUPPORTED -2 -#define BTRH_NONE -1 -#define BTRH_HOLD 0 -#define BTRH_ACCEPT 1 -#define BTRH_REJECT 2 - /* HFP feature bits */ #define AG_FEATURE_THREE_WAY_CALLING 0x0001 #define AG_FEATURE_EC_ANDOR_NR 0x0002 @@ -52,95 +45,6 @@ #define HF_FEATURE_ENHANCED_CALL_STATUS 0x0020 #define HF_FEATURE_ENHANCED_CALL_CONTROL 0x0040 -/* Indicator event values */ -#define EV_SERVICE_NONE 0 -#define EV_SERVICE_PRESENT 1 - -#define EV_CALL_INACTIVE 0 -#define EV_CALL_ACTIVE 1 - -#define EV_CALLSETUP_INACTIVE 0 -#define EV_CALLSETUP_INCOMING 1 -#define EV_CALLSETUP_OUTGOING 2 -#define EV_CALLSETUP_ALERTING 3 - -#define EV_CALLHELD_NONE 0 -#define EV_CALLHELD_MULTIPLE 1 -#define EV_CALLHELD_ON_HOLD 2 - -#define EV_ROAM_INACTIVE 0 -#define EV_ROAM_ACTIVE 1 - -/* Call parameters */ -#define CALL_DIR_OUTGOING 0 -#define CALL_DIR_INCOMING 1 - -#define CALL_STATUS_ACTIVE 0 -#define CALL_STATUS_HELD 1 -#define CALL_STATUS_DIALING 2 -#define CALL_STATUS_ALERTING 3 -#define CALL_STATUS_INCOMING 4 -#define CALL_STATUS_WAITING 5 - -#define CALL_MODE_VOICE 0 -#define CALL_MODE_DATA 1 -#define CALL_MODE_FAX 2 - -#define CALL_MULTIPARTY_NO 0 -#define CALL_MULTIPARTY_YES 1 - -/* Subscriber number parameters */ -#define SUBSCRIBER_SERVICE_VOICE 4 -#define SUBSCRIBER_SERVICE_FAX 5 - -/* Operator selection mode values */ -#define OPERATOR_MODE_AUTO 0 -#define OPERATOR_MODE_MANUAL 1 -#define OPERATOR_MODE_DEREGISTER 2 -#define OPERATOR_MODE_MANUAL_AUTO 4 - -/* Some common number types */ -#define NUMBER_TYPE_UNKNOWN 128 -#define NUMBER_TYPE_TELEPHONY 129 -#define NUMBER_TYPE_INTERNATIONAL 145 -#define NUMBER_TYPE_NATIONAL 161 -#define NUMBER_TYPE_VOIP 255 - -/* Extended Audio Gateway Error Result Codes */ -typedef enum { - CME_ERROR_NONE = -1, - CME_ERROR_AG_FAILURE = 0, - CME_ERROR_NO_PHONE_CONNECTION = 1, - CME_ERROR_NOT_ALLOWED = 3, - CME_ERROR_NOT_SUPPORTED = 4, - CME_ERROR_PH_SIM_PIN_REQUIRED = 5, - CME_ERROR_SIM_NOT_INSERTED = 10, - CME_ERROR_SIM_PIN_REQUIRED = 11, - CME_ERROR_SIM_PUK_REQUIRED = 12, - CME_ERROR_SIM_FAILURE = 13, - CME_ERROR_SIM_BUSY = 14, - CME_ERROR_INCORRECT_PASSWORD = 16, - CME_ERROR_SIM_PIN2_REQUIRED = 17, - CME_ERROR_SIM_PUK2_REQUIRED = 18, - CME_ERROR_MEMORY_FULL = 20, - CME_ERROR_INVALID_INDEX = 21, - CME_ERROR_MEMORY_FAILURE = 23, - CME_ERROR_TEXT_STRING_TOO_LONG = 24, - CME_ERROR_INVALID_TEXT_STRING = 25, - CME_ERROR_DIAL_STRING_TOO_LONG = 26, - CME_ERROR_INVALID_DIAL_STRING = 27, - CME_ERROR_NO_NETWORK_SERVICE = 30, - CME_ERROR_NETWORK_TIMEOUT = 31, - CME_ERROR_NETWORK_NOT_ALLOWED = 32, -} cme_error_t; - -struct indicator { - const char *desc; - const char *range; - int val; - gboolean ignore_redundant; -}; - /* Notify telephony-*.c of connected/disconnected devices. Implemented by * telephony-*.c */ @@ -152,81 +56,6 @@ void telephony_device_disconnected(void *telephony_device); gboolean telephony_get_ready_state(void *adapter); uint32_t telephony_get_ag_features(void); -/* AG responses to HF requests. These are implemented by headset.c */ -int telephony_event_reporting_rsp(void *telephony_device, cme_error_t err); -int telephony_response_and_hold_rsp(void *telephony_device, cme_error_t err); -int telephony_last_dialed_number_rsp(void *telephony_device, cme_error_t err); -int telephony_terminate_call_rsp(void *telephony_device, cme_error_t err); -int telephony_answer_call_rsp(void *telephony_device, cme_error_t err); -int telephony_dial_number_rsp(void *telephony_device, cme_error_t err); -int telephony_transmit_dtmf_rsp(void *telephony_device, cme_error_t err); -int telephony_subscriber_number_rsp(void *telephony_device, cme_error_t err); -int telephony_list_current_calls_rsp(void *telephony_device, cme_error_t err); -int telephony_operator_selection_rsp(void *telephony_device, cme_error_t err); -int telephony_call_hold_rsp(void *telephony_device, cme_error_t err); -int telephony_nr_and_ec_rsp(void *telephony_device, cme_error_t err); -int telephony_voice_dial_rsp(void *telephony_device, cme_error_t err); -int telephony_key_press_rsp(void *telephony_device, cme_error_t err); - -/* Event indications by AG. These are implemented by headset.c */ -int telephony_event_ind(int index); -int telephony_response_and_hold_ind(int rh); -int telephony_incoming_call_ind(const char *number, int type); -int telephony_calling_stopped_ind(void); -int telephony_ready_ind(uint32_t features, const struct indicator *indicators, - int rh, const char *chld); -int telephony_deinit(void); -int telephony_list_current_call_ind(int idx, int dir, int status, int mode, - int mprty, const char *number, - int type); -int telephony_subscriber_number_ind(const char *number, int type, - int service); -int telephony_call_waiting_ind(const char *number, int type); -int telephony_operator_selection_ind(int mode, const char *oper); - -/* Helper function for quick indicator updates */ -static inline int telephony_update_indicator(struct indicator *indicators, - const char *desc, - int new_val) -{ - int i; - struct indicator *ind = NULL; - - for (i = 0; indicators[i].desc != NULL; i++) { - if (g_str_equal(indicators[i].desc, desc)) { - ind = &indicators[i]; - break; - } - } - - if (!ind) - return -ENOENT; - - DBG("Telephony indicator \"%s\" %d->%d", desc, ind->val, new_val); - - if (ind->ignore_redundant && ind->val == new_val) { - DBG("Ignoring no-change indication"); - return 0; - } - - ind->val = new_val; - - return telephony_event_ind(i); -} - -static inline int telephony_get_indicator(const struct indicator *indicators, - const char *desc) -{ - int i; - - for (i = 0; indicators[i].desc != NULL; i++) { - if (g_str_equal(indicators[i].desc, desc)) - return indicators[i].val; - } - - return -ENOENT; -} - int telephony_adapter_init(void *adapter); void telephony_adapter_exit(void *adapter); int telephony_init(void); diff --git a/audio/transport.c b/audio/transport.c index 7bde32d..2f85c39 100644 --- a/audio/transport.c +++ b/audio/transport.c @@ -76,7 +76,10 @@ struct media_transport { uint16_t imtu; /* Transport input mtu */ uint16_t omtu; /* Transport output mtu */ uint16_t delay; /* Transport delay (a2dp only) */ - unsigned int nrec_id; /* Transport nrec watch (headset only) */ + gboolean nrec; /* Transport nrec (headset only) */ + gboolean inband; /* Transport inband ringtone (headset only) */ + uint8_t sp_gain; /* Transport speaker gain (headset only) */ + uint8_t mic_gain; /* Transport mic gain (headset only) */ gboolean read_lock; gboolean write_lock; gboolean in_use; @@ -761,25 +764,59 @@ static int set_property_headset(struct media_transport *transport, DBusMessageIter *value) { if (g_strcmp0(property, "NREC") == 0) { - gboolean nrec; - if (dbus_message_iter_get_arg_type(value) != DBUS_TYPE_BOOLEAN) return -EINVAL; - dbus_message_iter_get_basic(value, &nrec); + dbus_message_iter_get_basic(value, &transport->nrec); - /* FIXME: set new nrec */ + emit_property_changed(transport->conn, transport->path, + MEDIA_TRANSPORT_INTERFACE, "NREC", + DBUS_TYPE_BOOLEAN, &transport->nrec); return 0; } else if (g_strcmp0(property, "InbandRingtone") == 0) { - gboolean inband; - if (dbus_message_iter_get_arg_type(value) != DBUS_TYPE_BOOLEAN) return -EINVAL; - dbus_message_iter_get_basic(value, &inband); + dbus_message_iter_get_basic(value, &transport->inband); + + emit_property_changed(transport->conn, transport->path, + MEDIA_TRANSPORT_INTERFACE, + "InbandRingtone", + DBUS_TYPE_BOOLEAN, &transport->inband); + return 0; + } else if (g_strcmp0(property, "SpeakerGain") == 0) { + uint16_t gain; + + if (dbus_message_iter_get_arg_type(value) != DBUS_TYPE_UINT16) + return -EINVAL; + dbus_message_iter_get_basic(value, &gain); + + if (gain > 15) + goto failed; - /* FIXME: set new inband */ + transport->sp_gain = gain; + emit_property_changed(transport->conn, transport->path, + MEDIA_TRANSPORT_INTERFACE, + "SpeakerGain", DBUS_TYPE_UINT16, + &transport->sp_gain); + return 0; + } else if (g_strcmp0(property, "MicrophoneGain") == 0) { + uint16_t gain; + + if (dbus_message_iter_get_arg_type(value) != DBUS_TYPE_UINT16) + return -EINVAL; + dbus_message_iter_get_basic(value, &gain); + + if (gain > 15) + goto failed; + + transport->mic_gain = gain; + emit_property_changed(transport->conn, transport->path, + MEDIA_TRANSPORT_INTERFACE, + "MicrophoneGain", DBUS_TYPE_UINT16, + &transport->mic_gain); return 0; } +failed: return -EINVAL; } @@ -845,14 +882,15 @@ static void get_properties_a2dp(struct media_transport *transport, static void get_properties_headset(struct media_transport *transport, DBusMessageIter *dict) { - gboolean nrec, inband; const char *routing; - nrec = headset_get_nrec(transport->device); - dict_append_entry(dict, "NREC", DBUS_TYPE_BOOLEAN, &nrec); - - inband = headset_get_inband(transport->device); - dict_append_entry(dict, "InbandRingtone", DBUS_TYPE_BOOLEAN, &inband); + dict_append_entry(dict, "NREC", DBUS_TYPE_BOOLEAN, &transport->nrec); + dict_append_entry(dict, "InbandRingtone", DBUS_TYPE_BOOLEAN, + &transport->inband); + dict_append_entry(dict, "SpeakerGain", DBUS_TYPE_UINT16, + &transport->sp_gain); + dict_append_entry(dict, "MicrophoneGain", DBUS_TYPE_UINT16, + &transport->mic_gain); routing = headset_get_sco_hci(transport->device) ? "HCI" : "PCM"; dict_append_entry(dict, "Routing", DBUS_TYPE_STRING, &routing); @@ -944,9 +982,6 @@ static void media_transport_free(void *data) if (transport->session) avdtp_unref(transport->session); - if (transport->nrec_id) - headset_remove_nrec_cb(transport->device, transport->nrec_id); - if (transport->conn) dbus_connection_unref(transport->conn); @@ -955,18 +990,6 @@ static void media_transport_free(void *data) g_free(transport); } -static void headset_nrec_changed(struct audio_device *dev, gboolean nrec, - void *user_data) -{ - struct media_transport *transport = user_data; - - DBG(""); - - emit_property_changed(transport->conn, transport->path, - MEDIA_TRANSPORT_INTERFACE, "NREC", - DBUS_TYPE_BOOLEAN, &nrec); -} - struct media_transport *media_transport_create(DBusConnection *conn, struct media_endpoint *endpoint, struct audio_device *device, @@ -1002,9 +1025,7 @@ struct media_transport *media_transport_create(DBusConnection *conn, transport->cancel = cancel_headset; transport->get_properties = get_properties_headset; transport->set_property = set_property_headset; - transport->nrec_id = headset_add_nrec_cb(device, - headset_nrec_changed, - transport); + transport->nrec = TRUE; } else if (strcasecmp(uuid, HFP_HS_UUID) == 0 || strcasecmp(uuid, HSP_HS_UUID) == 0) { transport->resume = resume_gateway; diff --git a/audio/unix.c b/audio/unix.c index 5199831..24a6669 100644 --- a/audio/unix.c +++ b/audio/unix.c @@ -261,8 +261,10 @@ static uint8_t headset_generate_capability(struct audio_device *dev, pcm = (void *) codec; pcm->sampling_rate = 8000; if (dev->headset) { +#if 0 if (headset_get_nrec(dev)) pcm->flags |= BT_PCM_FLAG_NREC; +#endif if (!headset_get_sco_hci(dev)) pcm->flags |= BT_PCM_FLAG_PCM_ROUTING; codec->configured = headset_is_active(dev); diff --git a/doc/audio-api.txt b/doc/audio-api.txt index d20cda4..04061c9 100644 --- a/doc/audio-api.txt +++ b/doc/audio-api.txt @@ -71,16 +71,6 @@ Methods void Connect() Returns TRUE if there is a active connection to the HSP/HFP connection on the remote device. - void IndicateCall() - - Indicate an incoming call on the headset - connected to the stream. Will continue to - ring the headset about every 3 seconds. - - void CancelCall() - - Cancel the incoming call indication. - void Play() {deprecated} Open the audio connection to the headset. @@ -94,24 +84,6 @@ Methods void Connect() Returns true if an audio connection to the headset is active. - uint16 GetSpeakerGain() {deprecated} - - Returns the current speaker gain if available, - otherwise returns the error NotAvailable. - - uint16 GetMicrophoneGain() {deprecated} - - Returns the current microphone gain if available, - otherwise returns the error NotAvailable. - - void SetSpeakerGain(uint16 gain) {deprecated} - - Changes the current speaker gain if possible. - - void SetMicrophoneGain(uint16 gain) {deprecated} - - Changes the current speaker gain if possible. - dict GetProperties() Returns all properties for the interface. See the @@ -119,44 +91,7 @@ Methods void Connect() Possible Errors: org.bluez.Error.InvalidArguments - void SetProperty(string name, variant value) - - Changes the value of the specified property. Only - properties that are listed a read-write are changeable. - On success this will emit a PropertyChanged signal. - - Possible Errors: org.bluez.Error.DoesNotExist - org.bluez.Error.InvalidArguments - -Signals void AnswerRequested() - - Sent when the answer button is pressed on the headset - - void Connected() {deprecated} - - Sent when the device has been connected to. - - void Disconnected() {deprecated} - - Sent when the device has been disconnected from. - - void Stopped() {deprecated} - - Sent when the audio connection is closed - - void Playing() {deprecated} - - Sent when the audio connection is opened - - void SpeakerGainChanged(uint16 gain) {deprecated} - - The speaker gain changed. - - void MicrophoneGainChanged(uint16 gain) {deprecated} - - The microphone gain changed. - - PropertyChanged(string name, variant value) +Signals PropertyChanged(string name, variant value) This signal indicates a changed value of the given property. @@ -196,14 +131,6 @@ properties string State [readonly] Indicates if an audio connection to the headset is active. - uint16 SpeakerGain [readwrite] - - The speaker gain when available. - - uint16 MicrophoneGain [readwrite] - - The speaker gain when available. - AudioSink hierarchy =================== diff --git a/doc/media-api.txt b/doc/media-api.txt index c53ab7b..2e64d93 100644 --- a/doc/media-api.txt +++ b/doc/media-api.txt @@ -326,18 +326,23 @@ Properties object Device [readonly] boolean NREC [readwrite] Optional. Indicates if echo cancelling and noise - reduction functions are active in the transport, this - property is only writeable when the transport was - acquired by the sender. + reduction functions are active in the transport. boolean InbandRingtone [readwrite] Optional. Indicates if the transport support sending - ringtones, this property is only writeable when the - transport was acquired by the sender. + ringtones. string Routing [readonly] Optional. Indicates where is the transport being routed Possible Values: "HCI" or "PCM" + + uint16 SpeakerGain [readwrite] + + Optional. The speaker gain when available. + + uint16 MicrophoneGain [readwrite] + + Optional. The microphone gain when available. -- 1.7.1