linux->osdep

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

Gui/mplayer/widgets.h

@@ -8,7 +8,7 @@
 #include <gtk/gtk.h>
 
 #include "../../config.h"
-#include "../../linux/shmem.h"
+#include "../../osdep/shmem.h"
 #include "play.h"
 #include "mplayer.h"
 #include "../interface.h"

Makefile

@@ -36,7 +36,7 @@ OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
 VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) 
 AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(NAS_LIB) $(SGIAUDIO_LIB)
 CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB)
-COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a $(PP_LIB) postproc/libswscale.a linux/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB) $(GIF_LIB)
+COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a $(PP_LIB) postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB) $(GIF_LIB)
 
 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) # -Wall
 
@@ -48,7 +48,7 @@ CFLAGS += -maltivec -mabi=altivec
 endif
 endif
 
-PARTS = libmpdemux libmpcodecs mp3lib liba52 libmpeg2 libavcodec libao2 drivers linux postproc input libvo libaf
+PARTS = libmpdemux libmpcodecs mp3lib liba52 libmpeg2 libavcodec libao2 drivers osdep postproc input libvo libaf
 ifeq ($(VIDIX),yes)
 PARTS += libdha vidix
 endif
@@ -80,7 +80,7 @@ ifeq ($(CSS_USE),yes)
 ALL_PRG += $(PRG_FIBMAP)
 endif
 
-COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libswscale.a input/libinput.a libvo/libvo.a libaf/libaf.a
+COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a osdep/libosdep.a postproc/libswscale.a input/libinput.a libvo/libvo.a libaf/libaf.a
 ifeq (($SHARED_PP),yes)
 COMMON_DEPS += postproc/libpostproc.so
 else
@@ -170,8 +170,8 @@ vidix/libvidix.a:
 Gui/libgui.a:
 	$(MAKE) -C Gui
 
-linux/libosdep.a:
-	$(MAKE) -C linux
+osdep/libosdep.a:
+	$(MAKE) -C osdep
 
 postproc/libswscale.a:
 	$(MAKE) -C postproc

TOOLS/cache2.c

@@ -1,5 +1,5 @@
 
-// gcc cache2.c ../linux/shmem.o -o cache2
+// gcc cache2.c ../osdep/shmem.o -o cache2
 
 // Initial draft of my new cache system...
 // includes some simulation code, using usleep() to emulate limited bandwith
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../linux/shmem.h"
+#include "../osdep/shmem.h"
 
 typedef struct {
   // constats:

input/input.c

@@ -21,9 +21,9 @@
 #ifdef MP_DEBUG
 #include <assert.h>
 #endif
-#include "../linux/getch2.h"
-#include "../linux/keycodes.h"
-#include "../linux/timer.h"
+#include "../osdep/getch2.h"
+#include "../osdep/keycodes.h"
+#include "../osdep/timer.h"
 #include "../mp_msg.h"
 #include "../cfgparser.h"
 

libmenu/menu.c

@@ -9,7 +9,7 @@
 
 #include "../libvo/osd.h"
 #include "../libvo/font_load.h"
-#include "../linux/keycodes.h"
+#include "../osdep/keycodes.h"
 #include "../asxparser.h"
 #include "../libmpdemux/stream.h"
 

libmenu/menu_console.c

@@ -19,9 +19,9 @@
 #include "menu.h"
 
 #include "../libvo/font_load.h"
-#include "../linux/keycodes.h"
+#include "../osdep/keycodes.h"
 #include "../input/input.h"
-#include "../linux/timer.h"
+#include "../osdep/timer.h"
 
 typedef struct history_st history_t;
 

libmenu/menu_filesel.c

@@ -22,7 +22,7 @@
 #include "menu.h"
 #include "menu_list.h"
 #include "../input/input.h"
-#include "../linux/keycodes.h"
+#include "../osdep/keycodes.h"
 
 struct list_entry_s {
   struct list_entry p;

libmenu/menu_list.c

@@ -13,7 +13,7 @@
 #include "menu.h"
 
 #include "../libvo/font_load.h"
-#include "../linux/keycodes.h"
+#include "../osdep/keycodes.h"
 
 #define IMPL 1
 #include "menu_list.h"

libmenu/menu_param.c

@@ -22,7 +22,7 @@
 #include "menu.h"
 #include "menu_list.h"
 #include "../input/input.h"
-#include "../linux/keycodes.h"
+#include "../osdep/keycodes.h"
 
 struct list_entry_s {
   struct list_entry p;

libmenu/menu_txt.c

@@ -13,7 +13,7 @@
 #include "menu.h"
 
 #include "../libvo/font_load.h"
-#include "../linux/keycodes.h"
+#include "../osdep/keycodes.h"
 
 struct menu_priv_s {
   char** lines;

libmpcodecs/dec_video.c

@@ -11,8 +11,8 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "linux/timer.h"
-#include "linux/shmem.h"
+#include "osdep/timer.h"
+#include "osdep/shmem.h"
 
 #include "stream.h"
 #include "demuxer.h"

libmpcodecs/vd_xanim.c

@@ -40,7 +40,7 @@ LIBVD_EXTERN(xanim)
 #include "mp_msg.h"
 #include "bswap.h"
 
-#include "linux/timer.h"
+#include "osdep/timer.h"
 #include "libvo/fastmemcpy.h"
 
 #if 0

libmpdemux/cache2.c

@@ -17,7 +17,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "../linux/shmem.h"
+#include "../osdep/shmem.h"
 
 #include "mp_msg.h"
 

libmpdemux/dvdnav_stream.c

@@ -7,7 +7,7 @@
 #include <unistd.h>
 #include <string.h>
 #include "mp_msg.h"
-#include "../linux/timer.h"
+#include "../osdep/timer.h"
 #include "../input/input.h"
 #include "stream.h"
 #include "dvdnav_stream.h"

libmpdemux/stream.c

@@ -13,7 +13,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
-#include "../linux/shmem.h"
+#include "../osdep/shmem.h"
 
 #include "stream.h"
 #include "demuxer.h"

libvo/gtf.h

@@ -1,7 +1,7 @@
 #ifndef __GTF_H
 #define __GTF_H
 
-#include "linux/vbelib.h"
+#include "osdep/vbelib.h"
 
 #define GTF_VF 0 
 #define GTF_HF 1 

libvo/video_out.c

@@ -15,7 +15,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "../linux/shmem.h"
+#include "../osdep/shmem.h"
 
 //int vo_flags=0;
 

libvo/vo_aa.c

@@ -31,7 +31,7 @@
 #include "font_load.h"
 #include "sub.h"
 
-#include "linux/keycodes.h"
+#include "osdep/keycodes.h"
 #include <aalib.h>
 #include "cfgparser.h"
 #include "mp_msg.h"

libvo/vo_dfbmga.c

@@ -1058,7 +1058,7 @@ control( uint32_t request, void *data, ... )
 
 extern void mplayer_put_key( int code );
 
-#include "../linux/keycodes.h"
+#include "../osdep/keycodes.h"
 
 static void
 check_events( void )

libvo/vo_directfb.c

@@ -1411,7 +1411,7 @@ static uint32_t draw_slice(uint8_t *src[], int stride[], int w, int h, int x, in
 
 extern void mplayer_put_key(int code);
 
-#include "../linux/keycodes.h"
+#include "../osdep/keycodes.h"
 
 static void check_events(void)
 {

libvo/vo_directfb2.c

@@ -675,7 +675,7 @@ return 0;
 
 extern void mplayer_put_key(int code);
 
-#include "../linux/keycodes.h"
+#include "../osdep/keycodes.h"
 
 static void check_events(void)
 {

libvo/vo_directx.c

@@ -28,7 +28,7 @@
 #include "video_out_internal.h"
 #include "fastmemcpy.h"
 #include "../input/input.h"
-#include "../linux/keycodes.h"
+#include "../osdep/keycodes.h"
 #include "../mp_msg.h"
 #include "aspect.h"
 

libvo/vo_ggi.c

@@ -531,7 +531,7 @@ static uint32_t control(uint32_t request, void *data, ...)
 }
 
 /* EVENT handling */
-#include "../linux/keycodes.h"
+#include "../osdep/keycodes.h"
 extern void mplayer_put_key(int code);
 
 static void check_events(void)

libvo/vo_sdl.c

@@ -1159,7 +1159,7 @@ static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int
  *  returns : doesn't return
  **/
 
-#include "../linux/keycodes.h"
+#include "../osdep/keycodes.h"
 extern void mplayer_put_key(int code);
 
 #define shift_key (event.key.keysym.mod==(KMOD_LSHIFT||KMOD_RSHIFT)) 

libvo/vo_vesa.c

@@ -36,7 +36,7 @@
 
 #include "fastmemcpy.h"
 #include "sub.h"
-#include "linux/vbelib.h"
+#include "osdep/vbelib.h"
 #include "bswap.h"
 #include "aspect.h"
 #include "vesa_lvo.h"

libvo/vo_xmga.c

@@ -38,7 +38,7 @@
 #include "aspect.h"
 
 #ifdef SHOW_TIME
-#include "../linux/timer.h"
+#include "../osdep/timer.h"
 static unsigned int timer=0;
 static unsigned int timerd=0;
 #endif

libvo/x11_common.c

@@ -399,7 +399,7 @@ void vo_uninit( void )
  mDisplay=NULL;
 }
 
-#include "../linux/keycodes.h"
+#include "../osdep/keycodes.h"
 #include "wskeys.h"
 
 extern void mplayer_put_key(int code);

mencoder.c

@@ -75,7 +75,7 @@ static char* banner_text=
 
 #include "libvo/fastmemcpy.h"
 
-#include "linux/timer.h"
+#include "osdep/timer.h"
 
 int vo_doublebuffering=0;
 int vo_directrendering=0;

mplayer.c

@@ -64,8 +64,8 @@
 #include "spudec.h"
 #include "vobsub.h"
 
-#include "linux/getch2.h"
-#include "linux/timer.h"
+#include "osdep/getch2.h"
+#include "osdep/timer.h"
 
 #include "cpudetect.h"