diff gui/ui/playbar.c @ 35681:80c5c89f77d6

Cosmetic: Rename ws functions for the sake of consistency. wsXInit -> wsInit wsXDone -> wsDone wsEvents -> wsEvent wsHandleEvents -> wsEvents wsSetBackgroundRGB -> wsWindowBackground wsClearWindow -> wsWindowClear wsCreateWindow -> wsWindowCreate wsDestroyWindow -> wsWindowDestroy wsFullScreen -> wsWindowFullscreen wsSetIcon -> wsWindowIcon wsIconify -> wsWindowIconify wsSetLayer -> wsWindowLayer wsSearch -> wsWindowListSearch wsMoveWindow -> wsWindowMove wsMoveWindowWithin -> wsWindowMoveWithin wsRaiseWindowTop -> wsWindowRaiseTop wsPostRedisplay -> wsWindowRedraw wsResizeWindow -> wsWindowResize wsSetShape -> wsWindowShape wsWindowPosition -> wsWindowUpdatePosition wsUpdateXineramaInfo -> wsWindowUpdateXinerama wsVisibleWindow -> wsWindowVisibility wsConvert -> wsImageConvert wsCreateImage -> wsImageCreate wsDestroyImage -> wsImageDestroy wsPutImage -> wsImageDraw wsResizeImage -> wsImageResize wsAutohideCursor -> wsMouseAutohide wsVisibleMouse -> wsMouseVisibility

--- a/gui/ui/playbar.c	Thu Jan 17 23:35:53 2013 +0000
+++ b/gui/ui/playbar.c	Fri Jan 18 00:35:38 2013 +0000
@@ -83,7 +83,7 @@
 	  uiPlaybarFade=0;
 	  vo_mouse_autohide=False;
 	 }
-        wsMoveWindow( &guiApp.playbarWindow,True,x,playbarLength );
+        wsWindowMove( &guiApp.playbarWindow,True,x,playbarLength );
 	break;
    case 2: // fade out
 	playbarLength+=10;
@@ -93,10 +93,10 @@
 	  uiPlaybarFade=0;
 	  playbarVisible=False;
           vo_mouse_autohide=True;
-          wsVisibleWindow( &guiApp.playbarWindow,wsHideWindow );
+          wsWindowVisibility( &guiApp.playbarWindow,wsHideWindow );
 	  return;
 	 }
-        wsMoveWindow( &guiApp.playbarWindow,True,x,playbarLength );
+        wsWindowMove( &guiApp.playbarWindow,True,x,playbarLength );
 	break;
   }
 
@@ -110,9 +110,9 @@
 
    fast_memcpy( playbarDrawBuffer,guiApp.playbar.Bitmap.Image,guiApp.playbar.Bitmap.ImageSize );
    RenderAll( &guiApp.playbarWindow,guiApp.playbarItems,guiApp.IndexOfPlaybarItems,playbarDrawBuffer );
-   wsConvert( &guiApp.playbarWindow,playbarDrawBuffer );
+   wsImageConvert( &guiApp.playbarWindow,playbarDrawBuffer );
   }
- wsPutImage( &guiApp.playbarWindow );
+ wsImageDraw( &guiApp.playbarWindow );
 }
 
 static void uiPlaybarMouseHandle( int Button, int X, int Y, int RX, int RY )
@@ -238,8 +238,8 @@
 
  if ( y > guiApp.videoWindow.Height - guiApp.playbar.height )
   {
-   if ( !uiPlaybarFade ) wsVisibleWindow( &guiApp.playbarWindow,wsShowWindow );
-   uiPlaybarFade=1; playbarVisible=True; wsPostRedisplay( &guiApp.playbarWindow );
+   if ( !uiPlaybarFade ) wsWindowVisibility( &guiApp.playbarWindow,wsShowWindow );
+   uiPlaybarFade=1; playbarVisible=True; wsWindowRedraw( &guiApp.playbarWindow );
   }
   else if ( !uiPlaybarFade ) uiPlaybarFade=2;
 }
@@ -257,11 +257,11 @@
   }
 
  guiApp.playbarWindow.Parent=guiApp.videoWindow.WindowID;
- wsCreateWindow( &guiApp.playbarWindow,
+ wsWindowCreate( &guiApp.playbarWindow,
    guiApp.playbar.x,guiApp.playbar.y,guiApp.playbar.width,guiApp.playbar.height,
    0,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsHideFrame|wsHideWindow,"PlayBar" );
 
- wsSetShape( &guiApp.playbarWindow,guiApp.playbar.Mask.Image );
+ wsWindowShape( &guiApp.playbarWindow,guiApp.playbar.Mask.Image );
 
  guiApp.playbarWindow.ReDraw=(void *)uiPlaybarDraw;
  guiApp.playbarWindow.MouseHandler=uiPlaybarMouseHandle;