[OSX] cosmetics: removed log spew in XBMCHelper; don't start Remote on --help

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@24030 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

3 files changed, 6 insertions, 12 deletions

diff --git a/tools/EventClients/Clients/OSXRemote/XBMCHelper.m b/tools/EventClients/Clients/OSXRemote/XBMCHelper.m
index 61c94721ae..bba3b4b285 100644
--- a/tools/EventClients/Clients/OSXRemote/XBMCHelper.m
+++ b/tools/EventClients/Clients/OSXRemote/XBMCHelper.m
@@ -20,7 +20,6 @@
 
 @implementation XBMCHelper
 - (id) init{
-  PRINT_SIGNATURE();
   if( (self = [super init]) ){
     if ((remote = [HIDRemote sharedHIDRemote]))
     {
@@ -68,7 +67,6 @@
 
 //----------------------------------------------------------------------------
 - (void) dealloc{
-  PRINT_SIGNATURE();
   [remote stopRemoteControl];
   if( [remote delegate] == self)
     [remote setDelegate:nil];
diff --git a/tools/EventClients/Clients/OSXRemote/xbmcclientwrapper.mm b/tools/EventClients/Clients/OSXRemote/xbmcclientwrapper.mm
index 290664b133..42369e516b 100644
--- a/tools/EventClients/Clients/OSXRemote/xbmcclientwrapper.mm
+++ b/tools/EventClients/Clients/OSXRemote/xbmcclientwrapper.mm
@@ -148,9 +148,7 @@ void XBMCClientWrapperImpl::restartTimer(){
 }
 
 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){
-	PRINT_SIGNATURE();
-	
+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);
@@ -183,7 +181,6 @@ namespace {
  };
 }
 XBMCClientWrapperImpl::~XBMCClientWrapperImpl(){
-	PRINT_SIGNATURE();
   resetTimer();
   shutdown(m_socket, SHUT_RDWR);
   std::for_each(m_event_map.begin(), m_event_map.end(), delete_second());
@@ -400,7 +397,6 @@ void XBMCClientWrapperImpl::populateMultiRemoteModeMap(){
   return [self initWithMode:DEFAULT_MODE serverAddress:@"localhost" port:9777 verbose: false];
 }
 - (id) initWithMode:(eRemoteMode) f_mode serverAddress:(NSString*) fp_server port:(int) f_port verbose:(bool) f_verbose{
-	PRINT_SIGNATURE();
 	if( ![super init] )
 		return nil; 
 	mp_impl = new XBMCClientWrapperImpl(f_mode, [fp_server UTF8String], f_port, f_verbose);
@@ -412,7 +408,6 @@ void XBMCClientWrapperImpl::populateMultiRemoteModeMap(){
 }
 
 - (void)dealloc{
-	PRINT_SIGNATURE();
   delete mp_impl;
 	[super dealloc];
 }
diff --git a/tools/EventClients/Clients/OSXRemote/xbmchelper_main.mm b/tools/EventClients/Clients/OSXRemote/xbmchelper_main.mm
index 55699821d7..5db7658cf8 100644
--- a/tools/EventClients/Clients/OSXRemote/xbmchelper_main.mm
+++ b/tools/EventClients/Clients/OSXRemote/xbmchelper_main.mm
@@ -170,7 +170,7 @@ void ParseOptions(int argc, char** argv)
 }
 
 //----------------------------------------------------------------------------
-void StartHelper(){
+void ConfigureHelper(){
   [gp_xbmchelper enableVerboseMode:g_verbose_mode];
   
   //set apppath to startup when pressing Menu
@@ -186,7 +186,7 @@ void Reconfigure(int nSignal)
 {
 	if (nSignal == SIGHUP){
 		ReadConfig();
-    StartHelper();
+    ConfigureHelper();
   }
 	else {
     QuitEventLoop(GetMainEventLoop());
@@ -197,6 +197,8 @@ void Reconfigure(int nSignal)
 int main (int argc,  char * argv[]) {
   NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
   
+  ParseOptions(argc,argv);
+
   NSLog(@"%s %s starting up...", PROGNAME, PROGVERS);
   gp_xbmchelper = [[XBMCHelper alloc] init];  
   if(gp_xbmchelper){
@@ -204,8 +206,7 @@ int main (int argc,  char * argv[]) {
     signal(SIGINT, Reconfigure);
     signal(SIGTERM, Reconfigure);
     
-    ParseOptions(argc,argv);
-    StartHelper();
+    ConfigureHelper();
     
     //run event loop in this thread
     RunCurrentEventLoop(kEventDurationForever);