RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-04 14:12:10 +00:00
Code Issues Releases Wiki Activity

remove obsoleted files

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7207 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
pontscho 2002-08-31 17:04:59 +00:00
parent 1ff539f678
commit 44bc676502
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gui/Makefile
View File

@ -14,7 +14,7 @@ endif
CFLAGS = $(OPTIMIZE) $(INCDIR) $(DEBUG) 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 \ bitmap/bitmap.c bitmap/tga/tga.c bitmap/bmp/bmp.c bitmap/png/png.c \
skin/skin.c skin/font.c skin/cut.c \ skin/skin.c skin/font.c skin/cut.c \
mplayer/mplayer.c mplayer/widgets.c mplayer/play.c \ mplayer/mplayer.c mplayer/widgets.c mplayer/play.c \

32
Gui/wm/ws.c
View File

@ -20,7 +20,6 @@
#include "../../config.h" #include "../../config.h"
#include "ws.h" #include "ws.h"
#include "wsconv.h"
#include "wsxdnd.h" #include "wsxdnd.h"
#include "../../postproc/rgb2rgb.h" #include "../../postproc/rgb2rgb.h"
#include "../../mp_msg.h" #include "../../mp_msg.h"
@ -78,6 +77,28 @@ int wsUseXShape = 1;
int XShmGetEventBase( Display* ); int XShmGetEventBase( Display* );
inline int wsSearch( Window win ); 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_FUNCTIONS (1L << 0)
#define MWM_HINTS_DECORATIONS (1L << 1) #define MWM_HINTS_DECORATIONS (1L << 1)
#define MWM_HINTS_INPUT_MODE (1L << 2) #define MWM_HINTS_INPUT_MODE (1L << 2)
@ -290,14 +311,13 @@ wsXDNDInitialize();
#endif #endif
} }
#endif #endif
initConverter();
wsOutMask=wsGetOutMask(); wsOutMask=wsGetOutMask();
mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[ws] Initialized converter: " ); mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[ws] Initialized converter: " );
switch ( wsOutMask ) switch ( wsOutMask )
{ {
case wsRGB32: case wsRGB32:
mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to rgb32\n" ); mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to rgb32\n" );
wsConvFunc=(void *)BGR8880_to_RGB8880_c; wsConvFunc=rgb32torgb32;
break; break;
case wsBGR32: case wsBGR32:
mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr32\n" ); mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr32\n" );
@ -309,7 +329,7 @@ wsXDNDInitialize();
break; break;
case wsBGR24: case wsBGR24:
mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr24\n" ); mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr24\n" );
wsConvFunc=(void *)BGR8880_to_BGR888_c; wsConvFunc=rgb32tobgr24;
break; break;
case wsRGB16: case wsRGB16:
mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to rgb16\n" ); mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to rgb16\n" );
@ -317,7 +337,7 @@ wsXDNDInitialize();
break; break;
case wsBGR16: case wsBGR16:
mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr16\n" ); mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr16\n" );
wsConvFunc=(void *)BGR8880_to_BGR565_c; wsConvFunc=rgb32tobgr16;
break; break;
case wsRGB15: case wsRGB15:
mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to rgb15\n" ); mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to rgb15\n" );
@ -325,7 +345,7 @@ wsXDNDInitialize();
break; break;
case wsBGR15: case wsBGR15:
mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr15\n" ); mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr15\n" );
wsConvFunc=(void *)BGR8880_to_BGR555_c; wsConvFunc=rgb32tobgr15;
break; break;
} }
XSetErrorHandler( wsErrorHandler ); XSetErrorHandler( wsErrorHandler );