summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-21 16:15:31 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-21 16:15:31 +0000
commit895fc255537eda5e9f7aef9119b22607dbc39eee (patch)
tree307b2276d3475caf843be0f7c3718dfb1ce6e4c4
parent0a168fb8e0751c507fe2c84f50f11f71cda39f34 (diff)
downloadmpv-895fc255537eda5e9f7aef9119b22607dbc39eee.tar.bz2
mpv-895fc255537eda5e9f7aef9119b22607dbc39eee.tar.xz
Rename mp_input_win32_slave_cmd_func to mp_input_slave_cmd_func.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26047 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--mplayer.c2
-rw-r--r--osdep/getch2-win.c2
-rw-r--r--osdep/getch2.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/mplayer.c b/mplayer.c
index 09083ed2a6..65f554a032 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -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);
diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c
index 260c7c3f76..03c3d42cbf 100644
--- a/osdep/getch2-win.c
+++ b/osdep/getch2-win.c
@@ -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){
diff --git a/osdep/getch2.h b/osdep/getch2.h
index 267e39e914..3c015ba9bb 100644
--- a/osdep/getch2.h
+++ b/osdep/getch2.h
@@ -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 */