[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[317] mplayerxp

[<nic...@us...>]

Revision: 317
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=317&view=rev
Author:   nickols_k
Date:     2012-11-10 11:22:10 +0000 (Sat, 10 Nov 2012)
Log Message:
-----------
rename input -> input2

Modified Paths:
--------------
    mplayerxp/Makefile
    mplayerxp/input2/Makefile
    mplayerxp/libmpdemux/mpdemux.c
    mplayerxp/libmpdemux/s_dvdnav.c
    mplayerxp/libmpdemux/s_tv.c
    mplayerxp/libmpdemux/tcp.c
    mplayerxp/libvo/vo_sdl.c
    mplayerxp/libvo/x11_common.c
    mplayerxp/postproc/libmenu/menu_cmdlist.c
    mplayerxp/postproc/libmenu/menu_console.c
    mplayerxp/postproc/libmenu/menu_filesel.c
    mplayerxp/postproc/libmenu/menu_param.c
    mplayerxp/postproc/libmenu/menu_pt.c
    mplayerxp/postproc/vf_menu.c

Modified: mplayerxp/Makefile
===================================================================
--- mplayerxp/Makefile	2012-11-10 11:16:53 UTC (rev 316)
+++ mplayerxp/Makefile	2012-11-10 11:22:10 UTC (rev 317)
@@ -13,7 +13,7 @@
 PRG_FIBMAP = fibmap_mplayerxp
 PRG_CFG = codec-cfg-xp
 # these subdirectories required installation due binaries within them
-SUBDIRS = libmpdemux libmpsub libplaytree libmpcodecs libmpconf libao2 osdep postproc input nls libvo xmpcore
+SUBDIRS = libmpdemux libmpsub libplaytree libmpcodecs libmpconf libao2 osdep postproc input2 nls libvo xmpcore
 ifeq ($(TARGET_ARCH_X86),yes)
 SUBDIRS+=loader
 endif
@@ -41,7 +41,7 @@
 	  libplaytree/libplaytree.a \
 	  libao2/libao2.a \
 	  postproc/libpostproc.a \
-	  input/libinput.a \
+	  input2/libinput2.a \
 	  libvo/libvo.a \
 	  osdep/libosdep.a \
 	  nls/libnls.a \

Modified: mplayerxp/input2/Makefile
===================================================================
--- mplayerxp/input2/Makefile	2012-11-10 11:16:53 UTC (rev 316)
+++ mplayerxp/input2/Makefile	2012-11-10 11:22:10 UTC (rev 317)
@@ -1,7 +1,7 @@
 
 include ../mp_config.mak
 
-LIBNAME = libinput.a
+LIBNAME = libinput2.a
 
 SRCS=input.c joystick.c lirc.c
 OBJS=$(SRCS:.c=.o)

Modified: mplayerxp/libmpdemux/mpdemux.c
===================================================================
--- mplayerxp/libmpdemux/mpdemux.c	2012-11-10 11:16:53 UTC (rev 316)
+++ mplayerxp/libmpdemux/mpdemux.c	2012-11-10 11:22:10 UTC (rev 317)
@@ -1,7 +1,6 @@
-
-#include "../mp_config.h"
+#include "mp_config.h"
 #include <stdlib.h>
-#include "../input/input.h"
+#include "input2/input.h"
 #include "demux_msg.h"
 int mpdemux_check_interrupt(any_t* libinput,int _time) {
   mp_cmd_t* cmd;

Modified: mplayerxp/libmpdemux/s_dvdnav.c
===================================================================
--- mplayerxp/libmpdemux/s_dvdnav.c	2012-11-10 11:16:53 UTC (rev 316)
+++ mplayerxp/libmpdemux/s_dvdnav.c	2012-11-10 11:22:10 UTC (rev 317)
@@ -11,7 +11,7 @@
 #include "demuxer.h"
 #include "libmpsub/spudec.h"
 #include "libvo/sub.h"
-#include "input/input.h"
+#include "input2/input.h"
 #include "mplayerxp.h"
 #include "demux_msg.h"
 

Modified: mplayerxp/libmpdemux/s_tv.c
===================================================================
--- mplayerxp/libmpdemux/s_tv.c	2012-11-10 11:16:53 UTC (rev 316)
+++ mplayerxp/libmpdemux/s_tv.c	2012-11-10 11:22:10 UTC (rev 317)
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "stream.h"
-#include "input/input.h"
+#include "input2/input.h"
 #include "osdep/mplib.h"
 #include "libao2/afmt.h"
 #include "mrl.h"

Modified: mplayerxp/libmpdemux/tcp.c
===================================================================
--- mplayerxp/libmpdemux/tcp.c	2012-11-10 11:16:53 UTC (rev 316)
+++ mplayerxp/libmpdemux/tcp.c	2012-11-10 11:22:10 UTC (rev 317)
@@ -15,10 +15,10 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-#include "../mp_config.h"
+#include "mp_config.h"
 
 #include "help_mp.h"
-#include "../input/input.h"
+#include "input2/input.h"
 
 #ifndef HAVE_WINSOCK2
 #include <netdb.h>

Modified: mplayerxp/libvo/vo_sdl.c
===================================================================
--- mplayerxp/libvo/vo_sdl.c	2012-11-10 11:16:53 UTC (rev 316)
+++ mplayerxp/libvo/vo_sdl.c	2012-11-10 11:22:10 UTC (rev 317)
@@ -123,8 +123,8 @@
 #include "x11_common.h"
 #endif
 
-#include "input/input.h"
-#include "input/mouse.h"
+#include "input2/input.h"
+#include "input2/mouse.h"
 #include "osdep/keycodes.h"
 #include "dri_vo.h"
 #include "video_out_internal.h"

Modified: mplayerxp/libvo/x11_common.c
===================================================================
--- mplayerxp/libvo/x11_common.c	2012-11-10 11:16:53 UTC (rev 316)
+++ mplayerxp/libvo/x11_common.c	2012-11-10 11:22:10 UTC (rev 317)
@@ -31,8 +31,8 @@
 #include <X11/XF86keysym.h>
 #endif
 
-#include "../input/input.h"
-#include "../input/mouse.h"
+#include "input2/input.h"
+#include "input2/mouse.h"
 #include "vo_msg.h"
 
 #ifdef HAVE_SHM

Modified: mplayerxp/postproc/libmenu/menu_cmdlist.c
===================================================================
--- mplayerxp/postproc/libmenu/menu_cmdlist.c	2012-11-10 11:16:53 UTC (rev 316)
+++ mplayerxp/postproc/libmenu/menu_cmdlist.c	2012-11-10 11:22:10 UTC (rev 317)
@@ -18,7 +18,7 @@
 
 #include "libvo/font_load.h"
 
-#include "input/input.h"
+#include "input2/input.h"
 #include "version.h"
 #include "pp_msg.h"
 #include "osdep/mplib.h"

Modified: mplayerxp/postproc/libmenu/menu_console.c
===================================================================
--- mplayerxp/postproc/libmenu/menu_console.c	2012-11-10 11:16:53 UTC (rev 316)
+++ mplayerxp/postproc/libmenu/menu_console.c	2012-11-10 11:22:10 UTC (rev 317)
@@ -24,7 +24,7 @@
 
 #include "libvo/font_load.h"
 #include "osdep/keycodes.h"
-#include "input/input.h"
+#include "input2/input.h"
 #include "osdep/timer.h"
 #include "pp_msg.h"
 #include "osdep/mplib.h"

Modified: mplayerxp/postproc/libmenu/menu_filesel.c
===================================================================
--- mplayerxp/postproc/libmenu/menu_filesel.c	2012-11-10 11:16:53 UTC (rev 316)
+++ mplayerxp/postproc/libmenu/menu_filesel.c	2012-11-10 11:22:10 UTC (rev 317)
@@ -23,7 +23,7 @@
 
 #include "menu.h"
 #include "menu_list.h"
-#include "input/input.h"
+#include "input2/input.h"
 #include "osdep/keycodes.h"
 #include "pp_msg.h"
 #include "osdep/mplib.h"

Modified: mplayerxp/postproc/libmenu/menu_param.c
===================================================================
--- mplayerxp/postproc/libmenu/menu_param.c	2012-11-10 11:16:53 UTC (rev 316)
+++ mplayerxp/postproc/libmenu/menu_param.c	2012-11-10 11:22:10 UTC (rev 317)
@@ -23,7 +23,7 @@
 
 #include "menu.h"
 #include "menu_list.h"
-#include "input/input.h"
+#include "input2/input.h"
 #include "osdep/keycodes.h"
 #include "osdep/mplib.h"
 #include "pp_msg.h"

Modified: mplayerxp/postproc/libmenu/menu_pt.c
===================================================================
--- mplayerxp/postproc/libmenu/menu_pt.c	2012-11-10 11:16:53 UTC (rev 316)
+++ mplayerxp/postproc/libmenu/menu_pt.c	2012-11-10 11:22:10 UTC (rev 317)
@@ -15,7 +15,7 @@
 
 #include "libmpdemux/stream.h"
 #include "libplaytree/playtree.h"
-#include "input/input.h"
+#include "input2/input.h"
 #include "pp_msg.h"
 #include "osdep/mplib.h"
 

Modified: mplayerxp/postproc/vf_menu.c
===================================================================
--- mplayerxp/postproc/vf_menu.c	2012-11-10 11:16:53 UTC (rev 316)
+++ mplayerxp/postproc/vf_menu.c	2012-11-10 11:22:10 UTC (rev 317)
@@ -15,7 +15,7 @@
 #include "osdep/fastmemcpy.h"
 #include "libvo/video_out.h"
 #include "libvo/font_load.h"
-#include "input/input.h"
+#include "input2/input.h"
 #include "libmpconf/m_struct.h"
 #include "libmenu/menu.h"
 #include "osdep/mplib.h"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.