linux->osdep

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

45 files changed, 39 insertions, 39 deletions

diff --git a/Gui/mplayer/widgets.h b/Gui/mplayer/widgets.h
index 60daa827d8..6fe1313f77 100644
--- a/Gui/mplayer/widgets.h
+++ b/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"
diff --git a/Makefile b/Makefile
index 38a89fbdb7..9a3ffb7d0a 100644
--- a/Makefile
+++ b/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
diff --git a/TOOLS/cache2.c b/TOOLS/cache2.c
index bd2db67a36..0be7b44aa4 100644
--- a/TOOLS/cache2.c
+++ b/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:
diff --git a/input/input.c b/input/input.c
index a467ce68a0..d3b01b2703 100644
--- a/input/input.c
+++ b/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"
 
diff --git a/libmenu/menu.c b/libmenu/menu.c
index dc538afa47..97ea2b331c 100644
--- a/libmenu/menu.c
+++ b/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"
 
diff --git a/libmenu/menu_console.c b/libmenu/menu_console.c
index 01b0a0450d..ce170ee045 100644
--- a/libmenu/menu_console.c
+++ b/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;
 
diff --git a/libmenu/menu_filesel.c b/libmenu/menu_filesel.c
index 5ab6295795..e7835773b6 100644
--- a/libmenu/menu_filesel.c
+++ b/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;
diff --git a/libmenu/menu_list.c b/libmenu/menu_list.c
index 5675911703..0f7b0d8325 100644
--- a/libmenu/menu_list.c
+++ b/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"
diff --git a/libmenu/menu_param.c b/libmenu/menu_param.c
index 36c2150c5c..cad330b312 100644
--- a/libmenu/menu_param.c
+++ b/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;
diff --git a/libmenu/menu_txt.c b/libmenu/menu_txt.c
index 305167c940..25db493129 100644
--- a/libmenu/menu_txt.c
+++ b/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;
diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c
index 78758b2085..c7a374b9be 100644
--- a/libmpcodecs/dec_video.c
+++ b/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"
diff --git a/libmpcodecs/vd_xanim.c b/libmpcodecs/vd_xanim.c
index 6f6c2f1b72..3f7fcd56af 100644
--- a/libmpcodecs/vd_xanim.c
+++ b/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
diff --git a/libmpdemux/cache2.c b/libmpdemux/cache2.c
index be874f88b3..2650ff2dbd 100644
--- a/libmpdemux/cache2.c
+++ b/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"
 
diff --git a/libmpdemux/dvdnav_stream.c b/libmpdemux/dvdnav_stream.c
index c22c643df8..f044ccae65 100644
--- a/libmpdemux/dvdnav_stream.c
+++ b/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"
diff --git a/libmpdemux/stream.c b/libmpdemux/stream.c
index 704dbc3c1a..18b45c56e4 100644
--- a/libmpdemux/stream.c
+++ b/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"
diff --git a/libvo/gtf.h b/libvo/gtf.h
index 7d20a6bb02..3d57afd8c9 100644
--- a/libvo/gtf.h
+++ b/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 
diff --git a/libvo/video_out.c b/libvo/video_out.c
index a717435bf2..21903d8d16 100644
--- a/libvo/video_out.c
+++ b/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;
 
diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c
index e02682d00d..b0bfdb2fa9 100644
--- a/libvo/vo_aa.c
+++ b/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"
diff --git a/libvo/vo_dfbmga.c b/libvo/vo_dfbmga.c
index 437c2660ed..3ac3eb113c 100644
--- a/libvo/vo_dfbmga.c
+++ b/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 )
diff --git a/libvo/vo_directfb.c b/libvo/vo_directfb.c
index 40bf9f7780..6155ebf7b5 100644
--- a/libvo/vo_directfb.c
+++ b/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)
 {
diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c
index 75c10b2ce5..13c20ad967 100644
--- a/libvo/vo_directfb2.c
+++ b/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)
 {
diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c
index 6a05205f24..1f687a4054 100644
--- a/libvo/vo_directx.c
+++ b/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"
 
diff --git a/libvo/vo_ggi.c b/libvo/vo_ggi.c
index 258a32dd75..798fd83bc5 100644
--- a/libvo/vo_ggi.c
+++ b/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)
diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c
index 5b0e9c5607..d31d3599eb 100644
--- a/libvo/vo_sdl.c
+++ b/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)) 
diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c
index ef69afbcd7..6d2c00886f 100644
--- a/libvo/vo_vesa.c
+++ b/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"
diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c
index 93fef90973..b60d174713 100644
--- a/libvo/vo_xmga.c
+++ b/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
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 4fff4f4711..2b58bd2f70 100644
--- a/libvo/x11_common.c
+++ b/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);
diff --git a/mencoder.c b/mencoder.c
index fcf25fbb10..0e4446a67f 100644
--- a/mencoder.c
+++ b/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;
diff --git a/mplayer.c b/mplayer.c
index 6b1e482a37..ed537e6359 100644
--- a/mplayer.c
+++ b/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"
 
diff --git a/linux/.cvsignore b/osdep/.cvsignore
index 4671378aef..4671378aef 100644
--- a/linux/.cvsignore
+++ b/osdep/.cvsignore
diff --git a/linux/Makefile b/osdep/Makefile
index f42b913d07..f42b913d07 100644
--- a/linux/Makefile
+++ b/osdep/Makefile
diff --git a/linux/getch2.c b/osdep/getch2.c
index dec9b91a0f..dec9b91a0f 100644
--- a/linux/getch2.c
+++ b/osdep/getch2.c
diff --git a/linux/getch2.h b/osdep/getch2.h
index 016de5ae9e..016de5ae9e 100644
--- a/linux/getch2.h
+++ b/osdep/getch2.h
diff --git a/linux/keycodes.h b/osdep/keycodes.h
index e0b963535c..e0b963535c 100644
--- a/linux/keycodes.h
+++ b/osdep/keycodes.h
diff --git a/linux/lrmi.c b/osdep/lrmi.c
index ce77a6767a..ce77a6767a 100644
--- a/linux/lrmi.c
+++ b/osdep/lrmi.c
diff --git a/linux/lrmi.h b/osdep/lrmi.h
index 8f4f88abdd..8f4f88abdd 100644
--- a/linux/lrmi.h
+++ b/osdep/lrmi.h
diff --git a/linux/scandir.c b/osdep/scandir.c
index 868dd7cb57..868dd7cb57 100644
--- a/linux/scandir.c
+++ b/osdep/scandir.c
diff --git a/linux/shmem.c b/osdep/shmem.c
index 9fd6047b54..9fd6047b54 100644
--- a/linux/shmem.c
+++ b/osdep/shmem.c
diff --git a/linux/shmem.h b/osdep/shmem.h
index 58ceee4e44..58ceee4e44 100644
--- a/linux/shmem.h
+++ b/osdep/shmem.h
diff --git a/linux/strsep.c b/osdep/strsep.c
index 863a39cc70..863a39cc70 100644
--- a/linux/strsep.c
+++ b/osdep/strsep.c
diff --git a/linux/timer-lx.c b/osdep/timer-lx.c
index 4321e46bfa..4321e46bfa 100644
--- a/linux/timer-lx.c
+++ b/osdep/timer-lx.c
diff --git a/linux/timer.h b/osdep/timer.h
index efda23ad6c..efda23ad6c 100644
--- a/linux/timer.h
+++ b/osdep/timer.h
diff --git a/linux/vbelib.c b/osdep/vbelib.c
index d3fc9a445f..d3fc9a445f 100644
--- a/linux/vbelib.c
+++ b/osdep/vbelib.c
diff --git a/linux/vbelib.h b/osdep/vbelib.h
index c1ae08beb8..c1ae08beb8 100644
--- a/linux/vbelib.h
+++ b/osdep/vbelib.h
diff --git a/linux/vsscanf.c b/osdep/vsscanf.c
index 49bfebe56c..49bfebe56c 100644
--- a/linux/vsscanf.c
+++ b/osdep/vsscanf.c