main: export the main_loop variable
Other libraries may need to access the main_loop reference, to add or remove events, or to call g_main_loop_quit().
This commit is contained in:
parent
a3b0506cfd
commit
d40cf1652d
|
@ -43,6 +43,7 @@ mpd_headers = \
|
|||
listen.h \
|
||||
log.h \
|
||||
ls.h \
|
||||
main.h \
|
||||
main_notify.h \
|
||||
daemon.h \
|
||||
normalize.h \
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#include "main_notify.h"
|
||||
#include "dlist.h"
|
||||
#include "idle.h"
|
||||
#include "main.h"
|
||||
|
||||
#include "../config.h"
|
||||
|
||||
|
@ -471,7 +472,7 @@ client_in_event(G_GNUC_UNUSED GIOChannel *source,
|
|||
switch (ret) {
|
||||
case COMMAND_RETURN_KILL:
|
||||
client_close(client);
|
||||
g_main_loop_quit(NULL);
|
||||
g_main_loop_quit(main_loop);
|
||||
return false;
|
||||
|
||||
case COMMAND_RETURN_CLOSE:
|
||||
|
|
|
@ -75,6 +75,8 @@
|
|||
#include <locale.h>
|
||||
#endif
|
||||
|
||||
GMainLoop *main_loop;
|
||||
|
||||
static void changeToUser(void)
|
||||
{
|
||||
#ifndef WIN32
|
||||
|
@ -207,7 +209,6 @@ main_notify_triggered(void)
|
|||
int main(int argc, char *argv[])
|
||||
{
|
||||
Options options;
|
||||
GMainLoop *main_loop;
|
||||
clock_t start;
|
||||
GTimer *save_state_timer;
|
||||
|
||||
|
|
|
@ -0,0 +1,24 @@
|
|||
/*
|
||||
* Copyright (C) 2003-2008 The Music Player Daemon Project
|
||||
* http://www.musicpd.org
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifndef MAIN_H
|
||||
#define MAIN_H
|
||||
|
||||
extern GMainLoop *main_loop;
|
||||
|
||||
#endif
|
Loading…
Reference in New Issue