Mercurial > mplayer.hg
changeset 26015:f222f84f2072
Rename mp_input_win32_slave_cmd_func to mp_input_slave_cmd_func.
| author | diego |
|---|---|
| date | Thu, 21 Feb 2008 16:15:31 +0000 |
| parents | 6e9c78324790 |
| children | 528bdf17dd8a |
| files | mplayer.c osdep/getch2-win.c osdep/getch2.h |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mplayer.c Thu Feb 21 09:47:03 2008 +0000 +++ b/mplayer.c Thu Feb 21 16:15:31 2008 +0000 @@ -2852,7 +2852,7 @@ #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);
--- a/osdep/getch2-win.c Thu Feb 21 09:47:03 2008 +0000 +++ b/osdep/getch2-win.c Thu Feb 21 16:15:31 2008 +0000 @@ -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){
--- a/osdep/getch2.h Thu Feb 21 09:47:03 2008 +0000 +++ b/osdep/getch2.h Thu Feb 21 16:15:31 2008 +0000 @@ -24,6 +24,6 @@ /* 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 */