---
 src/emulator.c |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 58 insertions(+), 0 deletions(-)

diff --git a/src/emulator.c b/src/emulator.c
index c5ec105..0760c79 100644
--- a/src/emulator.c
+++ b/src/emulator.c
@@ -54,6 +54,7 @@ struct ofono_emulator {
        gboolean ccwa;
        int pns_id;
        char *audio_transport;
+       guint audio_watch;
 };
 
 struct indicator {
@@ -1071,9 +1072,15 @@ void ofono_emulator_register(struct ofono_emulator *em, 
int fd)
 static void emulator_remove(struct ofono_atom *atom)
 {
        struct ofono_emulator *em = __ofono_atom_get_data(atom);
+       DBusConnection *connection;
 
        DBG("atom: %p", atom);
 
+       connection = ofono_dbus_get_connection();
+
+       if (em->audio_watch)
+               g_dbus_remove_watch(connection, em->audio_watch);
+
        g_free(em->audio_transport);
        g_free(em);
 }
@@ -1101,6 +1108,7 @@ struct ofono_emulator *ofono_emulator_create(struct 
ofono_modem *modem,
        em->type = type;
        em->l_features |= HFP_AG_FEATURE_3WAY;
        em->l_features |= HFP_AG_FEATURE_ECNR;
+       em->l_features |= HFP_AG_FEATURE_IN_BAND_RING_TONE;
        em->l_features |= HFP_AG_FEATURE_REJECT_CALL;
        em->l_features |= HFP_AG_FEATURE_ENHANCED_CALL_STATUS;
        em->l_features |= HFP_AG_FEATURE_ENHANCED_CALL_CONTROL;
@@ -1119,10 +1127,60 @@ void ofono_emulator_remove(struct ofono_emulator *em)
        __ofono_atom_free(em->atom);
 }
 
+static gboolean audio_property_changed(DBusConnection *connection,
+                                       DBusMessage *message, void *user_data)
+{
+       struct ofono_emulator *em = user_data;
+       const char *property;
+       char buf[10];
+       DBusMessageIter iter;
+
+       dbus_message_iter_init(message, &iter);
+
+       if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
+               return FALSE;
+
+       dbus_message_iter_get_basic(&iter, &property);
+
+       if (g_str_equal(property, "InbandRingtone") == TRUE) {
+               DBusMessageIter variant;
+               gboolean value;
+
+               if (!dbus_message_iter_next(&iter))
+                       return TRUE;
+
+               if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT)
+                       return TRUE;
+
+               dbus_message_iter_recurse(&iter, &variant);
+
+               if (dbus_message_iter_get_arg_type(&variant) !=
+                                                       DBUS_TYPE_BOOLEAN)
+                       return TRUE;
+
+               dbus_message_iter_get_basic(&variant, &value);
+
+               sprintf(buf, "+BSIR: %d", value);
+               g_at_server_send_unsolicited(em->server, buf);
+       }
+
+       return TRUE;
+}
+
 void ofono_emulator_set_audio_transport(struct ofono_emulator *em,
                                                const char *path)
 {
+       DBusConnection *connection;
+
        em->audio_transport = g_strdup(path);
+
+       connection = ofono_dbus_get_connection();
+
+       em->audio_watch = g_dbus_add_signal_watch(connection, NULL, path,
+                                               BLUEZ_TRANSPORT_INTERFACE,
+                                               "PropertyChanged",
+                                               audio_property_changed, em,
+                                               NULL);
 }
 
 void ofono_emulator_send_final(struct ofono_emulator *em,
-- 
1.7.1

_______________________________________________
ofono mailing list
[email protected]
http://lists.ofono.org/listinfo/ofono

Reply via email to