diff options
| author | Luiz Augusto von Dentz <luiz.dentz@openbossa.org> | 2007-06-27 18:31:08 +0000 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.dentz@openbossa.org> | 2007-06-27 18:31:08 +0000 |
| commit | 389d6a32fa14abefec394b9ebfa3b2deb51489c7 (patch) | |
| tree | b786ca6e32d380cec5f52d0961dce8246e0e7a57 /audio/manager.c | |
| parent | 2a2c204cd0e4bcf0a603ba72be9a50203a817b54 (diff) | |
Revert changes on storage, rfcomm might change over time.
Diffstat (limited to 'audio/manager.c')
| -rw-r--r-- | audio/manager.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/audio/manager.c b/audio/manager.c index 8ca57100..00f5d931 100644 --- a/audio/manager.c +++ b/audio/manager.c @@ -186,7 +186,7 @@ static void handle_record(sdp_record_t *record, struct device *device) headset_update(device, record, uuid16); else device->headset = headset_init(device, - record, uuid16, -1); + record, uuid16); break; case HEADSET_AGW_SVCLASS_ID: debug("Found Headset AG record"); @@ -197,7 +197,7 @@ static void handle_record(sdp_record_t *record, struct device *device) headset_update(device, record, uuid16); else device->headset = headset_init(device, - record, uuid16, -1); + record, uuid16); break; case HANDSFREE_AGW_SVCLASS_ID: debug("Found Handsfree AG record"); @@ -637,7 +637,7 @@ struct device *manager_device_connected(bdaddr_t *bda) } if (!device->headset) - device->headset = headset_init(device, NULL, 0, -1); + device->headset = headset_init(device, NULL, 0); if (!device->headset) return NULL; @@ -1101,15 +1101,8 @@ static void parse_stored_devices(char *key, char *value, void *data) if (!device) return; - if (strncmp(value, "headset", strlen("headset")) == 0) { - int channel = -1; - char *ptr; - - if ((ptr = strchr(value, '#'))) - channel = strtol(ptr+1, NULL, 10); - - device->headset = headset_init(device, NULL, 0, channel); - } + if (strncmp(value, "headset", strlen("headset")) == 0) + device->headset = headset_init(device, NULL, 0); add_device(device); } |