handsfree-audio: Send the selected codec

This patch removes the hard-coded CVSD codec, and adds the selected
codec in the NewConnection method call, notifying the agent the codec
previously selected for the audio connection.

diff --git a/src/handsfree-audio.c b/src/handsfree-audio.c
index 8e8d460606c2ecc933782606432e0247e5bbfbd2..7f5b33cb817d95b7b56faf5806b0dbd7ab998e85 100644 (file)
--- a/src/handsfree-audio.c
+++ b/src/handsfree-audio.c
@@ -67,11 +67,10 @@ static guint sco_watch = 0;
 static GSList *drivers = 0;
 static ofono_bool_t has_wideband = FALSE;
 
-static void send_new_connection(const char *card, int fd)
+static void send_new_connection(const char *card, int fd, uint8_t codec)
 {
        DBusMessage *msg;
        DBusMessageIter iter;
-       uint8_t codec = HFP_CODEC_CVSD;
 
        msg = dbus_message_new_method_call(agent->owner, agent->path,
                                HFP_AUDIO_AGENT_INTERFACE, "NewConnection");
@@ -150,7 +149,7 @@ static gboolean sco_accept(GIOChannel *io, GIOCondition cond,
                return TRUE;
        }
 
-       send_new_connection(card->path, nsk);
+       send_new_connection(card->path, nsk, card->selected_codec);
        close(nsk);
 
        return TRUE;
@@ -252,7 +251,7 @@ static gboolean sco_connect_cb(GIOChannel *io, GIOCondition cond,
 
        sk = g_io_channel_unix_get_fd(io);
 
-       send_new_connection(card->path, sk);
+       send_new_connection(card->path, sk, card->selected_codec);
 
        close(sk);