diff options
author | Johan Hedberg <johan.hedberg@nokia.com> | 2007-04-12 14:26:55 +0000 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@nokia.com> | 2007-04-12 14:26:55 +0000 |
commit | a07ea139e52ab9733f6d1e9f0ab2e0bf232059ef (patch) | |
tree | efd7dcf423c38397b38f1b97f4bf02051ce92ab0 /audio/main.c | |
parent | e41abf4a7c4f97c679ce748ef7eabbd11bcff3d9 (diff) |
A little more refactoring
Diffstat (limited to 'audio/main.c')
-rw-r--r-- | audio/main.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/audio/main.c b/audio/main.c index 3cf609f6..470b26d5 100644 --- a/audio/main.c +++ b/audio/main.c @@ -73,19 +73,25 @@ int main(int argc, char *argv[]) exit(1); } - headset_init(conn); + if (audio_init(conn) < 0) { + error("Audio init failed!"); + exit(1); + } - audio_init(conn); + if (headset_init(conn) < 0) { + error("Headset initialization failed!"); + exit(1); + } if (argc > 1 && !strcmp(argv[1], "-s")) register_external_service(conn, "audio", "Audio service", ""); g_main_loop_run(main_loop); - audio_exit(); - headset_exit(); + audio_exit(); + dbus_connection_unref(conn); g_main_loop_unref(main_loop); |