VlcMacHowto: vlc-macosx.patch

Makefile

@@ -628 +628 @@
 #noinst_DATA = vlc-bundle
 
 # Create the MacOS X app
-vlc_app_DATA = VLC.app
 vlc_appdir = $(bindir)
 #DATA_win32_rc = $(noinst_share_vlc_win32_rc_DATA)
 #noinst_share_vlc_win32_rc_DATA = share/vlc_win32_rc.$(OBJEXT)

po/Makefile

@@ -26 +26 @@
 
 INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKINSTALLDIRS = autotools/mkinstalldirs
 mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
 
 GMSGFMT = /Users/jandavidmol/svn/vlc-trunk/./extras/contrib/bin/msgfmt

vlc-config

@@ -20 +20 @@
 objcflags=""
 ldflags=""
 
-cflags_tuning="-march=pentium-m -mtune=prescott"
+cflags_tuning=""
 cflags_optim=" -O3 -ffast-math -funroll-loops"
 cflags_optim_nodebug=" -fomit-frame-pointer"
 cflags_nooptim=" -O2"
@@ -822 +822 @@
       ;;
     external)
       echo_external=yes
-      ldflags="${ldflags} -lvlc -lvlc-control"
+      ldflags="${ldflags} -lvlc"
       ;;      
     *)
       module="$1"

modules/gui/macosx/voutgl.m

@@ -43 +43 @@
 #include <OpenGL/gl.h>
 
 #include <AGL/agl.h>
+#include <Carbon/Carbon.h>
 
 /*****************************************************************************
  * VLCGLView interface
@@ -68 +69 @@
     vlc_bool_t          b_embedded;
     AGLContext          agl_ctx;
     AGLDrawable         agl_drawable;
+    ControlRef          theControl;
     int                 i_offx, i_offy;
     int                 i_width, i_height;
     WindowRef           theWindow;
     WindowGroupRef      winGroup;
     vlc_bool_t          b_clipped_out;
+    vlc_bool_t          b_viewport_set;
     Rect                clipBounds, viewBounds;             
 };
 
@@ -470 +473 @@
     Rect clipBounds;
     
     var_Get( p_vout->p_libvlc, "drawable", &val );
-    p_vout->p_sys->agl_drawable = (AGLDrawable)val.i_int;
+    p_vout->p_sys->theControl = val.i_int;
+    p_vout->p_sys->agl_drawable = (AGLDrawable)GetWindowPort(GetControlOwner(val.i_int));
     aglSetDrawable(p_vout->p_sys->agl_ctx, p_vout->p_sys->agl_drawable);
 
     var_Get( p_vout->p_libvlc, "drawable-view-top", &val );
@@ -492 +496 @@
 
     p_vout->p_sys->b_clipped_out = (clipBounds.top == clipBounds.bottom)
                                  || (clipBounds.left == clipBounds.right);
-    if( ! p_vout->p_sys->b_clipped_out )
+    p_vout->p_sys->b_viewport_set = viewBounds.top || viewBounds.bottom
+                                 || viewBounds.left || viewBounds.right;
+    if( !p_vout->p_sys->b_clipped_out  && p_vout->p_sys->b_viewport_set )
     {
         aglLock(p_vout);
         aglSetViewport(p_vout, viewBounds, clipBounds);
@@ -590 +596 @@
             Rect clipBounds;
 
             var_Get( p_vout->p_libvlc, "drawable", &val );
-            p_vout->p_sys->agl_drawable = (AGLDrawable)val.i_int;
+            p_vout->p_sys->theControl = val.i_int;
+            p_vout->p_sys->agl_drawable = (AGLDrawable)GetWindowPort(GetControlOwner(val.i_int));
             aglSetDrawable(p_vout->p_sys->agl_ctx, p_vout->p_sys->agl_drawable);
 
             var_Get( p_vout->p_libvlc, "drawable-view-top", &val );
@@ -714 +721 @@
 
                 p_vout->p_sys->b_clipped_out = (clipBounds.top == clipBounds.bottom)
                                              || (clipBounds.left == clipBounds.right);
-                if( ! p_vout->p_sys->b_clipped_out )
+                p_vout->p_sys->b_viewport_set = viewBounds.top || viewBounds.bottom
+                                             || viewBounds.left || viewBounds.right;
+                if( !p_vout->p_sys->b_clipped_out )
                 {
                     /* ignore consecutive viewport update with identical parameters */
                     if( memcmp(&clipBounds, &(p_vout->p_sys->clipBounds), sizeof(clipBounds) )
@@ -769 +778 @@
 
 static void aglSwap( vout_thread_t * p_vout )
 {
-    if( ! p_vout->p_sys->b_clipped_out )
+    if( !p_vout->p_sys->b_clipped_out || !p_vout->p_sys->b_viewport_set )
     {
         p_vout->p_sys->b_got_frame = VLC_TRUE;
         aglSwapBuffers(p_vout->p_sys->agl_ctx);
+
+        if( !p_vout->p_sys->b_viewport_set ) {
+            WindowRef win;
+            Rect rect,clipBounds,viewBounds;
+
+            /* invalidate window data to force redraw */
+            win = GetWindowFromPort( p_vout->p_sys->agl_drawable );
+            //GetWindowPortBounds( win, &rect );
+            GetControlBounds( p_vout->p_sys->theControl, &rect );
+            InvalWindowRect( win, &rect );
+
+            /* check for resizing -- ugly hack to do this in aglSwap, i.e. every frame */
+            clipBounds = viewBounds = rect;
+
+            /* ignore consecutive viewport update with identical parameters */
+            if( memcmp(&clipBounds, &(p_vout->p_sys->clipBounds), sizeof(clipBounds) )
+             && memcmp(&viewBounds, &(p_vout->p_sys->viewBounds), sizeof(viewBounds)) )
+            {
+                /* set first to avoid infinite recursion */
+                p_vout->p_sys->clipBounds = clipBounds;
+                p_vout->p_sys->viewBounds = viewBounds;
+
+                aglSetViewport(p_vout, viewBounds, clipBounds);
+                aglReshape( p_vout );
+            }
+        }
     }
     else
     {