changeset 27992:0923262b0ebc

cosmetics (svn diff --diff-cmd diff -x '-duwbBE' gives no differences) replace tabs by 4 spaces. prettier intentation.
author gpoirier
date Mon, 24 Nov 2008 14:29:32 +0000
parents 0a0ea17f7f64
children 8a2cee973272
files libvo/vo_quartz.c
diffstat 1 files changed, 1071 insertions(+), 1068 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_quartz.c	Mon Nov 24 14:25:14 2008 +0000
+++ b/libvo/vo_quartz.c	Mon Nov 24 14:29:32 2008 +0000
@@ -38,10 +38,10 @@
 
 static const vo_info_t info =
 {
-	"Mac OSX (Quartz)",
-	"quartz",
-	"Nicolas Plourde <nicolasplourde@hotmail.com>, Romain Dolbeau <romain@dolbeau.org>",
-	""
+    "Mac OSX (Quartz)",
+    "quartz",
+    "Nicolas Plourde <nicolasplourde@hotmail.com>, Romain Dolbeau <romain@dolbeau.org>",
+    ""
 };
 
 const LIBVO_EXTERN(quartz)
@@ -57,11 +57,11 @@
 static PlanarPixmapInfoYUV420 *P = NULL;
 static struct
 {
-	ImageDescriptionHandle desc;
-	Handle extension_colr;
-	Handle extension_fiel;
-	Handle extension_clap;
-	Handle extension_pasp;
+    ImageDescriptionHandle desc;
+    Handle extension_colr;
+    Handle extension_fiel;
+    Handle extension_clap;
+    Handle extension_pasp;
 } yuv_qt_stuff;
 static MatrixRecord matrix;
 static int EnterMoviesDone = 0;
@@ -86,8 +86,8 @@
 
 static int device_id = 0;
 
-static short fs_res_x=0;
-static short fs_res_y=0;
+static short fs_res_x = 0;
+static short fs_res_y = 0;
 
 static WindowRef theWindow = NULL;
 static WindowGroupRef winGroup = NULL;
@@ -98,11 +98,11 @@
 static CGDataProviderRef dataProviderRef = NULL;
 static CGImageRef image = NULL;
 
-static Rect imgRect; // size of the original image (unscaled)
-static Rect dstRect; // size of the displayed image (after scaling)
-static Rect winRect; // size of the window containg the displayed image (include padding)
-static Rect oldWinRect; // size of the window containg the displayed image (include padding) when NOT in FS mode
-static CGRect displayRect; // size of the display device
+static Rect imgRect;            // size of the original image (unscaled)
+static Rect dstRect;            // size of the displayed image (after scaling)
+static Rect winRect;            // size of the window containg the displayed image (include padding)
+static Rect oldWinRect;         // size of the window containg the displayed image (include padding) when NOT in FS mode
+static CGRect displayRect;      // size of the display device
 static Rect oldWinBounds;
 
 static MenuRef windMenu;
@@ -114,21 +114,21 @@
 
 enum
 {
-	kQuitCmd			= 1,
-	kHalfScreenCmd		= 2,
-	kNormalScreenCmd	= 3,
-	kDoubleScreenCmd	= 4,
-	kFullScreenCmd		= 5,
-	kKeepAspectCmd		= 6,
-	kAspectOrgCmd		= 7,
-	kAspectFullCmd		= 8,
-	kAspectWideCmd		= 9,
-	kPanScanCmd		= 10
+    kQuitCmd         = 1,
+    kHalfScreenCmd   = 2,
+    kNormalScreenCmd = 3,
+    kDoubleScreenCmd = 4,
+    kFullScreenCmd   = 5,
+    kKeepAspectCmd   = 6,
+    kAspectOrgCmd    = 7,
+    kAspectFullCmd   = 8,
+    kAspectWideCmd   = 9,
+    kPanScanCmd      = 10
 };
 
 #include "osdep/keycodes.h"
 
-extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
+extern void vo_draw_text(int dxs, int dys, void (*draw_alpha) (int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride));
 
 //PROTOTYPE/////////////////////////////////////////////////////////////////
 static OSStatus KeyEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData);
@@ -141,118 +141,119 @@
 
 static inline int convert_key(UInt32 key, UInt32 charcode)
 {
-	switch(key)
+    switch (key)
     {
-		case QZ_IBOOK_ENTER:
-		case QZ_RETURN: return KEY_ENTER;
-		case QZ_ESCAPE: return KEY_ESC;
-		case QZ_BACKSPACE: return KEY_BACKSPACE;
-		case QZ_LALT: return KEY_BACKSPACE;
-		case QZ_LCTRL: return KEY_BACKSPACE;
-		case QZ_LSHIFT: return KEY_BACKSPACE;
-		case QZ_F1: return KEY_F+1;
-		case QZ_F2: return KEY_F+2;
-		case QZ_F3: return KEY_F+3;
-		case QZ_F4: return KEY_F+4;
-		case QZ_F5: return KEY_F+5;
-		case QZ_F6: return KEY_F+6;
-		case QZ_F7: return KEY_F+7;
-		case QZ_F8: return KEY_F+8;
-		case QZ_F9: return KEY_F+9;
-		case QZ_F10: return KEY_F+10;
-		case QZ_F11: return KEY_F+11;
-		case QZ_F12: return KEY_F+12;
-		case QZ_INSERT: return KEY_INSERT;
-		case QZ_DELETE: return KEY_DELETE;
-		case QZ_HOME: return KEY_HOME;
-		case QZ_END: return KEY_END;
-		case QZ_KP_PLUS: return '+';
-		case QZ_KP_MINUS: return '-';
-		case QZ_TAB: return KEY_TAB;
-		case QZ_PAGEUP: return KEY_PAGE_UP;
-		case QZ_PAGEDOWN: return KEY_PAGE_DOWN;
-		case QZ_UP: return KEY_UP;
-		case QZ_DOWN: return KEY_DOWN;
-		case QZ_LEFT: return KEY_LEFT;
-		case QZ_RIGHT: return KEY_RIGHT;
-		case QZ_KP_MULTIPLY: return '*';
-		case QZ_KP_DIVIDE: return '/';
-		case QZ_KP_ENTER: return KEY_KPENTER;
-		case QZ_KP_PERIOD: return KEY_KPDEC;
-		case QZ_KP0: return KEY_KP0;
-		case QZ_KP1: return KEY_KP1;
-		case QZ_KP2: return KEY_KP2;
-		case QZ_KP3: return KEY_KP3;
-		case QZ_KP4: return KEY_KP4;
-		case QZ_KP5: return KEY_KP5;
-		case QZ_KP6: return KEY_KP6;
-		case QZ_KP7: return KEY_KP7;
-		case QZ_KP8: return KEY_KP8;
-		case QZ_KP9: return KEY_KP9;
-		default: return charcode;
+    case QZ_IBOOK_ENTER:
+    case QZ_RETURN:      return KEY_ENTER;
+    case QZ_ESCAPE:      return KEY_ESC;
+    case QZ_BACKSPACE:   return KEY_BACKSPACE;
+    case QZ_LALT:        return KEY_BACKSPACE;
+    case QZ_LCTRL:       return KEY_BACKSPACE;
+    case QZ_LSHIFT:      return KEY_BACKSPACE;
+    case QZ_F1:          return KEY_F + 1;
+    case QZ_F2:          return KEY_F + 2;
+    case QZ_F3:          return KEY_F + 3;
+    case QZ_F4:          return KEY_F + 4;
+    case QZ_F5:          return KEY_F + 5;
+    case QZ_F6:          return KEY_F + 6;
+    case QZ_F7:          return KEY_F + 7;
+    case QZ_F8:          return KEY_F + 8;
+    case QZ_F9:          return KEY_F + 9;
+    case QZ_F10:         return KEY_F + 10;
+    case QZ_F11:         return KEY_F + 11;
+    case QZ_F12:         return KEY_F + 12;
+    case QZ_INSERT:      return KEY_INSERT;
+    case QZ_DELETE:      return KEY_DELETE;
+    case QZ_HOME:        return KEY_HOME;
+    case QZ_END:         return KEY_END;
+    case QZ_KP_PLUS:     return '+';
+    case QZ_KP_MINUS:    return '-';
+    case QZ_TAB:         return KEY_TAB;
+    case QZ_PAGEUP:      return KEY_PAGE_UP;
+    case QZ_PAGEDOWN:    return KEY_PAGE_DOWN;
+    case QZ_UP:          return KEY_UP;
+    case QZ_DOWN:        return KEY_DOWN;
+    case QZ_LEFT:        return KEY_LEFT;
+    case QZ_RIGHT:       return KEY_RIGHT;
+    case QZ_KP_MULTIPLY: return '*';
+    case QZ_KP_DIVIDE:   return '/';
+    case QZ_KP_ENTER:    return KEY_KPENTER;
+    case QZ_KP_PERIOD:   return KEY_KPDEC;
+    case QZ_KP0:         return KEY_KP0;
+    case QZ_KP1:         return KEY_KP1;
+    case QZ_KP2:         return KEY_KP2;
+    case QZ_KP3:         return KEY_KP3;
+    case QZ_KP4:         return KEY_KP4;
+    case QZ_KP5:         return KEY_KP5;
+    case QZ_KP6:         return KEY_KP6;
+    case QZ_KP7:         return KEY_KP7;
+    case QZ_KP8:         return KEY_KP8;
+    case QZ_KP9:         return KEY_KP9;
+    default:             return charcode;
     }
 }
 
 static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride)
 {
-	switch (image_format)
-	{
-		case IMGFMT_RGB32:
-			vo_draw_alpha_rgb32(w,h,src,srca,stride,image_data+4*(y0*imgRect.right+x0),4*imgRect.right);
-			break;
-		case IMGFMT_YV12:
-		case IMGFMT_IYUV:
-		case IMGFMT_I420:
-			vo_draw_alpha_yv12(w,h,src,srca,stride, ((char*)P) + be2me_32(P->componentInfoY.offset) + x0 + y0 * imgRect.right, imgRect.right);
-			break;
-		case IMGFMT_UYVY:
-			vo_draw_alpha_uyvy(w,h,src,srca,stride,((char*)P) + (x0 + y0 * imgRect.right) * 2,imgRect.right*2);
-			break;
-		case IMGFMT_YUY2:
-			vo_draw_alpha_yuy2(w,h,src,srca,stride,((char*)P) + (x0 + y0 * imgRect.right) * 2,imgRect.right*2);
-			break;
-	}
+    switch (image_format)
+    {
+    case IMGFMT_RGB32:
+        vo_draw_alpha_rgb32(w, h, src, srca, stride, image_data + 4 * (y0 * imgRect.right + x0), 4 * imgRect.right);
+        break;
+    case IMGFMT_YV12:
+    case IMGFMT_IYUV:
+    case IMGFMT_I420:
+        vo_draw_alpha_yv12(w, h, src, srca, stride, ((char *)P) + be2me_32(P->componentInfoY.offset) + x0 + y0 * imgRect.right, imgRect.right);
+        break;
+    case IMGFMT_UYVY:
+        vo_draw_alpha_uyvy(w, h, src, srca, stride, ((char *)P) + (x0 + y0 * imgRect.right) * 2, imgRect.right * 2);
+        break;
+    case IMGFMT_YUY2:
+        vo_draw_alpha_yuy2(w, h, src, srca, stride, ((char *)P) + (x0 + y0 * imgRect.right) * 2, imgRect.right * 2);
+        break;
+    }
 }
 
 //default keyboard event handler
 static OSStatus KeyEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData)
 {
     OSStatus result = noErr;
-	UInt32 class = GetEventClass (event);
-	UInt32 kind = GetEventKind (event);
+    UInt32 class = GetEventClass(event);
+    UInt32 kind = GetEventKind(event);
 
-	result = CallNextEventHandler(nextHandler, event);
+    result = CallNextEventHandler(nextHandler, event);
 
-	if(class == kEventClassKeyboard)
-	{
-		char macCharCodes;
-		UInt32 macKeyCode;
-		UInt32 macKeyModifiers;
+    if (class == kEventClassKeyboard)
+    {
+        char macCharCodes;
+        UInt32 macKeyCode;
+        UInt32 macKeyModifiers;
 
-		GetEventParameter(event, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(macCharCodes), NULL, &macCharCodes);
-		GetEventParameter(event, kEventParamKeyCode, typeUInt32, NULL, sizeof(macKeyCode), NULL, &macKeyCode);
-		GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(macKeyModifiers), NULL, &macKeyModifiers);
+        GetEventParameter(event, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(macCharCodes), NULL, &macCharCodes);
+        GetEventParameter(event, kEventParamKeyCode, typeUInt32, NULL, sizeof(macKeyCode), NULL, &macKeyCode);
+        GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(macKeyModifiers), NULL, &macKeyModifiers);
 
-		if(macKeyModifiers != 256)
-		{
-			if (kind == kEventRawKeyRepeat || kind == kEventRawKeyDown)
-			{
-				int key = convert_key(macKeyCode, macCharCodes);
-				if(key != -1)
-					mplayer_put_key(key);
-			}
-		}
-		else if(macKeyModifiers == 256)
-		{
-			switch(macCharCodes)
-			{
-				case '[': SetWindowAlpha(theWindow, winAlpha-=0.05); break;
-				case ']': SetWindowAlpha(theWindow, winAlpha+=0.05); break;
-			}
-		}
-		else
-			result = eventNotHandledErr;
-	}
+        if (macKeyModifiers != 256)
+        {
+            if (kind == kEventRawKeyRepeat || kind == kEventRawKeyDown)
+            {
+                int key = convert_key(macKeyCode, macCharCodes);
+
+                if (key != -1)
+                    mplayer_put_key(key);
+            }
+        }
+        else if (macKeyModifiers == 256)
+        {
+            switch (macCharCodes)
+            {
+            case '[': SetWindowAlpha(theWindow, winAlpha -= 0.05); break;
+            case ']': SetWindowAlpha(theWindow, winAlpha += 0.05); break;
+            }
+        }
+        else
+            result = eventNotHandledErr;
+    }
 
     return result;
 }
@@ -261,127 +262,128 @@
 static OSStatus MouseEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData)
 {
     OSStatus result = noErr;
-	UInt32 class = GetEventClass (event);
-	UInt32 kind = GetEventKind (event);
+    UInt32 class = GetEventClass(event);
+    UInt32 kind = GetEventKind(event);
 
-	result = CallNextEventHandler(nextHandler, event);
+    result = CallNextEventHandler(nextHandler, event);
 
-	if(class == kEventClassMouse)
-	{
-		WindowPtr tmpWin;
-		Point mousePos;
-		Point winMousePos;
+    if (class == kEventClassMouse)
+    {
+        WindowPtr tmpWin;
+        Point mousePos;
+        Point winMousePos;
 
-		GetEventParameter(event, kEventParamMouseLocation, typeQDPoint, 0, sizeof(Point), 0, &mousePos);
-		GetEventParameter(event, kEventParamWindowMouseLocation, typeQDPoint, 0, sizeof(Point), 0, &winMousePos);
+        GetEventParameter(event, kEventParamMouseLocation, typeQDPoint, 0, sizeof(Point), 0, &mousePos);
+        GetEventParameter(event, kEventParamWindowMouseLocation, typeQDPoint, 0, sizeof(Point), 0, &winMousePos);
 
-		switch (kind)
-		{
-			case kEventMouseMoved:
-			{
-				if(vo_quartz_fs)
-				{
-					CGDisplayShowCursor(displayId);
-					mouseHide = FALSE;
-				}
-			}
-			break;
+        switch (kind)
+        {
+        case kEventMouseMoved:
+        {
+            if (vo_quartz_fs)
+            {
+                CGDisplayShowCursor(displayId);
+                mouseHide = FALSE;
+            }
+        }
+            break;
 
-			case kEventMouseWheelMoved:
-			{
-				int wheel;
-				short part;
+        case kEventMouseWheelMoved:
+        {
+            int wheel;
+            short part;
 
-				GetEventParameter(event, kEventParamMouseWheelDelta, typeSInt32, 0, sizeof(int), 0, &wheel);
+            GetEventParameter(event, kEventParamMouseWheelDelta, typeSInt32, 0, sizeof(int), 0, &wheel);
 
-				part = FindWindow(mousePos,&tmpWin);
+            part = FindWindow(mousePos, &tmpWin);
 
-				if(part == inContent)
-				{
-					if(wheel > 0)
-						mplayer_put_key(MOUSE_BTN3);
-					else
-						mplayer_put_key(MOUSE_BTN4);
-				}
-			}
-			break;
+            if (part == inContent)
+            {
+                if (wheel > 0)
+                    mplayer_put_key(MOUSE_BTN3);
+                else
+                    mplayer_put_key(MOUSE_BTN4);
+            }
+        }
+            break;
 
-			case kEventMouseDown:
-			case kEventMouseUp:
-			{
-				EventMouseButton button;
-				short part;
-				Rect bounds;
+        case kEventMouseDown:
+        case kEventMouseUp:
+        {
+            EventMouseButton button;
+            short part;
+            Rect bounds;
 
-				GetWindowPortBounds(theWindow, &bounds);
-				GetEventParameter(event, kEventParamMouseButton, typeMouseButton, 0, sizeof(EventMouseButton), 0, &button);
+            GetWindowPortBounds(theWindow, &bounds);
+            GetEventParameter(event, kEventParamMouseButton, typeMouseButton, 0, sizeof(EventMouseButton), 0, &button);
 
-				part = FindWindow(mousePos,&tmpWin);
-				if(kind == kEventMouseUp)
-				{
-					if (part != inContent)
-						break;
-					switch(button)
-					{
-						case kEventMouseButtonPrimary:
-							mplayer_put_key(MOUSE_BTN0);
-							break;
-						case kEventMouseButtonSecondary:
-							mplayer_put_key(MOUSE_BTN2);
-							break;
-						case kEventMouseButtonTertiary:
-							mplayer_put_key(MOUSE_BTN1);
-							break;
+            part = FindWindow(mousePos, &tmpWin);
+            if (kind == kEventMouseUp)
+            {
+                if (part != inContent)
+                    break;
+                switch (button) 
+                {
+                case kEventMouseButtonPrimary:
+                    mplayer_put_key(MOUSE_BTN0);
+                    break;
+                case kEventMouseButtonSecondary:
+                    mplayer_put_key(MOUSE_BTN2);
+                    break;
+                case kEventMouseButtonTertiary:
+                    mplayer_put_key(MOUSE_BTN1);
+                    break;
 
                 default:
                     result = eventNotHandledErr;
                     break;
-					}
-					break;
-				}
-				if( (winMousePos.h > (bounds.right - 15)) && (winMousePos.v > (bounds.bottom)) )
-				{
-					if(!vo_quartz_fs)
-					{
-						Rect newSize;
-						ResizeWindow(theWindow, mousePos, NULL, &newSize);
-					}
-				}
-				else if(part == inMenuBar)
-				{
-					MenuSelect(mousePos);
-					HiliteMenu(0);
-				}
-				else if(part == inContent)
-				{
-					switch(button)
-					{
-						case kEventMouseButtonPrimary:
-							mplayer_put_key(MOUSE_BTN0 | MP_KEY_DOWN);
-							break;
-						case kEventMouseButtonSecondary:
-							mplayer_put_key(MOUSE_BTN2 | MP_KEY_DOWN);
-							break;
-						case kEventMouseButtonTertiary:
-							mplayer_put_key(MOUSE_BTN1 | MP_KEY_DOWN);
-							break;
+                }
+                break;
+            }
+            if ((winMousePos.h > (bounds.right - 15)) && (winMousePos.v > (bounds.bottom)))
+            {
+                if (!vo_quartz_fs)
+                {
+                    Rect newSize;
+
+                    ResizeWindow(theWindow, mousePos, NULL, &newSize);
+                }
+            }
+            else if (part == inMenuBar)
+            {
+                MenuSelect(mousePos);
+                HiliteMenu(0);
+            }
+            else if (part == inContent)
+            {
+                switch (button)
+                {
+                case kEventMouseButtonPrimary:
+                    mplayer_put_key(MOUSE_BTN0 | MP_KEY_DOWN);
+                    break;
+                case kEventMouseButtonSecondary:
+                    mplayer_put_key(MOUSE_BTN2 | MP_KEY_DOWN);
+                    break;
+                case kEventMouseButtonTertiary:
+                    mplayer_put_key(MOUSE_BTN1 | MP_KEY_DOWN);
+                    break;
 
                 default:
                     result = eventNotHandledErr;
                     break;
-					}
-				}
-			}
-			break;
+                }
+            }
+        }
+            break;
 
-			case kEventMouseDragged:
-			break;
+        case kEventMouseDragged:
+            break;
 
         default:
             result = eventNotHandledErr;
             break;
-		}
-	}
+        }
+    }
 
     return result;
 }
@@ -390,768 +392,771 @@
 static OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData)
 {
     OSStatus result = noErr;
-	uint32_t d_width;
-	uint32_t d_height;
-	UInt32 class = GetEventClass (event);
-	UInt32 kind = GetEventKind (event);
+    uint32_t d_width;
+    uint32_t d_height;
+    UInt32 class = GetEventClass(event);
+    UInt32 kind = GetEventKind(event);
 
-	result = CallNextEventHandler(nextHandler, event);
+    result = CallNextEventHandler(nextHandler, event);
 
-	aspect(&d_width,&d_height,A_NOZOOM);
+    aspect(&d_width, &d_height, A_NOZOOM);
 
-	if(class == kEventClassCommand)
-	{
-		HICommand theHICommand;
-		GetEventParameter( event, kEventParamDirectObject, typeHICommand, NULL, sizeof( HICommand ), NULL, &theHICommand );
+    if (class == kEventClassCommand)
+    {
+        HICommand theHICommand;
+
+        GetEventParameter(event, kEventParamDirectObject, typeHICommand, NULL, sizeof(HICommand), NULL, &theHICommand);
 
-		switch ( theHICommand.commandID )
-		{
-			case kHICommandQuit:
-				mplayer_put_key(KEY_CLOSE_WIN);
-				break;
+        switch (theHICommand.commandID)
+        {
+        case kHICommandQuit:
+            mplayer_put_key(KEY_CLOSE_WIN);
+            break;
 
-			case kHalfScreenCmd:
-					if(vo_quartz_fs)
-					{
+        case kHalfScreenCmd:
+            if (vo_quartz_fs)
+            {
                 vo_fs = (!(vo_fs));
                 window_fullscreen();
-					}
+            }
 
-					SizeWindow(theWindow, (d_width/2), ((d_width/movie_aspect)/2), 1);
-					window_resized();
-				break;
+            SizeWindow(theWindow, (d_width / 2), ((d_width / movie_aspect) / 2), 1);
+            window_resized();
+            break;
 
-			case kNormalScreenCmd:
-					if(vo_quartz_fs)
-					{
+        case kNormalScreenCmd:
+            if (vo_quartz_fs)
+            {
                 vo_fs = (!(vo_fs));
                 window_fullscreen();
-					}
+            }
 
-					SizeWindow(theWindow, d_width, (d_width/movie_aspect), 1);
-					window_resized();
-				break;
+            SizeWindow(theWindow, d_width, (d_width / movie_aspect), 1);
+            window_resized();
+            break;
 
-			case kDoubleScreenCmd:
-					if(vo_quartz_fs)
-					{
+        case kDoubleScreenCmd:
+            if (vo_quartz_fs)
+            {
                 vo_fs = (!(vo_fs));
                 window_fullscreen();
-					}
+            }
 
-					SizeWindow(theWindow, (d_width*2), ((d_width/movie_aspect)*2), 1);
-					window_resized();
-				break;
+            SizeWindow(theWindow, (d_width * 2), ((d_width / movie_aspect) * 2), 1);
+            window_resized();
+            break;
 
-			case kFullScreenCmd:
+        case kFullScreenCmd:
             vo_fs = (!(vo_fs));
             window_fullscreen();
-				break;
+            break;
 
-			case kKeepAspectCmd:
-				vo_keepaspect = (!(vo_keepaspect));
-				CheckMenuItem (aspectMenu, 1, vo_keepaspect);
-				window_resized();
-				break;
+        case kKeepAspectCmd:
+            vo_keepaspect = (!(vo_keepaspect));
+            CheckMenuItem(aspectMenu, 1, vo_keepaspect);
+            window_resized();
+            break;
 
-			case kAspectOrgCmd:
-				movie_aspect = old_movie_aspect;
-				if(!vo_quartz_fs)
-				{
-					SizeWindow(theWindow, dstRect.right, (dstRect.right/movie_aspect),1);
-				}
-				window_resized();
-				break;
+        case kAspectOrgCmd:
+            movie_aspect = old_movie_aspect;
+            if (!vo_quartz_fs)
+            {
+                SizeWindow(theWindow, dstRect.right, (dstRect.right / movie_aspect), 1);
+            }
+            window_resized();
+            break;
 
-			case kAspectFullCmd:
-				movie_aspect = 4.0f/3.0f;
-				if(!vo_quartz_fs)
-				{
-					SizeWindow(theWindow, dstRect.right, (dstRect.right/movie_aspect),1);
-				}
-				window_resized();
-				break;
+        case kAspectFullCmd:
+            movie_aspect = 4.0f / 3.0f;
+            if (!vo_quartz_fs)
+            {
+                SizeWindow(theWindow, dstRect.right, (dstRect.right / movie_aspect), 1);
+            }
+            window_resized();
+            break;
 
-			case kAspectWideCmd:
-				movie_aspect = 16.0f/9.0f;
-				if(!vo_quartz_fs)
-				{
-					SizeWindow(theWindow, dstRect.right, (dstRect.right/movie_aspect),1);
-				}
-				window_resized();
-				break;
+        case kAspectWideCmd:
+            movie_aspect = 16.0f / 9.0f;
+            if (!vo_quartz_fs)
+            {
+                SizeWindow(theWindow, dstRect.right, (dstRect.right / movie_aspect), 1);
+            }
+            window_resized();
+            break;
 
-			case kPanScanCmd:
-				vo_panscan = (!(vo_panscan));
-				CheckMenuItem (aspectMenu, 2, vo_panscan);
-				window_panscan();
-				window_resized();
-				break;
+        case kPanScanCmd:
+            vo_panscan = (!(vo_panscan));
+            CheckMenuItem(aspectMenu, 2, vo_panscan);
+            window_panscan();
+            window_resized();
+            break;
 
-			default:
-				result = eventNotHandledErr;
-				break;
-		}
-	}
-	else if(class == kEventClassWindow)
-	{
-		WindowRef     window;
-		Rect          rectWindow = {0,0,0,0};
+        default:
+            result = eventNotHandledErr;
+            break;
+        }
+    }
+    else if (class == kEventClassWindow)
+    {
+        WindowRef window;
+        Rect rectWindow = { 0, 0, 0, 0 };
 
-		GetEventParameter(event, kEventParamDirectObject, typeWindowRef, NULL, sizeof(WindowRef), NULL, &window);
+        GetEventParameter(event, kEventParamDirectObject, typeWindowRef, NULL, sizeof(WindowRef), NULL, &window);
 
-		if(window)
-		{
-			GetWindowBounds(window, kWindowGlobalPortRgn, &rectWindow);
-		}
+        if (window)
+        {
+            GetWindowBounds(window, kWindowGlobalPortRgn, &rectWindow);
+        }
 
-		switch (kind)
-		{
-			case kEventWindowClosed:
-				theWindow = NULL;
-				mplayer_put_key(KEY_CLOSE_WIN);
-				break;
+        switch (kind)
+        {
+        case kEventWindowClosed:
+            theWindow = NULL;
+            mplayer_put_key(KEY_CLOSE_WIN);
+            break;
 
-			//resize window
-			case kEventWindowZoomed:
-			case kEventWindowBoundsChanged:
-				window_resized();
-				flip_page();
-				window_resized();
-				break;
+        // resize window
+        case kEventWindowZoomed:
+        case kEventWindowBoundsChanged:
+            window_resized();
+            flip_page();
+            window_resized();
+            break;
 
-			default:
-				result = eventNotHandledErr;
-				break;
-		}
-	}
+        default:
+            result = eventNotHandledErr;
+            break;
+        }
+    }
 
     return result;
 }
 
 static void quartz_CreateWindow(uint32_t d_width, uint32_t d_height, WindowAttributes windowAttrs)
 {
-	CFStringRef		titleKey;
-	CFStringRef		windowTitle;
-	OSStatus		result;
+    CFStringRef titleKey;
+    CFStringRef windowTitle;
+    OSStatus result;
 
-	MenuItemIndex index;
-	CFStringRef movMenuTitle;
-	CFStringRef aspMenuTitle;
+    MenuItemIndex index;
+    CFStringRef movMenuTitle;
+    CFStringRef aspMenuTitle;
 
     const EventTypeSpec win_events[] = {
-        { kEventClassWindow, kEventWindowClosed },
-		{ kEventClassWindow, kEventWindowBoundsChanged },
-        { kEventClassCommand, kEventCommandProcess }
+        {kEventClassWindow, kEventWindowClosed},
+        {kEventClassWindow, kEventWindowBoundsChanged},
+        {kEventClassCommand, kEventCommandProcess}
     };
 
     const EventTypeSpec key_events[] = {
-		{ kEventClassKeyboard, kEventRawKeyDown },
-		{ kEventClassKeyboard, kEventRawKeyRepeat }
+        {kEventClassKeyboard, kEventRawKeyDown},
+        {kEventClassKeyboard, kEventRawKeyRepeat}
+    };
+
+    const EventTypeSpec mouse_events[] = {
+        {kEventClassMouse, kEventMouseMoved},
+        {kEventClassMouse, kEventMouseWheelMoved},
+        {kEventClassMouse, kEventMouseDown},
+        {kEventClassMouse, kEventMouseUp},
+        {kEventClassMouse, kEventMouseDragged}
     };
 
-	const EventTypeSpec mouse_events[] = {
-		{ kEventClassMouse, kEventMouseMoved },
-		{ kEventClassMouse, kEventMouseWheelMoved },
-		{ kEventClassMouse, kEventMouseDown },
-		{ kEventClassMouse, kEventMouseUp },
-		{ kEventClassMouse, kEventMouseDragged }
-	};
+    SetRect(&winRect, 0, 0, d_width, d_height);
+    SetRect(&oldWinRect, 0, 0, d_width, d_height);
+    SetRect(&dstRect, 0, 0, d_width, d_height);
+
+    // Clear Menu Bar
+    ClearMenuBar();
 
-	SetRect(&winRect, 0, 0, d_width, d_height);
-	SetRect(&oldWinRect, 0, 0, d_width, d_height);
-	SetRect(&dstRect, 0, 0, d_width, d_height);
+    // Create Window Menu
+    CreateStandardWindowMenu(0, &windMenu);
+    InsertMenu(windMenu, 0);
 
-	//Clear Menu Bar
-	ClearMenuBar();
-
-	//Create Window Menu
-	CreateStandardWindowMenu(0, &windMenu);
-	InsertMenu(windMenu, 0);
+    // Create Movie Menu
+    CreateNewMenu(1004, 0, &movMenu);
+    movMenuTitle = CFSTR("Movie");
+    SetMenuTitleWithCFString(movMenu, movMenuTitle);
 
-	//Create Movie Menu
-	CreateNewMenu (1004, 0, &movMenu);
-	movMenuTitle = CFSTR("Movie");
-	SetMenuTitleWithCFString(movMenu, movMenuTitle);
+    AppendMenuItemTextWithCFString(movMenu, CFSTR("Half Size"), 0, kHalfScreenCmd, &index);
+    SetMenuItemCommandKey(movMenu, index, 0, '0');
 
-	AppendMenuItemTextWithCFString(movMenu, CFSTR("Half Size"), 0, kHalfScreenCmd, &index);
-	SetMenuItemCommandKey(movMenu, index, 0, '0');
+    AppendMenuItemTextWithCFString(movMenu, CFSTR("Normal Size"), 0, kNormalScreenCmd, &index);
+    SetMenuItemCommandKey(movMenu, index, 0, '1');
 
-	AppendMenuItemTextWithCFString(movMenu, CFSTR("Normal Size"), 0, kNormalScreenCmd, &index);
-	SetMenuItemCommandKey(movMenu, index, 0, '1');
+    AppendMenuItemTextWithCFString(movMenu, CFSTR("Double Size"), 0, kDoubleScreenCmd, &index);
+    SetMenuItemCommandKey(movMenu, index, 0, '2');
 
-	AppendMenuItemTextWithCFString(movMenu, CFSTR("Double Size"), 0, kDoubleScreenCmd, &index);
-	SetMenuItemCommandKey(movMenu, index, 0, '2');
+    AppendMenuItemTextWithCFString(movMenu, CFSTR("Full Size"), 0, kFullScreenCmd, &index);
+    SetMenuItemCommandKey(movMenu, index, 0, 'F');
 
-	AppendMenuItemTextWithCFString(movMenu, CFSTR("Full Size"), 0, kFullScreenCmd, &index);
-	SetMenuItemCommandKey(movMenu, index, 0, 'F');
+    AppendMenuItemTextWithCFString(movMenu, NULL, kMenuItemAttrSeparator, 0, &index);
 
-	AppendMenuItemTextWithCFString(movMenu, NULL, kMenuItemAttrSeparator, 0, &index);
+    AppendMenuItemTextWithCFString(movMenu, CFSTR("Aspect Ratio"), 0, 0, &index);
 
-	AppendMenuItemTextWithCFString(movMenu, CFSTR("Aspect Ratio"), 0, 0, &index);
-
-	////Create Aspect Ratio Sub Menu
-	CreateNewMenu (0, 0, &aspectMenu);
-	aspMenuTitle = CFSTR("Aspect Ratio");
-	SetMenuTitleWithCFString(aspectMenu, aspMenuTitle);
-	SetMenuItemHierarchicalMenu(movMenu, 6, aspectMenu);
+    //// Create Aspect Ratio Sub Menu
+    CreateNewMenu(0, 0, &aspectMenu);
+    aspMenuTitle = CFSTR("Aspect Ratio");
+    SetMenuTitleWithCFString(aspectMenu, aspMenuTitle);
+    SetMenuItemHierarchicalMenu(movMenu, 6, aspectMenu);
 
-	AppendMenuItemTextWithCFString(aspectMenu, CFSTR("Keep"), 0, kKeepAspectCmd, &index);
-	CheckMenuItem (aspectMenu, 1, vo_keepaspect);
-	AppendMenuItemTextWithCFString(aspectMenu, CFSTR("Pan-Scan"), 0, kPanScanCmd, &index);
-	CheckMenuItem (aspectMenu, 2, vo_panscan);
-	AppendMenuItemTextWithCFString(aspectMenu, NULL, kMenuItemAttrSeparator, 0, &index);
-	AppendMenuItemTextWithCFString(aspectMenu, CFSTR("Original"), 0, kAspectOrgCmd, &index);
-	AppendMenuItemTextWithCFString(aspectMenu, CFSTR("4:3"), 0, kAspectFullCmd, &index);
-	AppendMenuItemTextWithCFString(aspectMenu, CFSTR("16:9"), 0, kAspectWideCmd, &index);
+    AppendMenuItemTextWithCFString(aspectMenu, CFSTR("Keep"), 0, kKeepAspectCmd, &index);
+    CheckMenuItem(aspectMenu, 1, vo_keepaspect);
+    AppendMenuItemTextWithCFString(aspectMenu, CFSTR("Pan-Scan"), 0, kPanScanCmd, &index);
+    CheckMenuItem(aspectMenu, 2, vo_panscan);
+    AppendMenuItemTextWithCFString(aspectMenu, NULL, kMenuItemAttrSeparator, 0, &index);
+    AppendMenuItemTextWithCFString(aspectMenu, CFSTR("Original"), 0, kAspectOrgCmd, &index);
+    AppendMenuItemTextWithCFString(aspectMenu, CFSTR("4:3"), 0, kAspectFullCmd, &index);
+    AppendMenuItemTextWithCFString(aspectMenu, CFSTR("16:9"), 0, kAspectWideCmd, &index);
 
-	InsertMenu(movMenu, GetMenuID(windMenu)); //insert before Window menu
+    InsertMenu(movMenu, GetMenuID(windMenu));   //insert before Window menu
 
-	DrawMenuBar();
+    DrawMenuBar();
 
-	//create window
-	CreateNewWindow(kDocumentWindowClass, windowAttrs, &winRect, &theWindow);
+    // create window
+    CreateNewWindow(kDocumentWindowClass, windowAttrs, &winRect, &theWindow);
 
-	CreateWindowGroup(0, &winGroup);
-	SetWindowGroup(theWindow, winGroup);
+    CreateWindowGroup(0, &winGroup);
+    SetWindowGroup(theWindow, winGroup);
 
-	//Set window title
-	titleKey	= CFSTR("MPlayer - The Movie Player");
-	windowTitle = CFCopyLocalizedString(titleKey, NULL);
-	result		= SetWindowTitleWithCFString(theWindow, windowTitle);
-	CFRelease(titleKey);
-	CFRelease(windowTitle);
+    // Set window title
+    titleKey = CFSTR("MPlayer - The Movie Player");
+    windowTitle = CFCopyLocalizedString(titleKey, NULL);
+    result = SetWindowTitleWithCFString(theWindow, windowTitle);
+    CFRelease(titleKey);
+    CFRelease(windowTitle);
 
-	//Install event handler
-	InstallApplicationEventHandler (NewEventHandlerUPP (KeyEventHandler), GetEventTypeCount(key_events), key_events, NULL, NULL);
-	InstallApplicationEventHandler (NewEventHandlerUPP (MouseEventHandler), GetEventTypeCount(mouse_events), mouse_events, NULL, NULL);
-	InstallWindowEventHandler (theWindow, NewEventHandlerUPP (WindowEventHandler), GetEventTypeCount(win_events), win_events, theWindow, NULL);
+    // Install event handler
+    InstallApplicationEventHandler(NewEventHandlerUPP(KeyEventHandler), GetEventTypeCount(key_events), key_events, NULL, NULL);
+    InstallApplicationEventHandler(NewEventHandlerUPP(MouseEventHandler), GetEventTypeCount(mouse_events), mouse_events, NULL, NULL);
+    InstallWindowEventHandler(theWindow, NewEventHandlerUPP(WindowEventHandler), GetEventTypeCount(win_events), win_events, theWindow, NULL);
 }
 
 static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
 {
-	WindowAttributes	windowAttrs;
-	OSErr				qterr;
-	CGRect tmpBounds;
-	CGDisplayCount displayCount;
-	CGDirectDisplayID *displays;
+    WindowAttributes windowAttrs;
+    OSErr qterr;
+    CGRect tmpBounds;
+    CGDisplayCount displayCount;
+    CGDirectDisplayID *displays;
 
-	//Get Main device info///////////////////////////////////////////////////
+    // Get Main device info///////////////////////////////////////////////////
 
-	//Display IDs might not be consecutive, get the list of all devices up to # device_id
-	displayCount = device_id + 1;
-	displays = malloc(sizeof(CGDirectDisplayID) * displayCount);
-	if (kCGErrorSuccess != CGGetActiveDisplayList(displayCount, displays, &displayCount) || displayCount < device_id + 1) {
-			mp_msg(MSGT_VO, MSGL_FATAL, "Quartz error: Device ID %d do not exist, falling back to main device.\n", device_id);
-			displayId = kCGDirectMainDisplay;
-			device_id = 0;
-		}
-	else
-	{
-		displayId = displays[device_id];
-	}
-	free(displays);
+    // Display IDs might not be consecutive, get the list of all devices up to # device_id
+    displayCount = device_id + 1;
+    displays = malloc(sizeof(CGDirectDisplayID) * displayCount);
+    if (kCGErrorSuccess != CGGetActiveDisplayList(displayCount, displays, &displayCount) || displayCount < device_id + 1) {
+        mp_msg(MSGT_VO, MSGL_FATAL, "Quartz error: Device ID %d do not exist, falling back to main device.\n", device_id);
+        displayId = kCGDirectMainDisplay;
+        device_id = 0;
+    }
+    else
+    {
+        displayId = displays[device_id];
+    }
+    free(displays);
 
-	displayRect = CGDisplayBounds(displayId);
+    displayRect = CGDisplayBounds(displayId);
 
-	monitor_aspect = (float)displayRect.size.width/(float)displayRect.size.height;
+    monitor_aspect = (float)displayRect.size.width / (float)displayRect.size.height;
 
-	//misc mplayer setup/////////////////////////////////////////////////////
-	SetRect(&imgRect, 0, 0, width, height);
-	switch (image_format)
-	{
-		case IMGFMT_RGB32:
-			image_depth = 32;
-			break;
-		case IMGFMT_YV12:
-		case IMGFMT_IYUV:
-        case IMGFMT_I420:
-        case IMGFMT_UYVY:
-        case IMGFMT_YUY2:
-			image_depth = 16;
-			break;
-	}
-	image_size = ((imgRect.right*imgRect.bottom*image_depth)+7)/8;
+    // misc mplayer setup/////////////////////////////////////////////////////
+    SetRect(&imgRect, 0, 0, width, height);
+    switch (image_format)
+    {
+    case IMGFMT_RGB32:
+        image_depth = 32;
+        break;
+    case IMGFMT_YV12:
+    case IMGFMT_IYUV:
+    case IMGFMT_I420:
+    case IMGFMT_UYVY:
+    case IMGFMT_YUY2:
+        image_depth = 16;
+        break;
+    }
+    image_size = ((imgRect.right * imgRect.bottom * image_depth) + 7) / 8;
 
-	vo_fs = flags & VOFLAG_FULLSCREEN;
+    vo_fs = flags & VOFLAG_FULLSCREEN;
 
-	//get movie aspect
-	panscan_init();
-	aspect_save_orig(width,height);
-	aspect_save_prescale(d_width,d_height);
-	aspect_save_screenres(displayRect.size.width, displayRect.size.height);
+    // get movie aspect
+    panscan_init();
+    aspect_save_orig(width, height);
+    aspect_save_prescale(d_width, d_height);
+    aspect_save_screenres(displayRect.size.width, displayRect.size.height);
 
-	aspect(&d_width,&d_height,A_NOZOOM);
+    aspect(&d_width, &d_height, A_NOZOOM);
 
-	movie_aspect = (float)d_width/(float)d_height;
-	old_movie_aspect = movie_aspect;
+    movie_aspect = (float)d_width / (float)d_height;
+    old_movie_aspect = movie_aspect;
 
-	if(image_data)
-		free(image_data);
+    if (image_data)
+        free(image_data);
 
-	image_data = malloc(image_size);
+    image_data = malloc(image_size);
 
-	//Create player window//////////////////////////////////////////////////
-	windowAttrs =   kWindowStandardDocumentAttributes
-					| kWindowStandardHandlerAttribute
-					| kWindowLiveResizeAttribute;
+    // Create player window//////////////////////////////////////////////////
+    windowAttrs = kWindowStandardDocumentAttributes
+                | kWindowStandardHandlerAttribute
+                | kWindowLiveResizeAttribute;
 
-	windowAttrs &= (~kWindowResizableAttribute);
+    windowAttrs &= (~kWindowResizableAttribute);
 
-	if (theWindow == NULL)
-	{
-		CGContextRef context;
+    if (theWindow == NULL)
+    {
+        CGContextRef context;
 
-		quartz_CreateWindow(d_width, d_height, windowAttrs);
+        quartz_CreateWindow(d_width, d_height, windowAttrs);
 
-		if (theWindow == NULL)
-		{
-			mp_msg(MSGT_VO, MSGL_FATAL, "Quartz error: Couldn't create window !!!!!\n");
-			return -1;
-		}
-		tmpBounds = CGRectMake( 0, 0, winRect.right, winRect.bottom);
-		QDBeginCGContext(GetWindowPort(theWindow),&context);
-		CGContextFillRect(context, tmpBounds);
-		QDEndCGContext(GetWindowPort(theWindow),&context);
-	}
-	else
-	{
-		HideWindow(theWindow);
-		ChangeWindowAttributes(theWindow, ~windowAttrs, windowAttrs);
-		SetRect(&winRect, 0, 0, d_width, d_height);
-		SetRect(&oldWinRect, 0, 0, d_width, d_height);
-		SizeWindow (theWindow, d_width, d_height, 1);
-	}
+        if (theWindow == NULL)
+        {
+            mp_msg(MSGT_VO, MSGL_FATAL, "Quartz error: Couldn't create window !!!!!\n");
+            return -1;
+        }
+        tmpBounds = CGRectMake(0, 0, winRect.right, winRect.bottom);
+        QDBeginCGContext(GetWindowPort(theWindow), &context);
+        CGContextFillRect(context, tmpBounds);
+        QDEndCGContext(GetWindowPort(theWindow), &context);
+    }
+    else
+    {
+        HideWindow(theWindow);
+        ChangeWindowAttributes(theWindow, ~windowAttrs, windowAttrs);
+        SetRect(&winRect, 0, 0, d_width, d_height);
+        SetRect(&oldWinRect, 0, 0, d_width, d_height);
+        SizeWindow(theWindow, d_width, d_height, 1);
+    }
 
-	switch (image_format)
-	{
-		case IMGFMT_RGB32:
-		{
-			CGContextRef context;
+    switch (image_format)
+    {
+    case IMGFMT_RGB32:
+    {
+        CGContextRef context;
 
-			QDBeginCGContext(GetWindowPort(theWindow),&context);
+        QDBeginCGContext(GetWindowPort(theWindow), &context);
 
-			dataProviderRef = CGDataProviderCreateWithData (0, image_data, imgRect.right * imgRect.bottom * 4, 0);
+        dataProviderRef = CGDataProviderCreateWithData(0, image_data, imgRect.right * imgRect.bottom * 4, 0);
 
-			image = CGImageCreate   (imgRect.right,
-									 imgRect.bottom,
-									 8,
-									 image_depth,
-									 ((imgRect.right*32)+7)/8,
-									 CGColorSpaceCreateDeviceRGB(),
-									 kCGImageAlphaNoneSkipFirst,
-									 dataProviderRef, 0, 1, kCGRenderingIntentDefault);
+        image = CGImageCreate(imgRect.right,
+                              imgRect.bottom,
+                              8,
+                              image_depth,
+                              ((imgRect.right * 32) + 7) / 8,
+                              CGColorSpaceCreateDeviceRGB(),
+                              kCGImageAlphaNoneSkipFirst,
+                              dataProviderRef, 0, 1, kCGRenderingIntentDefault);
 
-			QDEndCGContext(GetWindowPort(theWindow),&context);
-			break;
-		}
+        QDEndCGContext(GetWindowPort(theWindow), &context);
+        break;
+    }
 
-		case IMGFMT_YV12:
-		case IMGFMT_IYUV:
-		case IMGFMT_I420:
-		case IMGFMT_UYVY:
-		case IMGFMT_YUY2:
-		{
-			get_image_done = 0;
+    case IMGFMT_YV12:
+    case IMGFMT_IYUV:
+    case IMGFMT_I420:
+    case IMGFMT_UYVY:
+    case IMGFMT_YUY2:
+    {
+        get_image_done = 0;
 
-			if (!EnterMoviesDone)
-			{
-				qterr = EnterMovies();
-				EnterMoviesDone = 1;
-			}
-			else
-				qterr = 0;
+        if (!EnterMoviesDone)
+        {
+            qterr = EnterMovies();
+            EnterMoviesDone = 1;
+        }
+        else
+            qterr = 0;
 
-			if (qterr)
-			{
-				mp_msg(MSGT_VO, MSGL_FATAL, "Quartz error: EnterMovies (%d)\n", qterr);
-				return -1;
-			}
+        if (qterr)
+        {
+            mp_msg(MSGT_VO, MSGL_FATAL, "Quartz error: EnterMovies (%d)\n", qterr);
+            return -1;
+        }
 
 
-			SetIdentityMatrix(&matrix);
+        SetIdentityMatrix(&matrix);
 
-			if ((d_width != width) || (d_height != height))
-			{
-				ScaleMatrix(&matrix, FixDiv(Long2Fix(d_width),Long2Fix(width)), FixDiv(Long2Fix(d_height),Long2Fix(height)), 0, 0);
-			}
+        if ((d_width != width) || (d_height != height))
+        {
+            ScaleMatrix(&matrix, FixDiv(Long2Fix(d_width), Long2Fix(width)), FixDiv(Long2Fix(d_height), Long2Fix(height)), 0, 0);
+        }
 
-			yuv_qt_stuff.desc = (ImageDescriptionHandle)NewHandleClear( sizeof(ImageDescription) );
+        yuv_qt_stuff.desc = (ImageDescriptionHandle) NewHandleClear(sizeof(ImageDescription));
 
-			yuv_qt_stuff.extension_colr = NewHandleClear(sizeof(NCLCColorInfoImageDescriptionExtension));
-			((NCLCColorInfoImageDescriptionExtension*)(*yuv_qt_stuff.extension_colr))->colorParamType = kVideoColorInfoImageDescriptionExtensionType;
-			((NCLCColorInfoImageDescriptionExtension*)(*yuv_qt_stuff.extension_colr))->primaries = 2;
-			((NCLCColorInfoImageDescriptionExtension*)(*yuv_qt_stuff.extension_colr))->transferFunction = 2;
-			((NCLCColorInfoImageDescriptionExtension*)(*yuv_qt_stuff.extension_colr))->matrix = 2;
+        yuv_qt_stuff.extension_colr = NewHandleClear(sizeof(NCLCColorInfoImageDescriptionExtension));
+        ((NCLCColorInfoImageDescriptionExtension *) (*yuv_qt_stuff.extension_colr))->colorParamType = kVideoColorInfoImageDescriptionExtensionType;
+        ((NCLCColorInfoImageDescriptionExtension *) (*yuv_qt_stuff.extension_colr))->primaries = 2;
+        ((NCLCColorInfoImageDescriptionExtension *) (*yuv_qt_stuff.extension_colr))->transferFunction = 2;
+        ((NCLCColorInfoImageDescriptionExtension *) (*yuv_qt_stuff.extension_colr))->matrix = 2;
 
-			yuv_qt_stuff.extension_fiel = NewHandleClear(sizeof(FieldInfoImageDescriptionExtension));
-			((FieldInfoImageDescriptionExtension*)(*yuv_qt_stuff.extension_fiel))->fieldCount = 1;
-			((FieldInfoImageDescriptionExtension*)(*yuv_qt_stuff.extension_fiel))->fieldOrderings = 0;
+        yuv_qt_stuff.extension_fiel = NewHandleClear(sizeof(FieldInfoImageDescriptionExtension));
+        ((FieldInfoImageDescriptionExtension *) (*yuv_qt_stuff.extension_fiel))->fieldCount = 1;
+        ((FieldInfoImageDescriptionExtension *) (*yuv_qt_stuff.extension_fiel))->fieldOrderings = 0;
 
-			yuv_qt_stuff.extension_clap = NewHandleClear(sizeof(CleanApertureImageDescriptionExtension));
-			((CleanApertureImageDescriptionExtension*)(*yuv_qt_stuff.extension_clap))->cleanApertureWidthN = imgRect.right;
-			((CleanApertureImageDescriptionExtension*)(*yuv_qt_stuff.extension_clap))->cleanApertureWidthD = 1;
-			((CleanApertureImageDescriptionExtension*)(*yuv_qt_stuff.extension_clap))->cleanApertureHeightN = imgRect.bottom;
-			((CleanApertureImageDescriptionExtension*)(*yuv_qt_stuff.extension_clap))->cleanApertureHeightD = 1;
-			((CleanApertureImageDescriptionExtension*)(*yuv_qt_stuff.extension_clap))->horizOffN = 0;
-			((CleanApertureImageDescriptionExtension*)(*yuv_qt_stuff.extension_clap))->horizOffD = 1;
-			((CleanApertureImageDescriptionExtension*)(*yuv_qt_stuff.extension_clap))->vertOffN = 0;
-			((CleanApertureImageDescriptionExtension*)(*yuv_qt_stuff.extension_clap))->vertOffD = 1;
+        yuv_qt_stuff.extension_clap = NewHandleClear(sizeof(CleanApertureImageDescriptionExtension));
+        ((CleanApertureImageDescriptionExtension *) (*yuv_qt_stuff.extension_clap))->cleanApertureWidthN = imgRect.right;
+        ((CleanApertureImageDescriptionExtension *) (*yuv_qt_stuff.extension_clap))->cleanApertureWidthD = 1;
+        ((CleanApertureImageDescriptionExtension *) (*yuv_qt_stuff.extension_clap))->cleanApertureHeightN = imgRect.bottom;
+        ((CleanApertureImageDescriptionExtension *) (*yuv_qt_stuff.extension_clap))->cleanApertureHeightD = 1;
+        ((CleanApertureImageDescriptionExtension *) (*yuv_qt_stuff.extension_clap))->horizOffN = 0;
+        ((CleanApertureImageDescriptionExtension *) (*yuv_qt_stuff.extension_clap))->horizOffD = 1;
+        ((CleanApertureImageDescriptionExtension *) (*yuv_qt_stuff.extension_clap))->vertOffN = 0;
+        ((CleanApertureImageDescriptionExtension *) (*yuv_qt_stuff.extension_clap))->vertOffD = 1;
 
-			yuv_qt_stuff.extension_pasp = NewHandleClear(sizeof(PixelAspectRatioImageDescriptionExtension));
-			((PixelAspectRatioImageDescriptionExtension*)(*yuv_qt_stuff.extension_pasp))->hSpacing = 1;
-			((PixelAspectRatioImageDescriptionExtension*)(*yuv_qt_stuff.extension_pasp))->vSpacing = 1;
+        yuv_qt_stuff.extension_pasp = NewHandleClear(sizeof(PixelAspectRatioImageDescriptionExtension));
+        ((PixelAspectRatioImageDescriptionExtension *) (*yuv_qt_stuff.extension_pasp))->hSpacing = 1;
+        ((PixelAspectRatioImageDescriptionExtension *) (*yuv_qt_stuff.extension_pasp))->vSpacing = 1;
 
-			(*yuv_qt_stuff.desc)->idSize = sizeof(ImageDescription);
-			(*yuv_qt_stuff.desc)->cType = image_qtcodec;
-			(*yuv_qt_stuff.desc)->version = 2;
-			(*yuv_qt_stuff.desc)->revisionLevel = 0;
-			(*yuv_qt_stuff.desc)->vendor = 'mpla';
-			(*yuv_qt_stuff.desc)->width = imgRect.right;
-			(*yuv_qt_stuff.desc)->height = imgRect.bottom;
-			(*yuv_qt_stuff.desc)->hRes = Long2Fix(72);
-			(*yuv_qt_stuff.desc)->vRes = Long2Fix(72);
-			(*yuv_qt_stuff.desc)->temporalQuality = 0;
-			(*yuv_qt_stuff.desc)->spatialQuality = codecLosslessQuality;
-			(*yuv_qt_stuff.desc)->frameCount = 1;
-			(*yuv_qt_stuff.desc)->dataSize = 0;
-			(*yuv_qt_stuff.desc)->depth = 24;
-			(*yuv_qt_stuff.desc)->clutID = -1;
+        (*yuv_qt_stuff.desc)->idSize = sizeof(ImageDescription);
+        (*yuv_qt_stuff.desc)->cType = image_qtcodec;
+        (*yuv_qt_stuff.desc)->version = 2;
+        (*yuv_qt_stuff.desc)->revisionLevel = 0;
+        (*yuv_qt_stuff.desc)->vendor = 'mpla';
+        (*yuv_qt_stuff.desc)->width = imgRect.right;
+        (*yuv_qt_stuff.desc)->height = imgRect.bottom;
+        (*yuv_qt_stuff.desc)->hRes = Long2Fix(72);
+        (*yuv_qt_stuff.desc)->vRes = Long2Fix(72);
+        (*yuv_qt_stuff.desc)->temporalQuality = 0;
+        (*yuv_qt_stuff.desc)->spatialQuality = codecLosslessQuality;
+        (*yuv_qt_stuff.desc)->frameCount = 1;
+        (*yuv_qt_stuff.desc)->dataSize = 0;
+        (*yuv_qt_stuff.desc)->depth = 24;
+        (*yuv_qt_stuff.desc)->clutID = -1;
 
-			qterr = AddImageDescriptionExtension(yuv_qt_stuff.desc, yuv_qt_stuff.extension_colr, kColorInfoImageDescriptionExtension);
-			if (qterr)
-			{
-				mp_msg(MSGT_VO, MSGL_ERR, "Quartz error: AddImageDescriptionExtension [colr] (%d)\n", qterr);
-			}
+        qterr = AddImageDescriptionExtension(yuv_qt_stuff.desc, yuv_qt_stuff.extension_colr, kColorInfoImageDescriptionExtension);
+        if (qterr)
+        {
+            mp_msg(MSGT_VO, MSGL_ERR, "Quartz error: AddImageDescriptionExtension [colr] (%d)\n", qterr);
+        }
 
-			qterr = AddImageDescriptionExtension(yuv_qt_stuff.desc, yuv_qt_stuff.extension_fiel, kFieldInfoImageDescriptionExtension);
-			if (qterr)
-			{
-				mp_msg(MSGT_VO, MSGL_ERR, "Quartz error: AddImageDescriptionExtension [fiel] (%d)\n", qterr);
-			}
+        qterr = AddImageDescriptionExtension(yuv_qt_stuff.desc, yuv_qt_stuff.extension_fiel, kFieldInfoImageDescriptionExtension);
+        if (qterr)
+        {
+            mp_msg(MSGT_VO, MSGL_ERR, "Quartz error: AddImageDescriptionExtension [fiel] (%d)\n", qterr);
+        }
 
-			qterr = AddImageDescriptionExtension(yuv_qt_stuff.desc, yuv_qt_stuff.extension_clap, kCleanApertureImageDescriptionExtension);
-			if (qterr)
-			{
-				mp_msg(MSGT_VO, MSGL_ERR, "Quartz error: AddImageDescriptionExtension [clap] (%d)\n", qterr);
-			}
+        qterr = AddImageDescriptionExtension(yuv_qt_stuff.desc, yuv_qt_stuff.extension_clap, kCleanApertureImageDescriptionExtension);
+        if (qterr)
+        {
+            mp_msg(MSGT_VO, MSGL_ERR, "Quartz error: AddImageDescriptionExtension [clap] (%d)\n", qterr);
+        }
 
-			qterr = AddImageDescriptionExtension(yuv_qt_stuff.desc, yuv_qt_stuff.extension_pasp, kCleanApertureImageDescriptionExtension);
-			if (qterr)
-			{
-				mp_msg(MSGT_VO, MSGL_ERR, "Quartz error: AddImageDescriptionExtension [pasp] (%d)\n", qterr);
-			}
-			if (P != NULL) { // second or subsequent movie
-				free(P);
-			}
-			P = calloc(sizeof(PlanarPixmapInfoYUV420) + image_size, 1);
-			switch (image_format)
-			{
-				case IMGFMT_YV12:
-				case IMGFMT_IYUV:
-				case IMGFMT_I420:
-					P->componentInfoY.offset = be2me_32(sizeof(PlanarPixmapInfoYUV420));
-					P->componentInfoCb.offset = be2me_32(be2me_32(P->componentInfoY.offset) + image_size / 2);
-					P->componentInfoCr.offset = be2me_32(be2me_32(P->componentInfoCb.offset) + image_size / 4);
-					P->componentInfoY.rowBytes = be2me_32(imgRect.right);
-					P->componentInfoCb.rowBytes =  be2me_32(imgRect.right / 2);
-					P->componentInfoCr.rowBytes =  be2me_32(imgRect.right / 2);
-					image_buffer_size = image_size + sizeof(PlanarPixmapInfoYUV420);
-					break;
-				case IMGFMT_UYVY:
-				case IMGFMT_YUY2:
-					image_buffer_size = image_size;
-					break;
-			}
+        qterr = AddImageDescriptionExtension(yuv_qt_stuff.desc, yuv_qt_stuff.extension_pasp, kCleanApertureImageDescriptionExtension);
+        if (qterr)
+        {
+            mp_msg(MSGT_VO, MSGL_ERR, "Quartz error: AddImageDescriptionExtension [pasp] (%d)\n", qterr);
+        }
+        if (P != NULL) {        // second or subsequent movie
+            free(P);
+        }
+        P = calloc(sizeof(PlanarPixmapInfoYUV420) + image_size, 1);
+        switch (image_format)
+        {
+        case IMGFMT_YV12:
+        case IMGFMT_IYUV:
+        case IMGFMT_I420:
+            P->componentInfoY.offset = be2me_32(sizeof(PlanarPixmapInfoYUV420));
+            P->componentInfoCb.offset = be2me_32(be2me_32(P->componentInfoY.offset) + image_size / 2);
+            P->componentInfoCr.offset = be2me_32(be2me_32(P->componentInfoCb.offset) + image_size / 4);
+            P->componentInfoY.rowBytes = be2me_32(imgRect.right);
+            P->componentInfoCb.rowBytes = be2me_32(imgRect.right / 2);
+            P->componentInfoCr.rowBytes = be2me_32(imgRect.right / 2);
+            image_buffer_size = image_size + sizeof(PlanarPixmapInfoYUV420);
+            break;
+        case IMGFMT_UYVY:
+        case IMGFMT_YUY2:
+            image_buffer_size = image_size;
+            break;
+        }
 
-			qterr = DecompressSequenceBeginS(&seqId,
-					   yuv_qt_stuff.desc,
-					   (char *)P,
-					   image_buffer_size,
-					   GetWindowPort(theWindow),
-					   NULL,
-					   NULL,
-					   ((d_width != width) || (d_height != height)) ?
-					   &matrix : NULL,
-					   srcCopy,
-					   NULL,
-					   0,
-					   codecLosslessQuality,
-					   bestSpeedCodec);
+        qterr = DecompressSequenceBeginS(&seqId,
+                                         yuv_qt_stuff.desc,
+                                         (char *)P,
+                                         image_buffer_size,
+                                         GetWindowPort(theWindow),
+                                         NULL,
+                                         NULL,
+                                         ((d_width != width) || (d_height != height)) ?
+                                         &matrix : NULL,
+                                         srcCopy,
+                                         NULL,
+                                         0,
+                                         codecLosslessQuality,
+                                         bestSpeedCodec);
 
-			if (qterr)
-			{
-				mp_msg(MSGT_VO, MSGL_FATAL, "Quartz error: DecompressSequenceBeginS (%d)\n", qterr);
-				return -1;
-			}
-		}
-		break;
-	}
+        if (qterr)
+        {
+            mp_msg(MSGT_VO, MSGL_FATAL, "Quartz error: DecompressSequenceBeginS (%d)\n", qterr);
+            return -1;
+        }
+    }
+        break;
+    }
 
-	//Show window
-	RepositionWindow(theWindow, NULL, kWindowCenterOnMainScreen);
-	ShowWindow (theWindow);
+    // Show window
+    RepositionWindow(theWindow, NULL, kWindowCenterOnMainScreen);
+    ShowWindow(theWindow);
 
-	if(vo_fs)
-		window_fullscreen();
+    if (vo_fs)
+        window_fullscreen();
 
-	if(vo_ontop)
-		window_ontop();
+    if (vo_ontop)
+        window_ontop();
 
-	if(vo_rootwin)
-	{
-		vo_fs = TRUE;
-		winLevel = 0;
-		SetWindowGroupLevel(winGroup, CGWindowLevelForKey(levelList[winLevel]));
-		window_fullscreen();
-	}
+    if (vo_rootwin)
+    {
+        vo_fs = TRUE;
+        winLevel = 0;
+        SetWindowGroupLevel(winGroup, CGWindowLevelForKey(levelList[winLevel]));
+        window_fullscreen();
+    }
 
-	window_resized();
+    window_resized();
 
-	return 0;
+    return 0;
 }
 
 static void check_events(void)
 {
-	EventRef theEvent;
-	EventTargetRef theTarget;
-	OSStatus	theErr;
+    EventRef theEvent;
+    EventTargetRef theTarget;
+    OSStatus theErr;
 
-	//Get event
-	theTarget = GetEventDispatcherTarget();
-    theErr = ReceiveNextEvent(0, 0, kEventDurationNoWait,true, &theEvent);
-    if(theErr == noErr && theEvent != NULL)
-	{
-		SendEventToEventTarget (theEvent, theTarget);
-		ReleaseEvent(theEvent);
-	}
+    // Get event
+    theTarget = GetEventDispatcherTarget();
+    theErr = ReceiveNextEvent(0, 0, kEventDurationNoWait, true, &theEvent);
+    if (theErr == noErr && theEvent != NULL)
+    {
+        SendEventToEventTarget(theEvent, theTarget);
+        ReleaseEvent(theEvent);
+    }
 }
 
 static void draw_osd(void)
 {
-	vo_draw_text(imgRect.right,imgRect.bottom,draw_alpha);
+    vo_draw_text(imgRect.right, imgRect.bottom, draw_alpha);
 }
 
 static void flip_page(void)
 {
-	int curTime;
+    int curTime;
 
-	if(theWindow == NULL)
-		return;
+    if (theWindow == NULL)
+        return;
 
-	switch (image_format)
-	{
-		case IMGFMT_RGB32:
-		{
-			CGContextRef context;
-			QDBeginCGContext(GetWindowPort(theWindow),&context);
-			CGContextDrawImage (context, bounds, image);
-			QDEndCGContext(GetWindowPort(theWindow),&context);
-		}
-		break;
+    switch (image_format)
+    {
+    case IMGFMT_RGB32:
+    {
+        CGContextRef context;
+
+        QDBeginCGContext(GetWindowPort(theWindow), &context);
+        CGContextDrawImage(context, bounds, image);
+        QDEndCGContext(GetWindowPort(theWindow), &context);
+    }
+        break;
 
-		case IMGFMT_YV12:
-		case IMGFMT_IYUV:
-		case IMGFMT_I420:
-		case IMGFMT_UYVY:
-		case IMGFMT_YUY2:
-			if (EnterMoviesDone)
-			{
-				OSErr qterr;
-				CodecFlags flags = 0;
-				qterr = DecompressSequenceFrameWhen(seqId,
-													(char *)P,
-													image_buffer_size,
-													0, //codecFlagUseImageBuffer,
-													&flags,
-													NULL,
-													NULL);
-				if (qterr)
-				{
-					mp_msg(MSGT_VO, MSGL_ERR, "Quartz error: DecompressSequenceFrameWhen in flip_page (%d) flags:0x%08x\n", qterr, flags);
-				}
-			}
-		break;
-	}
+    case IMGFMT_YV12:
+    case IMGFMT_IYUV:
+    case IMGFMT_I420:
+    case IMGFMT_UYVY:
+    case IMGFMT_YUY2:
+        if (EnterMoviesDone)
+        {
+            OSErr qterr;
+            CodecFlags flags = 0;
 
-	if(!vo_quartz_fs)
-	{
-		CGContextRef context;
+            qterr = DecompressSequenceFrameWhen(seqId,
+                                                (char *)P,
+                                                image_buffer_size,
+                                                0, //codecFlagUseImageBuffer,
+                                                &flags,
+                                                NULL,
+                                                NULL);
+            if (qterr)
+            {
+                mp_msg(MSGT_VO, MSGL_ERR, "Quartz error: DecompressSequenceFrameWhen in flip_page (%d) flags:0x%08x\n", qterr, flags);
+            }
+        }
+        break;
+    }
+
+    if (!vo_quartz_fs)
+    {
+        CGContextRef context;
 
-		QDBeginCGContext(GetWindowPort(theWindow),&context);
-		//render resize box
-		CGContextBeginPath(context);
-		CGContextSetAllowsAntialiasing(context, false);
-		//CGContextSaveGState(context);
+        QDBeginCGContext(GetWindowPort(theWindow), &context);
+        // render resize box
+        CGContextBeginPath(context);
+        CGContextSetAllowsAntialiasing(context, false);
+        //CGContextSaveGState(context);
 
-		//line white
-		CGContextSetRGBStrokeColor (context, 0.2, 0.2, 0.2, 0.5);
-		CGContextMoveToPoint( context, winRect.right-1, 1); CGContextAddLineToPoint( context, winRect.right-1, 1);
-		CGContextMoveToPoint( context, winRect.right-1, 5); CGContextAddLineToPoint( context, winRect.right-5, 1);
-		CGContextMoveToPoint( context, winRect.right-1, 9); CGContextAddLineToPoint( context, winRect.right-9, 1);
-		CGContextStrokePath( context );
+        // line white
+        CGContextSetRGBStrokeColor(context, 0.2, 0.2, 0.2, 0.5);
+        CGContextMoveToPoint(context, winRect.right - 1, 1); CGContextAddLineToPoint(context, winRect.right - 1, 1);
+        CGContextMoveToPoint(context, winRect.right - 1, 5); CGContextAddLineToPoint(context, winRect.right - 5, 1);
+        CGContextMoveToPoint(context, winRect.right - 1, 9); CGContextAddLineToPoint(context, winRect.right - 9, 1);
+        CGContextStrokePath(context);
 
-		//line gray
-		CGContextSetRGBStrokeColor (context, 0.4, 0.4, 0.4, 0.5);
-		CGContextMoveToPoint( context, winRect.right-1, 2); CGContextAddLineToPoint( context, winRect.right-2, 1);
-		CGContextMoveToPoint( context, winRect.right-1, 6); CGContextAddLineToPoint( context, winRect.right-6, 1);
-		CGContextMoveToPoint( context, winRect.right-1, 10); CGContextAddLineToPoint( context, winRect.right-10, 1);
-		CGContextStrokePath( context );
+        // line gray
+        CGContextSetRGBStrokeColor(context, 0.4, 0.4, 0.4, 0.5);
+        CGContextMoveToPoint(context, winRect.right - 1, 2);  CGContextAddLineToPoint(context, winRect.right - 2, 1);
+        CGContextMoveToPoint(context, winRect.right - 1, 6);  CGContextAddLineToPoint(context, winRect.right - 6, 1);
+        CGContextMoveToPoint(context, winRect.right - 1, 10); CGContextAddLineToPoint(context, winRect.right - 10, 1);
+        CGContextStrokePath(context);
 
-		//line black
-		CGContextSetRGBStrokeColor (context, 0.6, 0.6, 0.6, 0.5);
-		CGContextMoveToPoint( context, winRect.right-1, 3); CGContextAddLineToPoint( context, winRect.right-3, 1);
-		CGContextMoveToPoint( context, winRect.right-1, 7); CGContextAddLineToPoint( context, winRect.right-7, 1);
-		CGContextMoveToPoint( context, winRect.right-1, 11); CGContextAddLineToPoint( context, winRect.right-11, 1);
-		CGContextStrokePath( context );
+        // line black
+        CGContextSetRGBStrokeColor(context, 0.6, 0.6, 0.6, 0.5);
+        CGContextMoveToPoint(context, winRect.right - 1, 3);  CGContextAddLineToPoint(context, winRect.right - 3, 1);
+        CGContextMoveToPoint(context, winRect.right - 1, 7);  CGContextAddLineToPoint(context, winRect.right - 7, 1);
+        CGContextMoveToPoint(context, winRect.right - 1, 11); CGContextAddLineToPoint(context, winRect.right - 11, 1);
+        CGContextStrokePath(context);
 
-		//CGContextRestoreGState( context );
-		CGContextFlush (context);
-		QDEndCGContext(GetWindowPort(theWindow),&context);
-	}
+        // CGContextRestoreGState( context );
+        CGContextFlush(context);
+        QDEndCGContext(GetWindowPort(theWindow), &context);
+    }
 
-	curTime  = TickCount()/60;
+    curTime = TickCount() / 60;
 
-	//auto hide mouse cursor (and future on-screen control?)
-	if(vo_quartz_fs && !mouseHide)
-	{
-		if( ((curTime - lastMouseHide) >= 5) || (lastMouseHide == 0) )
-		{
-			CGDisplayHideCursor(displayId);
-			mouseHide = TRUE;
-			lastMouseHide = curTime;
-		}
-	}
-
-	//update activity every 30 seconds to prevent
-	//screensaver from starting up.
-	if( ((curTime - lastScreensaverUpdate) >= 30) || (lastScreensaverUpdate == 0) )
-	{
-		UpdateSystemActivity(UsrActivity);
-		lastScreensaverUpdate = curTime;
-	}
+    // auto hide mouse cursor (and future on-screen control?)
+    if (vo_quartz_fs && !mouseHide)
+    {
+        if (((curTime - lastMouseHide) >= 5) || (lastMouseHide == 0))
+        {
+            CGDisplayHideCursor(displayId);
+            mouseHide = TRUE;
+            lastMouseHide = curTime;
+        }
+    }
+    // update activity every 30 seconds to prevent
+    // screensaver from starting up.
+    if (((curTime - lastScreensaverUpdate) >= 30) || (lastScreensaverUpdate == 0))
+    {
+        UpdateSystemActivity(UsrActivity);
+        lastScreensaverUpdate = curTime;
+    }
 }
 
-static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y)
+static int draw_slice(uint8_t * src[], int stride[], int w, int h, int x, int y)
 {
-	switch (image_format)
-	{
-		case IMGFMT_YV12:
-		case IMGFMT_I420:
-			memcpy_pic(((char*)P) + be2me_32(P->componentInfoY.offset) + x + imgRect.right * y, src[0], w, h, imgRect.right, stride[0]);
-			x=x/2;y=y/2;w=w/2;h=h/2;
+    switch (image_format)
+    {
+    case IMGFMT_YV12:
+    case IMGFMT_I420:
+        memcpy_pic(((char *)P) + be2me_32(P->componentInfoY.offset) + x + imgRect.right * y, src[0], w, h, imgRect.right, stride[0]);
+        x=x/2;y=y/2;w=w/2;h=h/2;
 
-			memcpy_pic(((char*)P) + be2me_32(P->componentInfoCb.offset) + x + imgRect.right / 2 * y, src[1], w, h, imgRect.right / 2, stride[1]);
-			memcpy_pic(((char*)P) + be2me_32(P->componentInfoCr.offset) + x + imgRect.right / 2 * y, src[2], w, h, imgRect.right / 2, stride[2]);
-			return 0;
+        memcpy_pic(((char *)P) + be2me_32(P->componentInfoCb.offset) + x + imgRect.right / 2 * y, src[1], w, h, imgRect.right / 2, stride[1]);
+        memcpy_pic(((char *)P) + be2me_32(P->componentInfoCr.offset) + x + imgRect.right / 2 * y, src[2], w, h, imgRect.right / 2, stride[2]);
+        return 0;
 
-		case IMGFMT_IYUV:
-			memcpy_pic(((char*)P) + be2me_32(P->componentInfoY.offset) + x + imgRect.right * y, src[0], w, h, imgRect.right, stride[0]);
-			x=x/2;y=y/2;w=w/2;h=h/2;
+    case IMGFMT_IYUV:
+        memcpy_pic(((char *)P) + be2me_32(P->componentInfoY.offset) + x + imgRect.right * y, src[0], w, h, imgRect.right, stride[0]);
+        x=x/2;y=y/2;w=w/2;h=h/2;
 
-			memcpy_pic(((char*)P) + be2me_32(P->componentInfoCr.offset) + x + imgRect.right / 2 * y, src[1], w, h, imgRect.right / 2, stride[1]);
-			memcpy_pic(((char*)P) + be2me_32(P->componentInfoCb.offset) + x + imgRect.right / 2 * y, src[2], w, h, imgRect.right / 2, stride[2]);
-			return 0;
-	}
-	return -1;
+        memcpy_pic(((char *)P) + be2me_32(P->componentInfoCr.offset) + x + imgRect.right / 2 * y, src[1], w, h, imgRect.right / 2, stride[1]);
+        memcpy_pic(((char *)P) + be2me_32(P->componentInfoCb.offset) + x + imgRect.right / 2 * y, src[2], w, h, imgRect.right / 2, stride[2]);
+        return 0;
+    }
+    return -1;
 }
 
-static int draw_frame(uint8_t *src[])
+static int draw_frame(uint8_t * src[])
 {
-	switch (image_format)
-	{
-		case IMGFMT_RGB32:
-			fast_memcpy(image_data,src[0],image_size);
-			return 0;
+    switch (image_format)
+    {
+    case IMGFMT_RGB32:
+        fast_memcpy(image_data, src[0], image_size);
+        return 0;
 
-		case IMGFMT_UYVY:
-		case IMGFMT_YUY2:
-			memcpy_pic(((char*)P), src[0], imgRect.right * 2, imgRect.bottom, imgRect.right * 2, imgRect.right * 2);
-			return 0;
-	}
-	return -1;
+    case IMGFMT_UYVY:
+    case IMGFMT_YUY2:
+        memcpy_pic(((char *)P), src[0], imgRect.right * 2, imgRect.bottom, imgRect.right * 2, imgRect.right * 2);
+        return 0;
+    }
+    return -1;
 }
 
 static int query_format(uint32_t format)
 {
-	image_format = format;
-	image_qtcodec = 0;
+    image_format = format;
+    image_qtcodec = 0;
 
-	if (format == IMGFMT_RGB32)
-	{
-		return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN;
+    if (format == IMGFMT_RGB32)
+    {
+        return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN;
     }
 
     if ((format == IMGFMT_YV12) || (format == IMGFMT_IYUV) || (format == IMGFMT_I420))
-	{
-		image_qtcodec = kMpegYUV420CodecType; //kYUV420CodecType ?;
-		return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE;
+    {
+        image_qtcodec = kMpegYUV420CodecType;   //kYUV420CodecType ?;
+        return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE;
     }
 
     if (format == IMGFMT_YUY2)
-	{
-		image_qtcodec = kComponentVideoUnsigned;
-		return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN;
+    {
+        image_qtcodec = kComponentVideoUnsigned;
+        return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN;
     }
 
     if (format == IMGFMT_UYVY)
-	{
-		image_qtcodec = k422YpCbCr8CodecType;
-		return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN;
-	}
+    {
+        image_qtcodec = k422YpCbCr8CodecType;
+        return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN;
+    }
 
     return 0;
 }
 
 static void uninit(void)
 {
-	OSErr qterr;
+    OSErr qterr;
 
-	switch (image_format)
-	{
-		case IMGFMT_YV12:
-		case IMGFMT_IYUV:
-		case IMGFMT_I420:
-		case IMGFMT_UYVY:
-		case IMGFMT_YUY2:
-		{
-			if (EnterMoviesDone)
-			{
-				qterr = CDSequenceEnd(seqId);
-				if (qterr)
-				{
-					mp_msg(MSGT_VO, MSGL_ERR, "Quartz error: CDSequenceEnd (%d)\n", qterr);
-				}
-			}
-			break;
-		}
-		default:
-			break;
-	}
+    switch (image_format)
+    {
+    case IMGFMT_YV12:
+    case IMGFMT_IYUV:
+    case IMGFMT_I420:
+    case IMGFMT_UYVY:
+    case IMGFMT_YUY2:
+    {
+        if (EnterMoviesDone)
+        {
+            qterr = CDSequenceEnd(seqId);
+            if (qterr)
+            {
+                mp_msg(MSGT_VO, MSGL_ERR, "Quartz error: CDSequenceEnd (%d)\n", qterr);
+            }
+        }
+        break;
+    }
+    default:
+        break;
+    }
 
-	ShowMenuBar();
+    ShowMenuBar();
 }
 
 static int preinit(const char *arg)
 {
-	int parse_err = 0;
+    int parse_err = 0;
 
     if(arg)
     {
         char *parse_pos = (char *)&arg[0];
+
         while (parse_pos[0] && !parse_err)
-		{
-			if (strncmp (parse_pos, "device_id=", 10) == 0)
-			{
-				parse_pos = &parse_pos[10];
+        {
+            if (strncmp(parse_pos, "device_id=", 10) == 0)
+            {
+                parse_pos = &parse_pos[10];
                 device_id = strtol(parse_pos, &parse_pos, 0);
             }
-            if (strncmp (parse_pos, "fs_res=", 7) == 0)
+            if (strncmp(parse_pos, "fs_res=", 7) == 0)
             {
-				parse_pos = &parse_pos[7];
-				fs_res_x = strtol(parse_pos, &parse_pos, 0);
-				parse_pos = &parse_pos[1];
-				fs_res_y = strtol(parse_pos, &parse_pos, 0);
+                parse_pos = &parse_pos[7];
+                fs_res_x = strtol(parse_pos, &parse_pos, 0);
+                parse_pos = &parse_pos[1];
+                fs_res_y = strtol(parse_pos, &parse_pos, 0);
             }
             if (parse_pos[0] == ':')
                 parse_pos = &parse_pos[1];
@@ -1161,330 +1166,328 @@
     }
 
 #if !defined (CONFIG_MACOSX_FINDER) || !defined (CONFIG_SDL)
-	//this chunk of code is heavily based off SDL_macosx.m from SDL
-	//the CPSEnableForegroundOperation that was here before is private and shouldn't be used
-	//replaced by a call to the 10.3+ TransformProcessType
-{
-	ProcessSerialNumber myProc, frProc;
-	Boolean sameProc;
+    // this chunk of code is heavily based off SDL_macosx.m from SDL
+    // the CPSEnableForegroundOperation that was here before is private and shouldn't be used
+    // replaced by a call to the 10.3+ TransformProcessType
+    {
+        ProcessSerialNumber myProc, frProc;
+        Boolean sameProc;
 
-	if (GetFrontProcess(&frProc) == noErr)
-	{
-		if (GetCurrentProcess(&myProc) == noErr)
-		{
-			if (SameProcess(&frProc, &myProc, &sameProc) == noErr && !sameProc)
-			{
-				TransformProcessType(&myProc, kProcessTransformToForegroundApplication);
-			}
-			SetFrontProcess(&myProc);
-		}
-	}
-}
+        if (GetFrontProcess(&frProc) == noErr)
+        {
+            if (GetCurrentProcess(&myProc) == noErr)
+            {
+                if (SameProcess(&frProc, &myProc, &sameProc) == noErr && !sameProc)
+                {
+                    TransformProcessType(&myProc, kProcessTransformToForegroundApplication);
+                }
+                SetFrontProcess(&myProc);
+            }
+        }
+    }
 #endif
 
     return 0;
 }
 
-static uint32_t draw_yuv_image(mp_image_t *mpi)
+static uint32_t draw_yuv_image(mp_image_t * mpi)
 {
-	// ATM we're only called for planar IMGFMT
-	// drawing is done directly in P
-	// and displaying is in flip_page.
-	return get_image_done ? VO_TRUE : VO_FALSE;
+    // ATM we're only called for planar IMGFMT
+    // drawing is done directly in P
+    // and displaying is in flip_page.
+    return get_image_done ? VO_TRUE : VO_FALSE;
 }
 
-static uint32_t get_yuv_image(mp_image_t *mpi)
+static uint32_t get_yuv_image(mp_image_t * mpi)
 {
-	if(mpi->type!=MP_IMGTYPE_EXPORT) return VO_FALSE;
+    if (mpi->type != MP_IMGTYPE_EXPORT) return VO_FALSE;
 
-	if(mpi->imgfmt!=image_format) return VO_FALSE;
+    if (mpi->imgfmt != image_format)    return VO_FALSE;
 
-	if(mpi->flags&MP_IMGFLAG_PLANAR)
-	{
-		if (mpi->num_planes != 3)
-		{
-			mp_msg(MSGT_VO, MSGL_ERR, "Quartz error: only 3 planes allowed in get_yuv_image for planar (%d) \n", mpi->num_planes);
-			return VO_FALSE;
-		}
+    if (mpi->flags & MP_IMGFLAG_PLANAR)
+    {
+        if (mpi->num_planes != 3)
+        {
+            mp_msg(MSGT_VO, MSGL_ERR, "Quartz error: only 3 planes allowed in get_yuv_image for planar (%d) \n", mpi->num_planes);
+            return VO_FALSE;
+        }
 
-		mpi->planes[0]=((char*)P) + be2me_32(P->componentInfoY.offset);
-		mpi->stride[0]=imgRect.right;
-		mpi->width=imgRect.right;
+        mpi->planes[0] = ((char *)P) + be2me_32(P->componentInfoY.offset);
+        mpi->stride[0] = imgRect.right;
+        mpi->width = imgRect.right;
 
-		if(mpi->flags&MP_IMGFLAG_SWAPPED)
-		{
-			// I420
-			mpi->planes[1]=((char*)P) + be2me_32(P->componentInfoCb.offset);
-			mpi->planes[2]=((char*)P) + be2me_32(P->componentInfoCr.offset);
-			mpi->stride[1]=imgRect.right/2;
-			mpi->stride[2]=imgRect.right/2;
-		}
-		else
-		{
-			// YV12
-			mpi->planes[1]=((char*)P) + be2me_32(P->componentInfoCr.offset);
-			mpi->planes[2]=((char*)P) + be2me_32(P->componentInfoCb.offset);
-			mpi->stride[1]=imgRect.right/2;
-			mpi->stride[2]=imgRect.right/2;
-		}
+        if (mpi->flags & MP_IMGFLAG_SWAPPED)
+        {
+            // I420
+            mpi->planes[1] = ((char *)P) + be2me_32(P->componentInfoCb.offset);
+            mpi->planes[2] = ((char *)P) + be2me_32(P->componentInfoCr.offset);
+            mpi->stride[1] = imgRect.right / 2;
+            mpi->stride[2] = imgRect.right / 2;
+        }
+        else
+        {
+            // YV12
+            mpi->planes[1] = ((char *)P) + be2me_32(P->componentInfoCr.offset);
+            mpi->planes[2] = ((char *)P) + be2me_32(P->componentInfoCb.offset);
+            mpi->stride[1] = imgRect.right / 2;
+            mpi->stride[2] = imgRect.right / 2;
+        }
 
-		mpi->flags|=MP_IMGFLAG_DIRECT;
-		get_image_done = 1;
-		return VO_TRUE;
-	}
-	else
-	{
-		// doesn't work yet
-		if (mpi->num_planes != 1)
-		{
-			mp_msg(MSGT_VO, MSGL_ERR, "Quartz error: only 1 plane allowed in get_yuv_image for packed (%d) \n", mpi->num_planes);
-			return VO_FALSE;
-		}
+        mpi->flags |= MP_IMGFLAG_DIRECT;
+        get_image_done = 1;
+        return VO_TRUE;
+    }
+    else
+    {
+        // doesn't work yet
+        if (mpi->num_planes != 1)
+        {
+            mp_msg(MSGT_VO, MSGL_ERR, "Quartz error: only 1 plane allowed in get_yuv_image for packed (%d) \n", mpi->num_planes);
+            return VO_FALSE;
+        }
 
-		mpi->planes[0] = (char*)P;
-		mpi->stride[0] = imgRect.right * 2;
-		mpi->width=imgRect.right;
-		mpi->flags|=MP_IMGFLAG_DIRECT;
-		get_image_done = 1;
-		return VO_TRUE;
-	}
-	return VO_FALSE;
+        mpi->planes[0] = (char *)P;
+        mpi->stride[0] = imgRect.right * 2;
+        mpi->width = imgRect.right;
+        mpi->flags |= MP_IMGFLAG_DIRECT;
+        get_image_done = 1;
+        return VO_TRUE;
+    }
+    return VO_FALSE;
 }
 
 static int control(uint32_t request, void *data, ...)
 {
-	switch (request)
-	{
-		case VOCTRL_PAUSE: return int_pause = 1;
-		case VOCTRL_RESUME: return int_pause = 0;
-		case VOCTRL_FULLSCREEN: vo_fs = (!(vo_fs)); window_fullscreen(); return VO_TRUE;
-		case VOCTRL_ONTOP: vo_ontop = (!(vo_ontop)); window_ontop(); return VO_TRUE;
-		case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data));
-		case VOCTRL_GET_PANSCAN: return VO_TRUE;
-		case VOCTRL_SET_PANSCAN: window_panscan(); return VO_TRUE;
+    switch (request)
+    {
+    case VOCTRL_PAUSE:        return int_pause = 1;
+    case VOCTRL_RESUME:       return int_pause = 0;
+    case VOCTRL_FULLSCREEN:   vo_fs = (!(vo_fs));        window_fullscreen(); return VO_TRUE;
+    case VOCTRL_ONTOP:        vo_ontop = (!(vo_ontop));  window_ontop();      return VO_TRUE;
+    case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t *) data));
+    case VOCTRL_GET_PANSCAN:  return VO_TRUE;
+    case VOCTRL_SET_PANSCAN:  window_panscan();          return VO_TRUE;
 
-		case VOCTRL_GET_IMAGE:
-			switch (image_format)
-			{
-				case IMGFMT_YV12:
-				case IMGFMT_IYUV:
-				case IMGFMT_I420:
-				case IMGFMT_UYVY:
-				case IMGFMT_YUY2:
-					return get_yuv_image(data);
-					break;
-				default:
-					break;
-			}
-		case VOCTRL_DRAW_IMAGE:
-			switch (image_format)
-			{
-				case IMGFMT_YV12:
-				case IMGFMT_IYUV:
-				case IMGFMT_I420:
-				case IMGFMT_UYVY:
-				case IMGFMT_YUY2:
-					return draw_yuv_image(data);
-					break;
-				default:
-					break;
-			}
-	}
-	return VO_NOTIMPL;
+    case VOCTRL_GET_IMAGE:
+        switch (image_format)
+        {
+        case IMGFMT_YV12:
+        case IMGFMT_IYUV:
+        case IMGFMT_I420:
+        case IMGFMT_UYVY:
+        case IMGFMT_YUY2:
+            return get_yuv_image(data);
+            break;
+        default:
+            break;
+        }
+    case VOCTRL_DRAW_IMAGE:
+        switch (image_format)
+        {
+        case IMGFMT_YV12:
+        case IMGFMT_IYUV:
+        case IMGFMT_I420:
+        case IMGFMT_UYVY:
+        case IMGFMT_YUY2:
+            return draw_yuv_image(data);
+            break;
+        default:
+            break;
+        }
+    }
+    return VO_NOTIMPL;
 }
 
 void window_resized()
 {
-	float aspectX;
-	float aspectY;
+    float aspectX;
+    float aspectY;
 
-	int padding = 0;
+    int padding = 0;
 
-	uint32_t d_width;
-	uint32_t d_height;
+    uint32_t d_width;
+    uint32_t d_height;
 
-	CGRect tmpBounds;
+    CGRect tmpBounds;
 
-	CGContextRef context;
+    CGContextRef context;
 
-	GetWindowPortBounds(theWindow, &winRect );
+    GetWindowPortBounds(theWindow, &winRect);
 
-	if(vo_keepaspect)
-	{
-	aspect( &d_width, &d_height, A_NOZOOM);
-	d_height = ((float)d_width/movie_aspect);
+    if (vo_keepaspect)
+    {
+        aspect(&d_width, &d_height, A_NOZOOM);
+        d_height = ((float)d_width / movie_aspect);
 
-	aspectX = (float)((float)winRect.right/(float)d_width);
-	aspectY = (float)((float)(winRect.bottom)/(float)d_height);
+        aspectX = (float)((float)winRect.right / (float)d_width);
+        aspectY = (float)((float)(winRect.bottom) / (float)d_height);
 
-	if((d_height*aspectX)>(winRect.bottom))
-	{
-		padding = (winRect.right - d_width*aspectY)/2;
-		SetRect(&dstRect, padding, 0, d_width*aspectY+padding, d_height*aspectY);
-	}
-	else
-	{
-		padding = ((winRect.bottom) - d_height*aspectX)/2;
-		SetRect(&dstRect, 0, padding, (d_width*aspectX), d_height*aspectX+padding);
-	}
-	}
-	else
-	{
-		SetRect(&dstRect, 0, 0, winRect.right, winRect.bottom);
-	}
+        if ((d_height * aspectX) > (winRect.bottom))
+        {
+            padding = (winRect.right - d_width * aspectY) / 2;
+            SetRect(&dstRect, padding, 0, d_width * aspectY + padding, d_height * aspectY);
+        }
+        else
+        {
+            padding = ((winRect.bottom) - d_height * aspectX) / 2;
+            SetRect(&dstRect, 0, padding, (d_width * aspectX), d_height * aspectX + padding);
+        }
+    }
+    else
+    {
+        SetRect(&dstRect, 0, 0, winRect.right, winRect.bottom);
+    }
 
-	switch (image_format)
-	{
-		case IMGFMT_RGB32:
-		{
-			bounds = CGRectMake(dstRect.left, dstRect.top, dstRect.right-dstRect.left, dstRect.bottom-dstRect.top);
-			break;
-		}
-		case IMGFMT_YV12:
-		case IMGFMT_IYUV:
-		case IMGFMT_I420:
-		case IMGFMT_UYVY:
-		case IMGFMT_YUY2:
-		{
-			long scale_X = FixDiv(Long2Fix(dstRect.right - dstRect.left),Long2Fix(imgRect.right));
-			long scale_Y = FixDiv(Long2Fix(dstRect.bottom - dstRect.top),Long2Fix(imgRect.bottom));
+    switch (image_format)
+    {
+    case IMGFMT_RGB32:
+    {
+        bounds = CGRectMake(dstRect.left, dstRect.top, dstRect.right - dstRect.left, dstRect.bottom - dstRect.top);
+        break;
+    }
+    case IMGFMT_YV12:
+    case IMGFMT_IYUV:
+    case IMGFMT_I420:
+    case IMGFMT_UYVY:
+    case IMGFMT_YUY2:
+    {
+        long scale_X = FixDiv(Long2Fix(dstRect.right - dstRect.left), Long2Fix(imgRect.right));
+        long scale_Y = FixDiv(Long2Fix(dstRect.bottom - dstRect.top), Long2Fix(imgRect.bottom));
 
-			SetIdentityMatrix(&matrix);
-			if (((dstRect.right - dstRect.left)   != imgRect.right) || ((dstRect.bottom - dstRect.right) != imgRect.bottom))
-			{
-				ScaleMatrix(&matrix, scale_X, scale_Y, 0, 0);
+        SetIdentityMatrix(&matrix);
+        if (((dstRect.right - dstRect.left) != imgRect.right) || ((dstRect.bottom - dstRect.right) != imgRect.bottom))
+        {
+            ScaleMatrix(&matrix, scale_X, scale_Y, 0, 0);
 
-				if (padding > 0)
-				{
-					TranslateMatrix(&matrix, Long2Fix(dstRect.left), Long2Fix(dstRect.top));
-				}
-			}
+            if (padding > 0)
+            {
+                TranslateMatrix(&matrix, Long2Fix(dstRect.left), Long2Fix(dstRect.top));
+            }
+        }
 
-			SetDSequenceMatrix(seqId, &matrix);
-			break;
-		}
-		default:
-			break;
-	}
+        SetDSequenceMatrix(seqId, &matrix);
+        break;
+    }
+    default:
+        break;
+    }
 
-	//Clear Background
-	tmpBounds = CGRectMake( 0, 0, winRect.right, winRect.bottom);
-	QDBeginCGContext(GetWindowPort(theWindow),&context);
-	CGContextFillRect(context, tmpBounds);
-	QDEndCGContext(GetWindowPort(theWindow),&context);
+    // Clear Background
+    tmpBounds = CGRectMake(0, 0, winRect.right, winRect.bottom);
+    QDBeginCGContext(GetWindowPort(theWindow), &context);
+    CGContextFillRect(context, tmpBounds);
+    QDEndCGContext(GetWindowPort(theWindow), &context);
 }
 
 void window_ontop()
 {
-	if(!vo_quartz_fs)
-	{
-	//Cycle between level
-	winLevel++;
-	if(winLevel>2)
-		winLevel = 1;
-	}
-	SetWindowGroupLevel(winGroup, CGWindowLevelForKey(levelList[winLevel]));
+    if (!vo_quartz_fs)
+    {
+        // Cycle between level
+        winLevel++;
+        if (winLevel > 2)
+            winLevel = 1;
+    }
+    SetWindowGroupLevel(winGroup, CGWindowLevelForKey(levelList[winLevel]));
 }
 
 void window_fullscreen()
 {
-	//go fullscreen
-	if(vo_fs)
-	{
-		if(winLevel != 0)
-		{
-			if(displayId == kCGDirectMainDisplay)
-			{
-				SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
-				CGDisplayHideCursor(displayId);
-				mouseHide = TRUE;
-			}
+    // go fullscreen
+    if (vo_fs)
+    {
+        if (winLevel != 0)
+        {
+            if (displayId == kCGDirectMainDisplay)
+            {
+                SetSystemUIMode(kUIModeAllHidden, kUIOptionAutoShowMenuBar);
+                CGDisplayHideCursor(displayId);
+                mouseHide = TRUE;
+            }
 
-			if(fs_res_x != 0 || fs_res_y != 0)
-			{
-				CFDictionaryRef mode;
-				size_t desiredBitDepth = 32;
-				boolean_t exactMatch;
+            if (fs_res_x != 0 || fs_res_y != 0)
+            {
+                CFDictionaryRef mode;
+                size_t desiredBitDepth = 32;
+                boolean_t exactMatch;
 
-				originalMode = CGDisplayCurrentMode(displayId);
+                originalMode = CGDisplayCurrentMode(displayId);
 
-				mode = CGDisplayBestModeForParameters(displayId, desiredBitDepth, fs_res_x, fs_res_y, &exactMatch);
+                mode = CGDisplayBestModeForParameters(displayId, desiredBitDepth, fs_res_x, fs_res_y, &exactMatch);
 
-				if (mode != NULL)
-				{
-					if (!exactMatch)
-					{
-						//Warn if the mode doesn't match exactly
-						mp_msg(MSGT_VO, MSGL_WARN, "Quartz warning: did not get exact mode match (got %dx%d) \n", (int) CFDictionaryGetValue(mode, kCGDisplayWidth), (int) CFDictionaryGetValue(mode, kCGDisplayHeight));
-					}
+                if (mode != NULL)
+                {
+                    if (!exactMatch)
+                    {
+                        // Warn if the mode doesn't match exactly
+                      mp_msg(MSGT_VO, MSGL_WARN, "Quartz warning: did not get exact mode match (got %dx%d) \n", (int)CFDictionaryGetValue(mode, kCGDisplayWidth), (int)CFDictionaryGetValue(mode, kCGDisplayHeight));
+                    }
 
-					CGDisplayCapture(displayId);
-					CGDisplaySwitchToMode(displayId, mode);
-				}
-				else
-				{
-					mp_msg(MSGT_VO, MSGL_ERR, "Quartz error: can't switch to fullscreen \n");
-				}
+                    CGDisplayCapture(displayId);
+                    CGDisplaySwitchToMode(displayId, mode);
+                }
+                else
+                {
+                    mp_msg(MSGT_VO, MSGL_ERR, "Quartz error: can't switch to fullscreen \n");
+                }
 
-				//Get Main device info///////////////////////////////////////////////////
-				displayRect = CGDisplayBounds(displayId);
-			}
-		}
-
-		//save old window size
-		if (!vo_quartz_fs)
-		{
-			GetWindowPortBounds(theWindow, &oldWinRect);
-			GetWindowBounds(theWindow, kWindowContentRgn, &oldWinBounds);
-		}
-
-		//go fullscreen
-		panscan_calc();
-		ChangeWindowAttributes(theWindow, kWindowNoShadowAttribute, 0);
-		MoveWindow(theWindow, displayRect.origin.x-(vo_panscan_x >> 1), displayRect.origin.y-(vo_panscan_y >> 1), 1);
-		SizeWindow(theWindow, displayRect.size.width+vo_panscan_x, displayRect.size.height+vo_panscan_y,1);
+                // Get Main device info///////////////////////////////////////////////////
+                displayRect = CGDisplayBounds(displayId);
+            }
+        }
+        // save old window size
+        if (!vo_quartz_fs)
+        {
+            GetWindowPortBounds(theWindow, &oldWinRect);
+            GetWindowBounds(theWindow, kWindowContentRgn, &oldWinBounds);
+        }
+        // go fullscreen
+        panscan_calc();
+        ChangeWindowAttributes(theWindow, kWindowNoShadowAttribute, 0);
+        MoveWindow(theWindow, displayRect.origin.x - (vo_panscan_x >> 1), displayRect.origin.y - (vo_panscan_y >> 1), 1);
+        SizeWindow(theWindow, displayRect.size.width + vo_panscan_x, displayRect.size.height + vo_panscan_y, 1);
 
-		vo_quartz_fs = 1;
-	}
-	else //go back to windowed mode
-	{
-		vo_quartz_fs = 0;
-		if(originalMode != NULL)
-		{
-			CGDisplaySwitchToMode(displayId, originalMode);
-			CGDisplayRelease(displayId);
+        vo_quartz_fs = 1;
+    }
+    else //go back to windowed mode
+    {
+        vo_quartz_fs = 0;
+        if (originalMode != NULL)
+        {
+            CGDisplaySwitchToMode(displayId, originalMode);
+            CGDisplayRelease(displayId);
 
-			//Get Main device info///////////////////////////////////////////////////
-			displayRect = CGDisplayBounds(displayId);
+            // Get Main device info///////////////////////////////////////////////////
+            displayRect = CGDisplayBounds(displayId);
 
-			originalMode = NULL;
-		}
-		SetSystemUIMode( kUIModeNormal, 0);
+            originalMode = NULL;
+        }
+        SetSystemUIMode(kUIModeNormal, 0);
 
-		//show mouse cursor
-		CGDisplayShowCursor(displayId);
-		mouseHide = FALSE;
+        // show mouse cursor
+        CGDisplayShowCursor(displayId);
+        mouseHide = FALSE;
 
-		//revert window to previous setting
-		ChangeWindowAttributes(theWindow, 0, kWindowNoShadowAttribute);
-		SizeWindow(theWindow, oldWinRect.right, oldWinRect.bottom,1);
-		MoveWindow(theWindow, oldWinBounds.left, oldWinBounds.top, 1);
-	}
-	window_resized();
+        // revert window to previous setting
+        ChangeWindowAttributes(theWindow, 0, kWindowNoShadowAttribute);
+        SizeWindow(theWindow, oldWinRect.right, oldWinRect.bottom, 1);
+        MoveWindow(theWindow, oldWinBounds.left, oldWinBounds.top, 1);
+    }
+    window_resized();
 }
 
 void window_panscan()
 {
-	panscan_calc();
+    panscan_calc();
 
-	if(vo_panscan > 0)
-		CheckMenuItem (aspectMenu, 2, 1);
-	else
-		CheckMenuItem (aspectMenu, 2, 0);
+    if (vo_panscan > 0)
+        CheckMenuItem(aspectMenu, 2, 1);
+    else
+        CheckMenuItem(aspectMenu, 2, 0);
 
-	if(vo_quartz_fs)
-	{
-		MoveWindow(theWindow, displayRect.origin.x-(vo_panscan_x >> 1), displayRect.origin.y-(vo_panscan_y >> 1), 1);
-		SizeWindow(theWindow, displayRect.size.width+vo_panscan_x, displayRect.size.height+vo_panscan_y,1);
-	}
+    if (vo_quartz_fs)
+    {
+        MoveWindow(theWindow, displayRect.origin.x - (vo_panscan_x >> 1), displayRect.origin.y - (vo_panscan_y >> 1), 1);
+        SizeWindow(theWindow, displayRect.size.width + vo_panscan_x, displayRect.size.height + vo_panscan_y, 1);
+    }
 }