summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiogo Franco (Kovensky) <diogomfranco@gmail.com>2013-07-25 12:23:40 -0300
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2013-07-25 12:23:40 -0300
commit5586b0293122da39d1d0cb813c7e6eec5d0ffd94 (patch)
tree1e6f1aced6c05c93b5d0373d364004468f1d5864
parent19b1279bb3322699c3669197aa96deeaa262ee5a (diff)
downloadmpv-5586b0293122da39d1d0cb813c7e6eec5d0ffd94.tar.bz2
mpv-5586b0293122da39d1d0cb813c7e6eec5d0ffd94.tar.xz
getch2, mplayer: Always call load_termcap
getch2 now deals with the cases where we don't have termcap. Add a dummy load_termcap to getch2-win so we don't get linking errors on mingw.
-rw-r--r--core/mplayer.c2
-rw-r--r--osdep/getch2-win.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/core/mplayer.c b/core/mplayer.c
index 4d1dc64de5..f1f1e81195 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -4586,9 +4586,7 @@ static void osdep_preinit(int *p_argc, char ***p_argv)
SetErrorMode(0x8003);
#endif
-#ifdef HAVE_TERMCAP
load_termcap(NULL); // load key-codes
-#endif
mp_time_init();
}
diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c
index 0750f95c78..558876ff62 100644
--- a/osdep/getch2-win.c
+++ b/osdep/getch2-win.c
@@ -64,6 +64,11 @@ void get_screen_size(void)
}
}
+int load_termcap(char *termtype)
+{
+ return 0;
+}
+
static HANDLE in;
static int getch2_status = 0;