[MPlayer-cvslog] r26047 - in trunk: mplayer.c osdep/getch2-win.c osdep/getch2.h

[diego]

Author: diego
Date: Thu Feb 21 17:15:31 2008
New Revision: 26047

Log:
Rename mp_input_win32_slave_cmd_func to mp_input_slave_cmd_func.


Modified:
   trunk/mplayer.c
   trunk/osdep/getch2-win.c
   trunk/osdep/getch2.h

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	(original)
+++ trunk/mplayer.c	Thu Feb 21 17:15:31 2008
@@ -2852,7 +2852,7 @@ if(slave_mode)
 #ifndef __MINGW32__
    mp_input_add_cmd_fd(0,1,NULL,NULL);
 #else
-  mp_input_add_cmd_fd(0,0,mp_input_win32_slave_cmd_func,NULL);
+  mp_input_add_cmd_fd(0,0,mp_input_slave_cmd_func,NULL);
 #endif
 else if(!noconsolecontrols)
     mp_input_add_event_fd(0, getch2);

Modified: trunk/osdep/getch2-win.c
==============================================================================
--- trunk/osdep/getch2-win.c	(original)
+++ trunk/osdep/getch2-win.c	Thu Feb 21 17:15:31 2008
@@ -13,7 +13,7 @@
 // HACK, stdin is used as something else below
 #undef stdin
 
-int mp_input_win32_slave_cmd_func(int fd,char* dest,int size){
+int mp_input_slave_cmd_func(int fd,char* dest,int size){
   DWORD retval;
   HANDLE stdin = GetStdHandle(STD_INPUT_HANDLE);
   if(!PeekNamedPipe(stdin, NULL, size, &retval, NULL, NULL) || !retval){

Modified: trunk/osdep/getch2.h
==============================================================================
--- trunk/osdep/getch2.h	(original)
+++ trunk/osdep/getch2.h	Thu Feb 21 17:15:31 2008
@@ -24,6 +24,6 @@ extern void getch2_disable(void);
 /* Read a character or a special key code (see keycodes.h) */
 extern void getch2(void);
 
-extern int mp_input_win32_slave_cmd_func(int fd,char* dest,int size);
+extern int mp_input_slave_cmd_func(int fd,char* dest,int size);
 
 #endif /* GETCH2_H */