diff options
| author | Memphiz <memphis@machzwo.de> | 2016-07-09 21:51:45 +0200 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2016-08-13 10:42:37 +0200 |
| commit | c73759dc5584d4622cf2324ce0689359d1bbaf17 (patch) | |
| tree | f994cebeeee5fa2bb09dcfcb4038d0c5b0abbb94 /tools/EventClients/Clients | |
| parent | fbadb29dc42d1cb4d723eececbe9e74731681402 (diff) | |
[XBMCHelper] - cosmetics/codestyle
Diffstat (limited to 'tools/EventClients/Clients')
| -rw-r--r-- | tools/EventClients/Clients/OSXRemote/xbmcclientwrapper.mm | 29 | ||||
| -rw-r--r-- | tools/EventClients/Clients/OSXRemote/xbmchelper_main.mm | 16 |
2 files changed, 30 insertions, 15 deletions
diff --git a/tools/EventClients/Clients/OSXRemote/xbmcclientwrapper.mm b/tools/EventClients/Clients/OSXRemote/xbmcclientwrapper.mm index fe9b05af40..49980635e0 100644 --- a/tools/EventClients/Clients/OSXRemote/xbmcclientwrapper.mm +++ b/tools/EventClients/Clients/OSXRemote/xbmcclientwrapper.mm @@ -147,18 +147,29 @@ void XBMCClientWrapperImpl::restartTimer(){ CFRunLoopAddTimer(CFRunLoopGetCurrent(), m_timer, kCFRunLoopCommonModes); } -XBMCClientWrapperImpl::XBMCClientWrapperImpl(eRemoteMode f_mode, const std::string& fcr_address, int f_port, bool f_verbose_mode): -m_mode(f_mode), m_address(fcr_address), m_port(f_port), m_timer(0), m_sequence_timeout(0.5), m_device_id(150), m_verbose_mode(f_verbose_mode){ - if(m_mode == MULTIREMOTE_MODE){ - if(m_verbose_mode) - NSLog(@"XBMCClientWrapperImpl started in multiremote mode sending to address %s, port %i", fcr_address.c_str(), f_port); - populateMultiRemoteModeMap(); - } else { - if(m_mode == UNIVERSAL_MODE){ +XBMCClientWrapperImpl::XBMCClientWrapperImpl(eRemoteMode f_mode, const std::string& fcr_address, int f_port, bool f_verbose_mode): + m_mode(f_mode), + m_address(fcr_address), + m_port(f_port), + m_timer(0), + m_sequence_timeout(0.5), + m_device_id(150), + m_verbose_mode(f_verbose_mode) + { + if(m_mode == MULTIREMOTE_MODE){ + if(m_verbose_mode) + NSLog(@"XBMCClientWrapperImpl started in multiremote mode sending to address %s, port %i", fcr_address.c_str(), f_port); + populateMultiRemoteModeMap(); + } + else + { + if(m_mode == UNIVERSAL_MODE) + { if(m_verbose_mode) NSLog(@"XBMCClientWrapperImpl started in universal mode sending to address %s, port %i", fcr_address.c_str(), f_port); populateSequenceMap(); - } else if(m_verbose_mode) + } + else if(m_verbose_mode) NSLog(@"XBMCClientWrapperImpl started in normal mode sending to address %s, port %i", fcr_address.c_str(), f_port); populateEventMap(); } diff --git a/tools/EventClients/Clients/OSXRemote/xbmchelper_main.mm b/tools/EventClients/Clients/OSXRemote/xbmchelper_main.mm index bedcfda45a..8a105b5137 100644 --- a/tools/EventClients/Clients/OSXRemote/xbmchelper_main.mm +++ b/tools/EventClients/Clients/OSXRemote/xbmchelper_main.mm @@ -184,13 +184,17 @@ void ConfigureHelper(){ //---------------------------------------------------------------------------- void Reconfigure(int nSignal) { - if (nSignal == SIGHUP){ + NSLog(@"received signal %i", nSignal); + + if (nSignal == SIGHUP) + { ReadConfig(); - ConfigureHelper(); - } - else { - QuitEventLoop(GetMainEventLoop()); - } + ConfigureHelper(); + } + else + { + QuitEventLoop(GetMainEventLoop()); + } } //---------------------------------------------------------------------------- |