- add preferences support (first try)

- fix some playlist bug
- fix some equ bug
- fix some redraw bug
- fix dvd playing
- fix file open dialog box
- etc.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6795 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 6 insertions, 5 deletions

diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c
index 1441f4e82d..f67a1fa108 100644
--- a/Gui/wm/ws.c
+++ b/Gui/wm/ws.c
@@ -293,7 +293,7 @@ if(mDisplay){
   {
    case wsRGB32:
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to rgb32\n" );
-     wsConvFunc=BGR8880_to_RGB8880_c;
+     wsConvFunc=(void *)BGR8880_to_RGB8880_c;
      break;
    case wsBGR32:
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr32\n" );
@@ -305,7 +305,7 @@ if(mDisplay){
      break;
    case wsBGR24:
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr24\n" );
-     wsConvFunc=BGR8880_to_BGR888_c;
+     wsConvFunc=(void *)BGR8880_to_BGR888_c;
      break;
    case wsRGB16:
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to rgb16\n" );
@@ -313,7 +313,7 @@ if(mDisplay){
      break;
    case wsBGR16:
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr16\n" );
-     wsConvFunc=BGR8880_to_BGR565_c;
+     wsConvFunc=(void *)BGR8880_to_BGR565_c;
      break;
    case wsRGB15:
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to rgb15\n" );
@@ -321,7 +321,7 @@ if(mDisplay){
      break;
    case wsBGR15:
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr15\n" );
-     wsConvFunc=BGR8880_to_BGR555_c;
+     wsConvFunc=(void *)BGR8880_to_BGR555_c;
      break;
   }
  XSetErrorHandler( wsErrorHandler );
@@ -874,6 +874,7 @@ void wsPostRedisplay( wsTWindow * win )
 {
  if ( win->ReDraw )
   {
+   win->State=wsWindowExpose;
    win->ReDraw( wsDisplay,win->WindowID );
    XFlush( wsDisplay );
   }
diff --git a/Gui/wm/ws.h b/Gui/wm/ws.h
index 4dc14ad4f0..3b22de8978 100644
--- a/Gui/wm/ws.h
+++ b/Gui/wm/ws.h
@@ -224,7 +224,7 @@ extern void wsMoveTopWindow( Display * wsDisplay,Window win );
 extern void wsSetBackground( wsTWindow * win,int color );
 extern void wsSetForegroundRGB( wsTWindow * win,int r,int g,int b );
 extern void wsSetBackgroundRGB( wsTWindow * win,int r,int g,int b );
-#define wsClearWindow( win ); XClearWindow( wsDisplay,win.WindowID );
+#define wsClearWindow( win ) XClearWindow( wsDisplay,win.WindowID )
 extern void wsSetTitle( wsTWindow * win,char * name );
 extern void wsVisibleWindow( wsTWindow * win,int show );
 extern void wsWindowDecoration( wsTWindow * win,long d );