From e8ebb1af91435674784dcbbc3207331fcdac7458 Mon Sep 17 00:00:00 2001 From: Denis Krjuchkov Date: Mon, 20 Sep 2010 18:28:08 -0700 Subject: main: Add Windows Service support I've added PIPE_EVENT_SHUTDOWN because calling g_main_loop_quit() do not work when called from another thread. Main thread was sleeping in g_poll() so I needed some way to wake it up. By some strange reason call close(event_pipe[0]) in event_pipe_deinit() hangs. In current implementation that code never reached so that was not a problem :-) I've added a conditional to leave event_pipe[0] open on Win32. --- src/main.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index c93a3f615..34310927d 100644 --- a/src/main.c +++ b/src/main.c @@ -269,7 +269,25 @@ idle_event_emitted(void) client_manager_idle_add(flags); } +/** + * event_pipe callback function for PIPE_EVENT_SHUTDOWN + */ +static void +shutdown_event_emitted(void) +{ + g_main_loop_quit(main_loop); +} + int main(int argc, char *argv[]) +{ +#ifdef WIN32 + return win32_main(argc, argv); +#else + return mpd_main(argc, argv); +#endif +} + +int mpd_main(int argc, char *argv[]) { struct options options; clock_t start; @@ -324,6 +342,7 @@ int main(int argc, char *argv[]) event_pipe_init(); event_pipe_register(PIPE_EVENT_IDLE, idle_event_emitted); + event_pipe_register(PIPE_EVENT_SHUTDOWN, shutdown_event_emitted); path_global_init(); glue_mapper_init(); @@ -392,10 +411,17 @@ int main(int argc, char *argv[]) playlist_state_restore() */ pc_update_audio(); - /* run the main loop */ +#ifdef WIN32 + win32_app_started(); +#endif + /* run the main loop */ g_main_loop_run(main_loop); +#ifdef WIN32 + win32_app_stopping(); +#endif + /* cleanup */ g_main_loop_unref(main_loop); -- cgit v1.2.3