input: Move cmd_queue to context struct

Menu instances now also need a input context pointer to queue commands.

1 files changed, 4 insertions, 3 deletions

diff --git a/mplayer.c b/mplayer.c
index 7b64936b6a..05f7492376 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2883,14 +2883,15 @@ stream_set_interrupt_callback(mp_input_check_interrupt, mpctx->input);
 
 #ifdef HAVE_MENU
  if(use_menu) {
-     if(menu_cfg && menu_init(mpctx, mpctx->mconfig, menu_cfg))
+     if(menu_cfg && menu_init(mpctx, mpctx->mconfig, mpctx->input, menu_cfg))
      mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitialized, menu_cfg);
    else {
      menu_cfg = get_path("menu.conf");
-     if(menu_init(mpctx, mpctx->mconfig, menu_cfg))
+     if(menu_init(mpctx, mpctx->mconfig, mpctx->input, menu_cfg))
        mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitialized, menu_cfg);
      else {
-         if(menu_init(mpctx, mpctx->mconfig, MPLAYER_CONFDIR "/menu.conf"))
+         if(menu_init(mpctx, mpctx->mconfig, mpctx->input,
+                      MPLAYER_CONFDIR "/menu.conf"))
          mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitialized, MPLAYER_CONFDIR"/menu.conf");
        else {
          mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitFailed);