* Transmit keyboard events from the arrow and enter key to the main controller, so...

* This doesn't conflict with dvd menu navigation.
* If these keys are set to an action that is handled by Cocoa, this action will have priority.

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 72ababd32fc089aac149e981aa17e978282ce565..ed0a5c4b9b29dd5208f690f0b07f0f3fb9378011 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -714,6 +714,13 @@ static VLCMain *_o_sharedMainInstance = nil;
         case NSDeleteCharFunctionKey:
         case NSBackspaceCharacter:
             return YES;
+        case NSUpArrowFunctionKey:
+        case NSDownArrowFunctionKey:
+        case NSRightArrowFunctionKey:
+        case NSLeftArrowFunctionKey:
+        case NSEnterCharacter:
+        case NSCarriageReturnCharacter:
+            return NO;
     }
 
     val.i_int |= CocoaKeyToVLC( key );

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index 0e17edf68e6ad07219c21ca11aeb727f036b47d2..1a35ef0245011187c95dd54ba7a4825561f1b02f 100644 (file)
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -78,6 +78,12 @@
             [[self delegate] deleteItem:self];
             break;
 
+        case NSEnterCharacter:
+        case NSCarriageReturnCharacter:
+            [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist]
+                                                            playItem:self];
+            break;
+
         default:
             [super keyDown: o_event];
             break;