- voutgl.m: added OpenGL provider for MacOS X Safari/mozilla plugin

- vlcshell.cpp: make opengl the default video output module for macosx
- vlc.r: remove Quicktime mimetype from supported list
- configure.ac: the OpenGL provider requires the AGL framework

configure.ac

@@ -4752,11 +4752,11 @@ AC_ARG_ENABLE(macosx,
   [if test "${enable_macosx}" = "yes"
    then
      VLC_ADD_BUILTINS([macosx])
-     VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL])
+     VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL])
    fi],
   [AC_CHECK_HEADERS(Cocoa/Cocoa.h,
      VLC_ADD_BUILTINS([macosx])
-     VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL])
+     VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL])
    )])
 CFLAGS=$ORIGCFLAGS
 

mozilla/vlc.r

@@ -13,7 +13,7 @@ data 'carb' (0)
 resource 'STR#' (126)
 {
     {
-        "Version 0.8.5, Copyright 2006, The VideoLAN Team"
+        "Version 0.8.6, Copyright 2006, The VideoLAN Team"
         "<BR><A HREF='http://www.videolan.org'>http://www.videolan.org</A>",
         "VLC Multimedia Plugin"
     };
@@ -34,7 +34,7 @@ resource 'STR#' (127)
         "MPEG-4 video",
         "MPEG-4 video",
         "AVI video",
-        "QuickTime video",
+/*        "QuickTime video", */
         "Ogg stream",
         "Ogg stream",
         "VLC plugin",
@@ -63,7 +63,7 @@ resource 'STR#' (128,"MIME Type")
         "application/mpeg4-iod", "mp4,mpg4",
         "application/mpeg4-muxcodetable", "mp4,mpg4",
         "video/x-msvideo", "avi",
-        "video/quicktime", "mov, qt",
+/*        "video/quicktime", "mov, qt", */
         "application/ogg", "ogg",
         "application/x-ogg", "ogg",
         "application/x-vlc-plugin", "vlc",

mozilla/vlcshell.cpp

@@ -82,7 +82,7 @@ static void Resize( Widget w, XtPointer closure, XEvent *event );
  * MacOS-only declarations
 ******************************************************************************/
 #ifdef XP_MACOSX
-#   define VOUT_PLUGINS "macosx,dummy"
+#   define VOUT_PLUGINS "opengl,macosx,dummy"
 #   define AOUT_PLUGINS "auhal,macosx,dummy"
 
 #endif
@@ -204,17 +204,13 @@ int16 NPP_HandleEvent( NPP instance, void * event )
         case updateEvt:
         {
             NPWindow *npwindow = p_plugin->window;
-            NP_Port *npport = (NP_Port *)(npwindow->window);
-
-            SetPort( npport->port );
-            //SetOrigin( npport->portx , npport->porty);
 
             /* draw the beautiful "No Picture" */
 
             ForeColor(blackColor);
             PenMode( patCopy );
 
-	    Rect rect;
+            Rect rect;
             rect.left = 0;
             rect.top = 0;
             rect.right = npwindow->width;
@@ -236,8 +232,12 @@ int16 NPP_HandleEvent( NPP instance, void * event )
             return true;
         case NPEventType_AdjustCursorEvent:
             return false;
-	case NPEventType_ScrollingBeginsEvent:
-	case NPEventType_ScrollingEndsEvent:
+        case NPEventType_MenuCommandEvent:
+            return false;
+        case NPEventType_ClippingChangedEvent:
+            return false;
+        case NPEventType_ScrollingBeginsEvent:
+        case NPEventType_ScrollingEndsEvent:
             return true;
         default:
             ;