#i124201# mark debug-infos from the apple_remote module appropriately

to make the source of some log messages more clear

6 files changed, 39 insertions, 37 deletions

diff --git a/apple_remote/AppleRemote.m b/apple_remote/AppleRemote.m
index 85d9017d62a0..44369f775990 100644
--- a/apple_remote/AppleRemote.m
+++ b/apple_remote/AppleRemote.m
@@ -59,7 +59,7 @@ const char* AppleRemoteDeviceName = "AppleIRController";
 	if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) 
     {
         #ifdef DEBUG
-            NSLog( @"setting 10.4 cookies" );
+            NSLog( @"Apple Remote: setting 10.4 cookies" );
         #endif
 
 		// 10.4.x Tiger
@@ -78,7 +78,7 @@ const char* AppleRemoteDeviceName = "AppleIRController";
     else if( floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_5 )
     {
         #ifdef DEBUG
-            NSLog( @"setting 10.5 cookies" );
+            NSLog( @"Apple Remote: setting 10.5 cookies" );
         #endif
 		// 10.5.x Leopard
 		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"31_29_28_19_18_"];
@@ -96,7 +96,7 @@ const char* AppleRemoteDeviceName = "AppleIRController";
     else
     {
         #ifdef DEBUG
-            NSLog( @"setting 10.6 cookies" );
+            NSLog( @"Apple Remote: setting OSX>=10.6 cookies" );
         #endif
         // 10.6.x Snow Leopard
         [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"33_31_30_21_20_2_"];
diff --git a/apple_remote/GlobalKeyboardDevice.m b/apple_remote/GlobalKeyboardDevice.m
index 14bf558a0511..9cc4739d85b0 100644
--- a/apple_remote/GlobalKeyboardDevice.m
+++ b/apple_remote/GlobalKeyboardDevice.m
@@ -111,7 +111,7 @@ static OSStatus hotKeyEventHandler(EventHandlerCallRef, EventRef, void*);
 			break;			
 		default: 
 #ifdef DEBUG
-			NSLog(@"Unknown global keyboard defaults key for remote button identifier %d", remoteButtonIdentifier);
+			NSLog( @"Apple Remote: Unknown global keyboard defaults key for button identifier %d", remoteButtonIdentifier);
 #endif
             break;
 	}
diff --git a/apple_remote/HIDRemoteControlDevice.m b/apple_remote/HIDRemoteControlDevice.m
index 9b52f4765bd7..f6bc848f720f 100644
--- a/apple_remote/HIDRemoteControlDevice.m
+++ b/apple_remote/HIDRemoteControlDevice.m
@@ -274,7 +274,7 @@ cleanup:
 	/*
 	if (previousRemainingCookieString) {
 		cookieString = [previousRemainingCookieString stringByAppendingString: cookieString];
-		NSLog(@"New cookie string is %@", cookieString);
+		NSLog( @"Apple Remote: New cookie string is %@", cookieString);
 		[previousRemainingCookieString release], previousRemainingCookieString=nil;							
 	}*/
 	if (cookieString == nil || [cookieString length] == 0) return;
@@ -310,7 +310,7 @@ cleanup:
 		[self handleEventWithCookieString: lastSubCookieString sumOfValues:0];
 	    }
 	    if ([cookieString length] > 0) {
-		NSLog(@"Unknown button for cookiestring %@", cookieString);
+		NSLog( @"Apple Remote: Unknown button for cookiestring %@", cookieString);
 	    }		
 	}
 }
@@ -331,7 +331,7 @@ Will be called for any event of any type (cookie) to which we subscribe
 */
 static void QueueCallbackFunction(void* target,  IOReturn result, void* refcon, void* sender) {	
 	if (target < 0) {
-		NSLog(@"QueueCallbackFunction called with invalid target!");
+		NSLog( @"Apple Remote: QueueCallbackFunction called with invalid target!");
 		return;
 	}
 	NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -373,7 +373,7 @@ static void QueueCallbackFunction(void* target,  IOReturn result, void* refcon,
 	ioReturnValue = IOObjectGetClass(hidDevice, className);
 	
 	if (ioReturnValue != kIOReturnSuccess) {
-		NSLog(@"Error: Failed to get class name.");
+		NSLog( @"Apple Remote: Error: Failed to get RemoteControlDevice class name.");
 		return NULL;
 	}
 	
@@ -388,7 +388,7 @@ static void QueueCallbackFunction(void* target,  IOReturn result, void* refcon,
 		plugInResult = (*plugInInterface)->QueryInterface(plugInInterface, CFUUIDGetUUIDBytes(kIOHIDDeviceInterfaceID), (LPVOID) &hidDeviceInterface);
 		
 		if (plugInResult != S_OK) {
-			NSLog(@"Error: Couldn't create HID class device interface");
+			NSLog( @"Apple Remote: Error: Couldn't create HID class device interface");
 		}
 		// Release
 		if (plugInInterface) (*plugInInterface)->Release(plugInInterface);
@@ -481,13 +481,13 @@ static void QueueCallbackFunction(void* target,  IOReturn result, void* refcon,
 					(*queue)->start(queue);	
 					return YES;
 				} else {
-					NSLog(@"Error when setting event callback");
+					NSLog( @"Apple Remote: Error when setting event callback");
 				}
 			} else {
-				NSLog(@"Error when creating async event source");
+				NSLog( @"Apple Remote: Error when creating async event source");
 			}
 		} else {
-			NSLog(@"Error when opening device");
+			NSLog( @"Apple Remote: Error when opening device");
 		}
 	} else if (ioReturnValue == kIOReturnExclusiveAccess) {
 		// the device is used exclusive by another application
diff --git a/apple_remote/RemoteControl.m b/apple_remote/RemoteControl.m
index b74decbcffcc..02275ed7e509 100644
--- a/apple_remote/RemoteControl.m
+++ b/apple_remote/RemoteControl.m
@@ -51,7 +51,7 @@ NSString* kTargetApplicationIdentifier = @"TargetBundleIdentifier";
 	if ( (self = [super init]) ) {
 		delegate = [_remoteControlDelegate retain];
 #ifdef DEBUG
-        NSLog(@"RemoteControl initWithDelegate ok");
+        NSLog( @"Apple RemoteControl initWithDelegate ok");
 #endif
     }
 	return self;
@@ -64,7 +64,7 @@ NSString* kTargetApplicationIdentifier = @"TargetBundleIdentifier";
 
 - (void) setListeningToRemote: (BOOL) value {
 #ifdef DEBUG
-        NSLog(@"setListeningToRemote ok");
+        NSLog( @"Apple RemoteControl setListeningToRemote ok");
 #endif
 }
 - (BOOL) isListeningToRemote {
@@ -73,12 +73,12 @@ NSString* kTargetApplicationIdentifier = @"TargetBundleIdentifier";
 
 - (void) startListening: (id) sender {
 #ifdef DEBUG
-            NSLog(@"startListening ok");
+            NSLog( @"Apple RemoteControl startListening ok");
 #endif
 }
 - (void) stopListening: (id) sender {
 #ifdef DEBUG
-            NSLog(@"stopListening ok");
+            NSLog( @"Apple RemoteControl stopListening ok");
 #endif
 }
 
@@ -90,7 +90,7 @@ NSString* kTargetApplicationIdentifier = @"TargetBundleIdentifier";
 
 - (BOOL) sendsEventForButtonIdentifier: (RemoteControlEventIdentifier) identifier {
 #ifdef DEBUG
-   NSLog(@"sending event for button identifier \n");
+   NSLog( @"Apple RemoteControl: sending event for button identifier\n");
 #endif
 	return YES;
 }
@@ -105,17 +105,19 @@ NSString* kTargetApplicationIdentifier = @"TargetBundleIdentifier";
                             kTargetApplicationIdentifier /*targetBundleIdentifier -> does not appear, since the peer is nil*/,
                             nil];
 #ifdef DEBUG
+    NSLog( @"Apple Remote: sendDistributedNotification ...");
     // Debug purpose: returns all the existing dictionary keys. 
-    NSString *s;
-    NSEnumerator *e = [userInfo keyEnumerator];
-    while ( (s = [e nextObject]) ) {
-        NSLog(@"key = %@ ",s);
+    NSEnumerator* itKey = [userInfo keyEnumerator];
+    NSEnumerator* itVal = [userInfo objectEnumerator];
+    for(;;) {
+        NSString* sKey = [itKey nextObject];
+        NSString* sVal = [itVal nextObject];
+        if( !sKey && !sVal)
+            break;
+        if( !sKey) sKey = @"nil";
+	if( !sVal) sVal = @"nil";
+        NSLog( @"\tARdict[\"%@\"] = \"%@\"",sKey,sVal);
     }
-    NSEnumerator *f = [userInfo objectEnumerator ];
-    while ( (s = [f nextObject]) ) {
-        NSLog(@"value = %@ ",s);
-    }
-    NSLog(@"sendDistributedNotification ...");
 #endif
 
 	[[NSDistributedNotificationCenter defaultCenter] postNotificationName:notificationName
@@ -127,13 +129,13 @@ NSString* kTargetApplicationIdentifier = @"TargetBundleIdentifier";
 + (void) sendFinishedNotifcationForAppIdentifier: (NSString*) identifier {
     [self sendDistributedNotification:FINISHED_USING_REMOTE_CONTROL_NOTIFICATION targetBundleIdentifier:identifier];
 #ifdef DEBUG
-    NSLog(@"sendFinishedNotifcationForAppIdentifier ...");
+    NSLog( @"Apple RemoteControl: sendFinishedNotifcationForAppIdentifier ...");
 #endif
 }
 + (void) sendRequestForRemoteControlNotification {
     [self sendDistributedNotification:REQUEST_FOR_REMOTE_CONTROL_NOTIFCATION targetBundleIdentifier:nil];
 #ifdef DEBUG
-    NSLog(@"sendRequestForRemoteControlNotification ...");
+    NSLog( @"Apple RemoteControl: sendRequestForRemoteControlNotification ...");
 #endif
 }
 
diff --git a/apple_remote/RemoteControlContainer.m b/apple_remote/RemoteControlContainer.m
index 40a222f2d829..e4247618c955 100644
--- a/apple_remote/RemoteControlContainer.m
+++ b/apple_remote/RemoteControlContainer.m
@@ -36,10 +36,10 @@
 	if ( (self = [super initWithDelegate:_remoteControlDelegate]) ) {
 		remoteControls = [[NSMutableArray alloc] init];
 #ifdef DEBUG
-        NSLog(@"RemoteControlContainer initWithDelegate ok");
+        NSLog( @"Apple Remote: ControlContainer initWithDelegate ok");
 	}
     else {
-        NSLog(@"RemoteControlContainer initWithDelegate failed");
+        NSLog( @"Apple Remote: RemoteControlContainer initWithDelegate failed");
 #endif
     }
 
@@ -62,7 +62,7 @@
     }
 #ifdef DEBUG
     else {
-        NSLog(@"RemoteControlContainer instantiateAndAddRemoteControlDeviceWithClass failed");
+        NSLog( @"Apple Remote: ControlContainer instantiateAndAddRemoteControlDeviceWithClass failed");
         toReturn = NO;	
     }
 #endif
@@ -78,7 +78,7 @@
 	[self didChangeValueForKey:@"listeningToRemote"];
 #ifdef DEBUG
 	// debug purpose
-    NSLog(@"reset... (after listening to remote)");
+    NSLog( @"Apple Remote: reset... (after listening)");
 #endif
 }
 
@@ -105,7 +105,7 @@
 
 - (void) startListening: (id) sender {
 #ifdef DEBUG
-	NSLog(@"startListening to events... ");
+	NSLog(@"Apple Remote: start listening to events... ");
 #endif
 	int i;
 	for(i=0; i < [remoteControls count]; i++) {
@@ -114,7 +114,7 @@
 }
 - (void) stopListening: (id) sender {
 #ifdef DEBUG
-	NSLog(@"stopListening to events... ");
+	NSLog(@"Apple Remote: stopListening to events... ");
 #endif
 	int i;
 	for(i=0; i < [remoteControls count]; i++) {
diff --git a/apple_remote/RemoteMainController.m b/apple_remote/RemoteMainController.m
index 2f3687760820..2896b3d4dbd0 100644
--- a/apple_remote/RemoteMainController.m
+++ b/apple_remote/RemoteMainController.m
@@ -105,7 +105,7 @@
 #endif
     if (pressedDown)
     {
-        pressed = @"(pressed)";
+        pressed = @"(AppleRemoteMainController: button pressed)";
 
 #ifdef DEBUG
         switch(buttonIdentifier) 
@@ -124,14 +124,14 @@
             case kRemoteButtonMenu_Hold:    buttonName = @"Menu (long)";            break;  // MEDIA_COMMAND_MENU_HOLD
             case kRemoteControl_Switched:   buttonName = @"Remote Control Switched";break;
 
-            default:    NSLog(@"Unmapped event for button %d", buttonIdentifier);   break;
+            default:    NSLog( @"AppleRemoteMainController: Unmapped event for button %d", buttonIdentifier);   break;
         }
 #endif
         [ self postTheEvent:buttonIdentifier modifierFlags: 0 ];
     }
     else // not pressed
     {
-        pressed = @"(released)";
+        pressed = @"(AppleRemoteMainController: button released)";
     }
 
 #ifdef DEBUG