diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2008-09-03 14:06:40 +0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2008-09-03 14:06:40 +0300 |
| commit | 8c565c2146ecb7cde3761c087b67618985ab4346 (patch) | |
| tree | 32e8c59a3d2b6065ec447b4a3b5f6cb09544e3a4 /audio | |
| parent | 5c607b7899fd4e555b0d73e3dbe0ea0b4f6e6cfa (diff) | |
Add telephony initialization calls to correct places
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/main.c | 1 | ||||
| -rw-r--r-- | audio/manager.c | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/audio/main.c b/audio/main.c index 9afc61e6..8c3ce9c7 100644 --- a/audio/main.c +++ b/audio/main.c @@ -39,6 +39,7 @@ #include "unix.h" #include "device.h" #include "manager.h" +#include "telephony.h" static GKeyFile *load_config_file(const char *file) { diff --git a/audio/manager.c b/audio/manager.c index ef8056de..f4905ea9 100644 --- a/audio/manager.c +++ b/audio/manager.c @@ -65,6 +65,7 @@ #include "control.h" #include "manager.h" #include "sdpd.h" +#include "telephony.h" typedef enum { HEADSET = 1 << 0, @@ -932,8 +933,11 @@ int audio_manager_init(DBusConnection *conn, GKeyFile *conf) g_strfreev(list); proceed: - if (enabled.headset) + if (enabled.headset) { + telephony_init(); + telephony_features_req(); btd_register_adapter_driver(&headset_server_driver); + } if (enabled.gateway) btd_register_adapter_driver(&gateway_server_driver); @@ -956,8 +960,10 @@ void audio_manager_exit(void) if (config) g_key_file_free(config); - if (enabled.headset) + if (enabled.headset) { btd_unregister_adapter_driver(&headset_server_driver); + telephony_exit(); + } if (enabled.gateway) btd_unregister_adapter_driver(&gateway_server_driver); |