--- a/src/video/photon/SDL_phyuv.c	Thu Jul 06 18:01:37 2006 +0000
+++ b/src/video/photon/SDL_phyuv.c	Mon Jul 10 21:04:37 2006 +0000
@@ -36,25 +36,25 @@
 #define OVERLAY_STATE_ACTIVE 1
 
 /* The functions are used to manipulate software video overlays */
-static struct private_yuvhwfuncs ph_yuvfuncs =
-{
+static struct private_yuvhwfuncs ph_yuvfuncs = {
     ph_LockYUVOverlay,
     ph_UnlockYUVOverlay,
     ph_DisplayYUVOverlay,
     ph_FreeYUVOverlay
 };
 
-int grab_ptrs2(PgVideoChannel_t* channel, FRAMEDATA* Frame0, FRAMEDATA* Frame1)
+int
+grab_ptrs2(PgVideoChannel_t * channel, FRAMEDATA * Frame0, FRAMEDATA * Frame1)
 {
     int planes = 0;
 
     /* Buffers have moved; re-obtain the pointers */
-    Frame0->Y = (unsigned char *)PdGetOffscreenContextPtr(channel->yplane1);
-    Frame1->Y = (unsigned char *)PdGetOffscreenContextPtr(channel->yplane2);
-    Frame0->U = (unsigned char *)PdGetOffscreenContextPtr(channel->vplane1);
-    Frame1->U = (unsigned char *)PdGetOffscreenContextPtr(channel->vplane2);
-    Frame0->V = (unsigned char *)PdGetOffscreenContextPtr(channel->uplane1);
-    Frame1->V = (unsigned char *)PdGetOffscreenContextPtr(channel->uplane2);
+    Frame0->Y = (unsigned char *) PdGetOffscreenContextPtr(channel->yplane1);
+    Frame1->Y = (unsigned char *) PdGetOffscreenContextPtr(channel->yplane2);
+    Frame0->U = (unsigned char *) PdGetOffscreenContextPtr(channel->vplane1);
+    Frame1->U = (unsigned char *) PdGetOffscreenContextPtr(channel->vplane2);
+    Frame0->V = (unsigned char *) PdGetOffscreenContextPtr(channel->uplane1);
+    Frame1->V = (unsigned char *) PdGetOffscreenContextPtr(channel->uplane2);
 
     if (Frame0->Y)
         planes++;
@@ -68,21 +68,22 @@
     return planes;
 }
 
-SDL_Overlay* ph_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, SDL_Surface* display)
+SDL_Overlay *
+ph_CreateYUVOverlay(_THIS, int width, int height, Uint32 format,
+                    SDL_Surface * display)
 {
-    SDL_Overlay* overlay;
-    struct private_yuvhwdata* hwdata;
+    SDL_Overlay *overlay;
+    struct private_yuvhwdata *hwdata;
     int vidport;
     int rtncode;
     int planes;
-    int i=0;
+    int i = 0;
     PhPoint_t pos;
 
     /* Create the overlay structure */
     overlay = SDL_calloc(1, sizeof(SDL_Overlay));
 
-    if (overlay == NULL)
-    {
+    if (overlay == NULL) {
         SDL_OutOfMemory();
         return NULL;
     }
@@ -92,15 +93,14 @@
     overlay->w = width;
     overlay->h = height;
     overlay->hwdata = NULL;
-	
+
     /* Set up the YUV surface function structure */
     overlay->hwfuncs = &ph_yuvfuncs;
 
     /* Create the pixel data and lookup tables */
     hwdata = SDL_calloc(1, sizeof(struct private_yuvhwdata));
 
-    if (hwdata == NULL)
-    {
+    if (hwdata == NULL) {
         SDL_OutOfMemory();
         SDL_FreeYUVOverlay(overlay);
         return NULL;
@@ -109,18 +109,19 @@
     overlay->hwdata = hwdata;
 
     PhDCSetCurrent(0);
-    if (overlay->hwdata->channel == NULL)
-    {
-        if ((overlay->hwdata->channel = PgCreateVideoChannel(Pg_VIDEO_CHANNEL_SCALER, 0)) == NULL)
-        {
-            SDL_SetError("ph_CreateYUVOverlay(): Create channel failed: %s\n", strerror(errno));
+    if (overlay->hwdata->channel == NULL) {
+        if ((overlay->hwdata->channel =
+             PgCreateVideoChannel(Pg_VIDEO_CHANNEL_SCALER, 0)) == NULL) {
+            SDL_SetError
+                ("ph_CreateYUVOverlay(): Create channel failed: %s\n",
+                 strerror(errno));
             SDL_FreeYUVOverlay(overlay);
             return NULL;
 
         }
     }
 
-    overlay->hwdata->forcedredraw=0;
+    overlay->hwdata->forcedredraw = 0;
 
     PtGetAbsPosition(window, &pos.x, &pos.y);
     overlay->hwdata->CurrentWindowPos.x = pos.x;
@@ -130,40 +131,41 @@
     overlay->hwdata->CurrentViewPort.size.w = width;
     overlay->hwdata->CurrentViewPort.size.h = height;
     overlay->hwdata->State = OVERLAY_STATE_UNINIT;
-    overlay->hwdata->FrameData0 = (FRAMEDATA *) SDL_calloc(1, sizeof(FRAMEDATA));
-    overlay->hwdata->FrameData1 = (FRAMEDATA *) SDL_calloc(1, sizeof(FRAMEDATA));
+    overlay->hwdata->FrameData0 =
+        (FRAMEDATA *) SDL_calloc(1, sizeof(FRAMEDATA));
+    overlay->hwdata->FrameData1 =
+        (FRAMEDATA *) SDL_calloc(1, sizeof(FRAMEDATA));
 
     vidport = -1;
-    i=0;
-    
-    overlay->hwdata->ischromakey=0;
+    i = 0;
+
+    overlay->hwdata->ischromakey = 0;
 
     do {
         SDL_memset(&overlay->hwdata->caps, 0x00, sizeof(PgScalerCaps_t));
         overlay->hwdata->caps.size = sizeof(PgScalerCaps_t);
-        rtncode = PgGetScalerCapabilities(overlay->hwdata->channel, i, &overlay->hwdata->caps);
-        if (rtncode==0)
-        { 
-            if (overlay->hwdata->caps.format==format)
-            {
-               if ((overlay->hwdata->caps.flags & Pg_SCALER_CAP_DST_CHROMA_KEY) == Pg_SCALER_CAP_DST_CHROMA_KEY)
-               {
-                   overlay->hwdata->ischromakey=1;
-               }
-               vidport=1;
-               break;
+        rtncode =
+            PgGetScalerCapabilities(overlay->hwdata->channel, i,
+                                    &overlay->hwdata->caps);
+        if (rtncode == 0) {
+            if (overlay->hwdata->caps.format == format) {
+                if ((overlay->hwdata->caps.
+                     flags & Pg_SCALER_CAP_DST_CHROMA_KEY) ==
+                    Pg_SCALER_CAP_DST_CHROMA_KEY) {
+                    overlay->hwdata->ischromakey = 1;
+                }
+                vidport = 1;
+                break;
             }
-        }
-        else
-        {
-           break;
+        } else {
+            break;
         }
         i++;
-    } while(1);
+    }
+    while (1);
 
 
-    if (vidport == -1)
-    {
+    if (vidport == -1) {
         SDL_SetError("No available video ports for requested format\n");
         SDL_FreeYUVOverlay(overlay);
         return NULL;
@@ -176,53 +178,55 @@
     overlay->hwdata->props.src_dim.h = height;
 
     /* overlay->hwdata->chromakey = PgGetOverlayChromaColor(); */
-    overlay->hwdata->chromakey = PgRGB(12, 6, 12); /* very dark pink color */
+    overlay->hwdata->chromakey = PgRGB(12, 6, 12);      /* very dark pink color */
     overlay->hwdata->props.color_key = overlay->hwdata->chromakey;
 
-    PhAreaToRect(&overlay->hwdata->CurrentViewPort, &overlay->hwdata->props.viewport);
+    PhAreaToRect(&overlay->hwdata->CurrentViewPort,
+                 &overlay->hwdata->props.viewport);
 
     overlay->hwdata->props.flags = Pg_SCALER_PROP_DOUBLE_BUFFER;
 
-    if ((overlay->hwdata->ischromakey)&&(overlay->hwdata->chromakey))
-    {
+    if ((overlay->hwdata->ischromakey) && (overlay->hwdata->chromakey)) {
         overlay->hwdata->props.flags |= Pg_SCALER_PROP_CHROMA_ENABLE;
-        overlay->hwdata->props.flags |= Pg_SCALER_PROP_CHROMA_SPECIFY_KEY_MASK;
-    } 
-    else
-    {
+        overlay->hwdata->props.flags |=
+            Pg_SCALER_PROP_CHROMA_SPECIFY_KEY_MASK;
+    } else {
         overlay->hwdata->props.flags &= ~Pg_SCALER_PROP_CHROMA_ENABLE;
     }
 
-    rtncode = PgConfigScalerChannel(overlay->hwdata->channel, &overlay->hwdata->props);
+    rtncode =
+        PgConfigScalerChannel(overlay->hwdata->channel,
+                              &overlay->hwdata->props);
 
-    switch(rtncode)
-    {
-        case -1: SDL_SetError("PgConfigScalerChannel failed\n");
-                 SDL_FreeYUVOverlay(overlay);
-                 return NULL;
-        case 1:
-        case 0:
-        default:
-                 break;
+    switch (rtncode) {
+    case -1:
+        SDL_SetError("PgConfigScalerChannel failed\n");
+        SDL_FreeYUVOverlay(overlay);
+        return NULL;
+    case 1:
+    case 0:
+    default:
+        break;
     }
 
-    planes = grab_ptrs2(overlay->hwdata->channel, overlay->hwdata->FrameData0, overlay->hwdata->FrameData1);
+    planes =
+        grab_ptrs2(overlay->hwdata->channel, overlay->hwdata->FrameData0,
+                   overlay->hwdata->FrameData1);
 
-    if(overlay->hwdata->channel->yplane1 != NULL)
+    if (overlay->hwdata->channel->yplane1 != NULL)
         overlay->hwdata->YStride = overlay->hwdata->channel->yplane1->pitch;
-    if(overlay->hwdata->channel->vplane1 != NULL)
+    if (overlay->hwdata->channel->vplane1 != NULL)
         overlay->hwdata->UStride = overlay->hwdata->channel->vplane1->pitch;
-    if(overlay->hwdata->channel->uplane1 != NULL)
+    if (overlay->hwdata->channel->uplane1 != NULL)
         overlay->hwdata->VStride = overlay->hwdata->channel->uplane1->pitch;
 
     /* check for the validness of all planes */
     if ((overlay->hwdata->channel->yplane1 == NULL) &&
         (overlay->hwdata->channel->uplane1 == NULL) &&
-        (overlay->hwdata->channel->vplane1 == NULL))
-    {
-       SDL_FreeYUVOverlay(overlay);
-       SDL_SetError("PgConfigScaler() returns all planes equal NULL\n");
-       return NULL;
+        (overlay->hwdata->channel->vplane1 == NULL)) {
+        SDL_FreeYUVOverlay(overlay);
+        SDL_SetError("PgConfigScaler() returns all planes equal NULL\n");
+        return NULL;
     }
 /*
     overlay->hwdata->current = PgNextVideoFrame(overlay->hwdata->channel);
@@ -245,43 +249,39 @@
     /* Find the pitch and offset values for the overlay */
     overlay->planes = planes;
     overlay->pitches = SDL_calloc(overlay->planes, sizeof(Uint16));
-    overlay->pixels  = SDL_calloc(overlay->planes, sizeof(Uint8*));
-    if (!overlay->pitches || !overlay->pixels)
-    {
+    overlay->pixels = SDL_calloc(overlay->planes, sizeof(Uint8 *));
+    if (!overlay->pitches || !overlay->pixels) {
         SDL_OutOfMemory();
         SDL_FreeYUVOverlay(overlay);
-        return(NULL);
+        return (NULL);
     }
 
-    if (overlay->planes > 0)
-    {
+    if (overlay->planes > 0) {
         overlay->pitches[0] = overlay->hwdata->channel->yplane1->pitch;
-        overlay->pixels[0]  = overlay->hwdata->CurrentFrameData->Y;
+        overlay->pixels[0] = overlay->hwdata->CurrentFrameData->Y;
     }
-    if (overlay->planes > 1)
-    {
+    if (overlay->planes > 1) {
         overlay->pitches[1] = overlay->hwdata->channel->vplane1->pitch;
-        overlay->pixels[1]  = overlay->hwdata->CurrentFrameData->U;
+        overlay->pixels[1] = overlay->hwdata->CurrentFrameData->U;
     }
-    if (overlay->planes > 2)
-    {
+    if (overlay->planes > 2) {
         overlay->pitches[2] = overlay->hwdata->channel->uplane1->pitch;
-        overlay->pixels[2]  = overlay->hwdata->CurrentFrameData->V;
+        overlay->pixels[2] = overlay->hwdata->CurrentFrameData->V;
     }
 
     overlay->hwdata->State = OVERLAY_STATE_ACTIVE;
     overlay->hwdata->scaler_on = 0;
     overlay->hw_overlay = 1;
 
-    current_overlay=overlay;
+    current_overlay = overlay;
 
     return overlay;
 }
 
-int ph_LockYUVOverlay(_THIS, SDL_Overlay* overlay)
+int
+ph_LockYUVOverlay(_THIS, SDL_Overlay * overlay)
 {
-    if (overlay == NULL)
-    {
+    if (overlay == NULL) {
         return -1;
     }
 
@@ -321,44 +321,43 @@
     }
 */
 
-    return(0);
+    return (0);
 }
 
-void ph_UnlockYUVOverlay(_THIS, SDL_Overlay* overlay)
+void
+ph_UnlockYUVOverlay(_THIS, SDL_Overlay * overlay)
 {
-    if (overlay == NULL)
-    {
+    if (overlay == NULL) {
         return;
     }
 
     overlay->hwdata->locked = 0;
 }
 
-int ph_DisplayYUVOverlay(_THIS, SDL_Overlay* overlay, SDL_Rect* src, SDL_Rect* dst)
+int
+ph_DisplayYUVOverlay(_THIS, SDL_Overlay * overlay, SDL_Rect * src,
+                     SDL_Rect * dst)
 {
     int rtncode;
     PhPoint_t pos;
     SDL_Rect backrect;
     PhRect_t windowextent;
-    int winchanged=0;
+    int winchanged = 0;
 
-    if ((overlay == NULL) || (overlay->hwdata==NULL))
-    {
+    if ((overlay == NULL) || (overlay->hwdata == NULL)) {
         return -1;
     }
 
-    if (overlay->hwdata->State == OVERLAY_STATE_UNINIT)
-    {
+    if (overlay->hwdata->State == OVERLAY_STATE_UNINIT) {
         return -1;
     }
 
     PtGetAbsPosition(window, &pos.x, &pos.y);
-    if ((pos.x!=overlay->hwdata->CurrentWindowPos.x) ||
-        (pos.y!=overlay->hwdata->CurrentWindowPos.y))
-    {
-       winchanged=1;
-       overlay->hwdata->CurrentWindowPos.x=pos.x;
-       overlay->hwdata->CurrentWindowPos.y=pos.y;
+    if ((pos.x != overlay->hwdata->CurrentWindowPos.x) ||
+        (pos.y != overlay->hwdata->CurrentWindowPos.y)) {
+        winchanged = 1;
+        overlay->hwdata->CurrentWindowPos.x = pos.x;
+        overlay->hwdata->CurrentWindowPos.y = pos.y;
     }
 
     /* If CurrentViewPort position/size has been changed, then move/resize the viewport */
@@ -366,51 +365,57 @@
         (overlay->hwdata->CurrentViewPort.pos.y != dst->y) ||
         (overlay->hwdata->CurrentViewPort.size.w != dst->w) ||
         (overlay->hwdata->CurrentViewPort.size.h != dst->h) ||
-        (overlay->hwdata->scaler_on==0) || (winchanged==1) ||
-        (overlay->hwdata->forcedredraw==1))
-    {
+        (overlay->hwdata->scaler_on == 0) || (winchanged == 1) ||
+        (overlay->hwdata->forcedredraw == 1)) {
 
-        if (overlay->hwdata->ischromakey==1)
-        {
+        if (overlay->hwdata->ischromakey == 1) {
             /* restore screen behind the overlay/chroma color. */
-            backrect.x=overlay->hwdata->CurrentViewPort.pos.x;
-            backrect.y=overlay->hwdata->CurrentViewPort.pos.y;
-            backrect.w=overlay->hwdata->CurrentViewPort.size.w;
-            backrect.h=overlay->hwdata->CurrentViewPort.size.h;
+            backrect.x = overlay->hwdata->CurrentViewPort.pos.x;
+            backrect.y = overlay->hwdata->CurrentViewPort.pos.y;
+            backrect.w = overlay->hwdata->CurrentViewPort.size.w;
+            backrect.h = overlay->hwdata->CurrentViewPort.size.h;
             this->UpdateRects(this, 1, &backrect);
 
             /* Draw the new rectangle of the chroma color at the viewport position */
             PgSetFillColor(overlay->hwdata->chromakey);
-            PgDrawIRect(dst->x, dst->y, dst->x+dst->w-1, dst->y+dst->h-1, Pg_DRAW_FILL);
+            PgDrawIRect(dst->x, dst->y, dst->x + dst->w - 1,
+                        dst->y + dst->h - 1, Pg_DRAW_FILL);
             PgFlush();
         }
 
         overlay->hwdata->props.flags |= Pg_SCALER_PROP_SCALER_ENABLE;
         overlay->hwdata->scaler_on = 1;
 
-        PhWindowQueryVisible(Ph_QUERY_CONSOLE, 0, PtWidgetRid(window), &windowextent);
-        overlay->hwdata->CurrentViewPort.pos.x = pos.x-windowextent.ul.x+dst->x;
-        overlay->hwdata->CurrentViewPort.pos.y = pos.y-windowextent.ul.y+dst->y;
+        PhWindowQueryVisible(Ph_QUERY_CONSOLE, 0, PtWidgetRid(window),
+                             &windowextent);
+        overlay->hwdata->CurrentViewPort.pos.x =
+            pos.x - windowextent.ul.x + dst->x;
+        overlay->hwdata->CurrentViewPort.pos.y =
+            pos.y - windowextent.ul.y + dst->y;
         overlay->hwdata->CurrentViewPort.size.w = dst->w;
         overlay->hwdata->CurrentViewPort.size.h = dst->h;
-        PhAreaToRect(&overlay->hwdata->CurrentViewPort, &overlay->hwdata->props.viewport);
+        PhAreaToRect(&overlay->hwdata->CurrentViewPort,
+                     &overlay->hwdata->props.viewport);
         overlay->hwdata->CurrentViewPort.pos.x = dst->x;
         overlay->hwdata->CurrentViewPort.pos.y = dst->y;
 
-        rtncode = PgConfigScalerChannel(overlay->hwdata->channel, &(overlay->hwdata->props));
+        rtncode =
+            PgConfigScalerChannel(overlay->hwdata->channel,
+                                  &(overlay->hwdata->props));
 
-        switch(rtncode)
-        {
-            case -1:
-                     SDL_SetError("PgConfigScalerChannel() function failed\n");
-                     SDL_FreeYUVOverlay(overlay);
-                     return -1;
-            case 1:
-                     grab_ptrs2(overlay->hwdata->channel, overlay->hwdata->FrameData0, overlay->hwdata->FrameData1);
-                     break;
-            case 0:
-            default:
-                     break;
+        switch (rtncode) {
+        case -1:
+            SDL_SetError("PgConfigScalerChannel() function failed\n");
+            SDL_FreeYUVOverlay(overlay);
+            return -1;
+        case 1:
+            grab_ptrs2(overlay->hwdata->channel,
+                       overlay->hwdata->FrameData0,
+                       overlay->hwdata->FrameData1);
+            break;
+        case 0:
+        default:
+            break;
         }
     }
 
@@ -452,53 +457,54 @@
         }
     }
 */
-        
+
     return 0;
 }
 
-void ph_FreeYUVOverlay(_THIS, SDL_Overlay *overlay)
+void
+ph_FreeYUVOverlay(_THIS, SDL_Overlay * overlay)
 {
     SDL_Rect backrect;
 
-    if (overlay == NULL)
-    {
+    if (overlay == NULL) {
         return;
     }
 
-    if (overlay->hwdata == NULL)
-    {
+    if (overlay->hwdata == NULL) {
         return;
     }
 
-    current_overlay=NULL;
+    current_overlay = NULL;
 
     /* restore screen behind the overlay/chroma color. */
-    backrect.x=overlay->hwdata->CurrentViewPort.pos.x;
-    backrect.y=overlay->hwdata->CurrentViewPort.pos.y;
-    backrect.w=overlay->hwdata->CurrentViewPort.size.w;
-    backrect.h=overlay->hwdata->CurrentViewPort.size.h;
+    backrect.x = overlay->hwdata->CurrentViewPort.pos.x;
+    backrect.y = overlay->hwdata->CurrentViewPort.pos.y;
+    backrect.w = overlay->hwdata->CurrentViewPort.size.w;
+    backrect.h = overlay->hwdata->CurrentViewPort.size.h;
     this->UpdateRects(this, 1, &backrect);
 
     /* it is need for some buggy drivers, that can't hide overlay before */
     /* freeing buffer, so we got trash on the srceen                     */
     overlay->hwdata->props.flags &= ~Pg_SCALER_PROP_SCALER_ENABLE;
-    PgConfigScalerChannel(overlay->hwdata->channel, &(overlay->hwdata->props));
+    PgConfigScalerChannel(overlay->hwdata->channel,
+                          &(overlay->hwdata->props));
 
     overlay->hwdata->scaler_on = 0;
     overlay->hwdata->State = OVERLAY_STATE_UNINIT;
 
-    if (overlay->hwdata->channel != NULL)
-    {
+    if (overlay->hwdata->channel != NULL) {
         PgDestroyVideoChannel(overlay->hwdata->channel);
         overlay->hwdata->channel = NULL;
         return;
-    }	
+    }
 
-    overlay->hwdata->CurrentFrameData = NULL;  
-	
+    overlay->hwdata->CurrentFrameData = NULL;
+
     SDL_free(overlay->hwdata->FrameData0);
     SDL_free(overlay->hwdata->FrameData1);
     overlay->hwdata->FrameData0 = NULL;
     overlay->hwdata->FrameData1 = NULL;
     SDL_free(overlay->hwdata);
 }
+
+/* vi: set ts=4 sw=4 expandtab: */