GlobalEvents: eliminate SHUTDOWN, use Instance::Shutdown() instead
This commit is contained in:
parent
071af004bd
commit
eaa1590866
|
@ -33,11 +33,6 @@ namespace GlobalEvents {
|
|||
/** the current song's tag has changed */
|
||||
TAG,
|
||||
|
||||
#ifdef WIN32
|
||||
/** shutdown requested */
|
||||
SHUTDOWN,
|
||||
#endif
|
||||
|
||||
MAX
|
||||
};
|
||||
|
||||
|
|
16
src/Main.cxx
16
src/Main.cxx
|
@ -385,19 +385,6 @@ idle_event_emitted(void)
|
|||
state_file->CheckModified();
|
||||
}
|
||||
|
||||
#ifdef WIN32
|
||||
|
||||
/**
|
||||
* Handler for GlobalEvents::SHUTDOWN.
|
||||
*/
|
||||
static void
|
||||
shutdown_event_emitted(void)
|
||||
{
|
||||
instance->Shutdown();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef ANDROID
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
|
@ -536,9 +523,6 @@ try {
|
|||
|
||||
GlobalEvents::Initialize(*instance->event_loop);
|
||||
GlobalEvents::Register(GlobalEvents::IDLE, idle_event_emitted);
|
||||
#ifdef WIN32
|
||||
GlobalEvents::Register(GlobalEvents::SHUTDOWN, shutdown_event_emitted);
|
||||
#endif
|
||||
|
||||
if (!ConfigureFS(error)) {
|
||||
LogError(error);
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#ifdef WIN32
|
||||
|
||||
#include "Compiler.h"
|
||||
#include "GlobalEvents.hxx"
|
||||
#include "Instance.hxx"
|
||||
#include "system/FatalError.hxx"
|
||||
|
||||
#include <cstdlib>
|
||||
|
@ -71,7 +71,7 @@ service_dispatcher(gcc_unused DWORD control, gcc_unused DWORD event_type,
|
|||
switch (control) {
|
||||
case SERVICE_CONTROL_SHUTDOWN:
|
||||
case SERVICE_CONTROL_STOP:
|
||||
GlobalEvents::Emit(GlobalEvents::SHUTDOWN);
|
||||
instance->Shutdown();
|
||||
return NO_ERROR;
|
||||
default:
|
||||
return NO_ERROR;
|
||||
|
@ -107,7 +107,7 @@ console_handler(DWORD event)
|
|||
// regardless our thread is still active.
|
||||
// If this did not happen within 3 seconds
|
||||
// let's shutdown anyway.
|
||||
GlobalEvents::Emit(GlobalEvents::SHUTDOWN);
|
||||
instance->Shutdown();
|
||||
// Under debugger it's better to wait indefinitely
|
||||
// to allow debugging of shutdown code.
|
||||
Sleep(IsDebuggerPresent() ? INFINITE : 3000);
|
||||
|
|
Loading…
Reference in New Issue