← Back to branch summary

~cyphermox/+junk/bluez-debug

« back to all changes in this revision

Viewing changes to audio/device.c

  • Committer: Package Import Robot
  • Author(s): Robert Ancell
  • Date: 2012-07-04 13:28:49 UTC
  • mfrom: (1.1.38)
  • Revision ID: package-import@ubuntu.com-20120704132849-tmwu1x7p2vxcclt1
Tags: 4.101-0ubuntu1
* New upstream release
* debian/libbluetooth3.symbols:
  - Updated
* debian/patches/10-unregister_interface_on_exit.patch:
* debian/patches/11-explicitly_close.patch:
* debian/patches/python3.patch:
  - Applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
audio/device.c
618
618
        return reply;
619
619
}
620
620
 
621
 
static GDBusMethodTable dev_methods[] = {
622
 
        { "Connect",            "",     "",     dev_connect,
623
 
                                                G_DBUS_METHOD_FLAG_ASYNC },
624
 
        { "Disconnect",         "",     "",     dev_disconnect },
625
 
        { "GetProperties",      "",     "a{sv}",dev_get_properties },
626
 
        { NULL, NULL, NULL, NULL }
 
621
static const GDBusMethodTable dev_methods[] = {
 
622
        { GDBUS_ASYNC_METHOD("Connect", NULL, NULL, dev_connect) },
 
623
        { GDBUS_METHOD("Disconnect", NULL, NULL, dev_disconnect) },
 
624
        { GDBUS_METHOD("GetProperties",
 
625
                NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
 
626
                dev_get_properties) },
 
627
        { }
627
628
};
628
629
 
629
 
static GDBusSignalTable dev_signals[] = {
630
 
        { "PropertyChanged",            "sv"    },
631
 
        { NULL, NULL }
 
630
static const GDBusSignalTable dev_signals[] = {
 
631
        { GDBUS_SIGNAL("PropertyChanged",
 
632
                        GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
 
633
        { }
632
634
};
633
635
 
634
636
struct audio_device *audio_device_register(DBusConnection *conn,
701
703
                                control_is_active(dev))
702
704
                return TRUE;
703
705
        else if (!strcmp(interface, AUDIO_GATEWAY_INTERFACE) && dev->gateway &&
704
 
                                gateway_is_connected(dev))
 
706
                                gateway_is_active(dev))
705
707
                return TRUE;
706
708
 
707
709
        return FALSE;