diff options
author | wm4 <wm4@nowhere> | 2013-12-19 21:31:27 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-12-19 21:31:27 +0100 |
commit | 25d4ae74f1dbddf99b147df0887d6810d34e36dd (patch) | |
tree | 02e0d851e5aa1a70c1e528caec1aeeb6a6620076 /player | |
parent | 8c7ea10873ced7c4e0344d942be4792e9d7a2801 (diff) | |
download | mpv-25d4ae74f1dbddf99b147df0887d6810d34e36dd.tar.bz2 mpv-25d4ae74f1dbddf99b147df0887d6810d34e36dd.tar.xz |
Rename getch2....c/h to terminal....c/h
"getch2" really tells nothing about what the heck this code does. It'd
be even worse when moving the rest of terminal handling code there.
Diffstat (limited to 'player')
-rw-r--r-- | player/loadfile.c | 2 | ||||
-rw-r--r-- | player/main.c | 2 | ||||
-rw-r--r-- | player/osd.c | 2 | ||||
-rw-r--r-- | player/playloop.c | 4 |
4 files changed, 7 insertions, 3 deletions
diff --git a/player/loadfile.c b/player/loadfile.c index 12a8568973..d9518c1918 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -26,8 +26,8 @@ #include "config.h" #include "talloc.h" -#include "osdep/getch2.h" #include "osdep/io.h" +#include "osdep/terminal.h" #include "osdep/timer.h" #include "common/msg.h" diff --git a/player/main.c b/player/main.c index 217d01c00f..a1d56df5f0 100644 --- a/player/main.c +++ b/player/main.c @@ -28,8 +28,8 @@ #include "talloc.h" #include "osdep/io.h" -#include "osdep/getch2.h" #include "osdep/priority.h" +#include "osdep/terminal.h" #include "osdep/timer.h" #include "common/av_log.h" diff --git a/player/osd.c b/player/osd.c index c87585c42d..f475757bdc 100644 --- a/player/osd.c +++ b/player/osd.c @@ -32,7 +32,7 @@ #include "options/m_property.h" #include "common/encode.h" -#include "osdep/getch2.h" +#include "osdep/terminal.h" #include "osdep/timer.h" #include "demux/demux.h" diff --git a/player/playloop.c b/player/playloop.c index a018088cfc..971895b6a2 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -33,6 +33,7 @@ #include "common/playlist.h" #include "input/input.h" +#include "osdep/terminal.h" #include "osdep/timer.h" #include "audio/mixer.h" @@ -1310,6 +1311,8 @@ void run_playloop(struct MPContext *mpctx) handle_force_window(mpctx, false); execute_queued_seek(mpctx); + + getch2_poll(); } // Waiting for the slave master to send us a new file to play. @@ -1339,5 +1342,6 @@ void idle_loop(struct MPContext *mpctx) run_command(mpctx, cmd); mp_cmd_free(cmd); mp_flush_events(mpctx); + getch2_poll(); } } |