diff --git a/libmpdemux/mpdemux.c b/libmpdemux/mpdemux.c
new file mode 100644
index 0000000000..ea7302aa94
--- /dev/null
+++ b/libmpdemux/mpdemux.c
@@ -0,0 +1,37 @@
+
+#include "config.h"
+#include <stdlib.h>
+
+
+#ifdef HAVE_NEW_INPUT
+#include "../input/input.h"
+int mpdemux_check_interrupt(int time) {
+  mp_cmd_t* cmd;
+  if((cmd = mp_input_get_cmd(time,0)) == NULL)
+    return 0;
+
+  switch(cmd->id) {
+  case MP_CMD_QUIT:
+  case MP_CMD_PLAY_TREE_STEP:
+  case MP_CMD_PLAY_TREE_UP_STEP:
+  case MP_CMD_PLAY_ALT_SRC_STEP:
+    // The cmd will be executed when we are back in the main loop
+    if(! mp_input_queue_cmd(cmd)) {
+      printf("mpdemux_check_interrupt: can't queue cmd %s\n",cmd->name);
+      mp_cmd_free(cmd);
+    }
+    return 1;
+  default:
+    mp_cmd_free(cmd);
+    return 0;
+  }
+}
+
+#else // Default function
+int mpdemux_input_check_interrupt(int time){
+  usec_sleep(time*1000);
+  return 0;
+}
+#endif
+
+
diff --git a/libmpdemux/mpdemux.h b/libmpdemux/mpdemux.h
new file mode 100644
index 0000000000..939c6936ad
--- /dev/null
+++ b/libmpdemux/mpdemux.h
@@ -0,0 +1,2 @@
+
+extern int mpdemux_check_interrupt(int time);