From c20b0d8bb608812785fd4434402dbd7c6a9b9266 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Sat, 27 Apr 2013 13:22:34 +0200 Subject: do not wait for audio stream on ui exit --- src/curses-ui/main.vala | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/curses-ui/main.vala b/src/curses-ui/main.vala index 00ca9fb..6a89db4 100644 --- a/src/curses-ui/main.vala +++ b/src/curses-ui/main.vala @@ -21,14 +21,23 @@ public CursesUI ui; private static void play(string file) { try { audio.play_system(file); - } catch(IOError e) { } + } catch(IOError e) { + ui.log("could not play audio: %s".printf(e.message)); + } } public void msg_handler(MessageType type, string message) { ui.log(message); } +public void log_handler(string? log_domain, LogLevelFlags flags, string message) { + ui.log(message); +} + public static int main(string[] args) { + loop = new MainLoop(); + + Log.set_default_handler(log_handler); /* handle unix signals */ Unix.signal_add(Posix.SIGTERM, handle_signals); @@ -54,10 +63,6 @@ public static int main(string[] args) { ui.log("Stopping Shop System"); play("shutdown.ogg"); - /* we need to run the mainloop to play audio */ - audio.end_of_stream.connect(() => { loop.quit(); }); - loop.run(); - /* leave curses mode */ ui.exit(); -- cgit v1.2.3