summaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
authorJoão Paulo Rechi Vita <joao.vita@gmail.com>2008-08-16 16:00:32 -0300
committerLennart Poettering <lennart@poettering.net>2008-09-11 01:12:06 +0300
commit85a931f3334c7e743a3f7afdca7e23d5989ba672 (patch)
treeb5fc82d081e45b16532f7840700a631c559dd9fc /src/modules
parent77138dd8f702cf8dd15892ea6199b604493d97a9 (diff)
Get rid of hw_constraint function. It's code now lives inside bt_setconf().
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/module-bt-device.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/src/modules/module-bt-device.c b/src/modules/module-bt-device.c
index 95257dad..e808cfb7 100644
--- a/src/modules/module-bt-device.c
+++ b/src/modules/module-bt-device.c
@@ -410,6 +410,10 @@ static int bt_setconf(struct userdata *u) {
}
}
+ u->ss.format = PA_SAMPLE_S16LE;
+ u->ss.rate = u->rate;
+ u->ss.channels = u->channels;
+
memset(setconf_req, 0, BT_AUDIO_IPC_PACKET_SIZE);
setconf_req->h.msg_type = BT_SETCONFIGURATION_REQ;
strncpy(setconf_req->device, u->addr, 18);
@@ -515,14 +519,6 @@ static int bt_getstreamfd(struct userdata *u) {
return 0;
}
-static int bt_hw_constraint(struct userdata *u) {
- /*TODO: A2DP */
- u->ss.format = PA_SAMPLE_S16LE;
- u->ss.rate = 8000;
- u->ss.channels = 1;
- return 0;
-}
-
static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
struct userdata *u = PA_SINK(o)->userdata;
@@ -768,13 +764,6 @@ int pa__init(pa_module* m) {
goto fail;
}
- /* configure hw supported sample specs */
- e = bt_hw_constraint(u);
- if (e < 0) {
- pa_log_error("failed to configure sample spec");
- goto fail;
- }
-
/* create sink */
pa_sink_new_data_init(&data);
data.driver = __FILE__;