remove obsoleted files

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

2 files changed, 27 insertions, 7 deletions

diff --git a/Gui/Makefile b/Gui/Makefile
index 01cac949c4..942e041263 100644
--- a/Gui/Makefile
+++ b/Gui/Makefile
@@ -14,7 +14,7 @@ endif
 
 CFLAGS = $(OPTIMIZE) $(INCDIR) $(DEBUG) 
 
-SRCS = wm/ws.c wm/wsconv.c wm/wsxdnd.c app.c events.c interface.c cfg.c \
+SRCS = wm/ws.c wm/wsxdnd.c app.c events.c interface.c cfg.c \
 	bitmap/bitmap.c bitmap/tga/tga.c bitmap/bmp/bmp.c bitmap/png/png.c \
 	skin/skin.c skin/font.c skin/cut.c \
 	mplayer/mplayer.c mplayer/widgets.c mplayer/play.c \
diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c
index e8128ffe7a..a268eff3ca 100644
--- a/Gui/wm/ws.c
+++ b/Gui/wm/ws.c
@@ -20,7 +20,6 @@
 
 #include "../../config.h"
 #include "ws.h"
-#include "wsconv.h"
 #include "wsxdnd.h"
 #include "../../postproc/rgb2rgb.h"
 #include "../../mp_msg.h"
@@ -78,6 +77,28 @@ int                  wsUseXShape = 1;
 int XShmGetEventBase( Display* );
 inline int wsSearch( Window win );
 
+// ---
+
+#define PACK_RGB16(r,g,b,pixel) pixel=(b>>3);\
+                                pixel<<=6;\
+                                pixel|=(g>>2);\
+                                pixel<<=5;\
+                                pixel|=(r>>3)
+
+#define PACK_RGB15(r,g,b,pixel) pixel=(b>>3);\
+                                pixel<<=5;\
+                                pixel|=(g>>3);\
+                                pixel<<=5;\
+	                        pixel|=(r>>3)
+
+typedef void(*wsTConvFunc)( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned num_pixels );
+wsTConvFunc wsConvFunc = NULL;
+																															
+void rgb32torgb32( const unsigned char * src, unsigned char * dst,int src_size )
+{ memcpy( dst,src,src_size ); }
+
+// ---
+
 #define MWM_HINTS_FUNCTIONS     (1L << 0)
 #define MWM_HINTS_DECORATIONS   (1L << 1)
 #define MWM_HINTS_INPUT_MODE    (1L << 2)
@@ -290,14 +311,13 @@ wsXDNDInitialize();
    #endif
   }
 #endif
- initConverter();
  wsOutMask=wsGetOutMask();
  mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[ws] Initialized converter: " );
  switch ( wsOutMask )
   {
    case wsRGB32:
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to rgb32\n" );
-     wsConvFunc=(void *)BGR8880_to_RGB8880_c;
+     wsConvFunc=rgb32torgb32;
      break;
    case wsBGR32:
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr32\n" );
@@ -309,7 +329,7 @@ wsXDNDInitialize();
      break;
    case wsBGR24:
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr24\n" );
-     wsConvFunc=(void *)BGR8880_to_BGR888_c;
+     wsConvFunc=rgb32tobgr24;
      break;
    case wsRGB16:
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to rgb16\n" );
@@ -317,7 +337,7 @@ wsXDNDInitialize();
      break;
    case wsBGR16:
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr16\n" );
-     wsConvFunc=(void *)BGR8880_to_BGR565_c;
+     wsConvFunc=rgb32tobgr16;
      break;
    case wsRGB15:
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to rgb15\n" );
@@ -325,7 +345,7 @@ wsXDNDInitialize();
      break;
    case wsBGR15:
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr15\n" );
-     wsConvFunc=(void *)BGR8880_to_BGR555_c;
+     wsConvFunc=rgb32tobgr15;
      break;
   }
  XSetErrorHandler( wsErrorHandler );