diff options
| -rw-r--r-- | config.h | 6 | ||||
| -rw-r--r-- | menu.c | 12 | ||||
| -rw-r--r-- | setup_menu.c | 10 | ||||
| -rw-r--r-- | xineliboutput.c | 10 |
4 files changed, 17 insertions, 21 deletions
@@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: config.h,v 1.84 2012-03-13 12:53:41 phintuka Exp $ + * $Id: config.h,v 1.85 2012-03-13 13:05:14 phintuka Exp $ * */ @@ -308,7 +308,9 @@ class config_t { int vo_aspect_ratio; // OSD settings - eMainMenuMode main_menu_mode; // used internally to open right sub-menu + eMainMenuMode main_menu_mode; // used internally to open right sub-menu + cOsdObject *pending_menu_action; + int hide_main_menu; int osd_size; int osd_width; @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: menu.c,v 1.91 2012-03-13 12:53:41 phintuka Exp $ + * $Id: menu.c,v 1.92 2012-03-13 13:05:14 phintuka Exp $ * */ @@ -568,8 +568,6 @@ eOSState cMenuBrowseFiles::ProcessKey(eKeys Key) #include "tools/display_message.h" -extern cOsdObject *g_PendingMenuAction; - time_t cMenuXinelib::g_LastHotkeyTime = 0; eKeys cMenuXinelib::g_LastHotkey = kNone; @@ -693,8 +691,8 @@ eOSState cMenuXinelib::ProcessKey(eKeys Key) cPlayerFactory::Launch("cdda:/"); return osEnd; case osUser7: - if (!g_PendingMenuAction) { - g_PendingMenuAction = new cEqualizer(); + if (!xc.pending_menu_action) { + xc.pending_menu_action = new cEqualizer(m_Dev); return osPlugin; } return osContinue; @@ -939,10 +937,10 @@ eOSState cMenuXinelib::ProcessHotkey(eKeys Key) } if (*Message) { - if (!g_PendingMenuAction && + if (!xc.pending_menu_action && !cRemote::HasKeys() && cRemote::CallPlugin("xineliboutput")) - g_PendingMenuAction = new cDisplayMessage(Message); + xc.pending_menu_action = new cDisplayMessage(Message); } g_LastHotkeyTime = now; diff --git a/setup_menu.c b/setup_menu.c index b5c6d4f6..d9c623b1 100644 --- a/setup_menu.c +++ b/setup_menu.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: setup_menu.c,v 1.85 2012-03-13 12:53:41 phintuka Exp $ + * $Id: setup_menu.c,v 1.86 2012-03-13 13:05:14 phintuka Exp $ * */ @@ -1982,8 +1982,6 @@ eOSState cTestBitmap::ProcessKey(eKeys key) #include <vdr/remote.h> // CallPlugin -extern cOsdObject *g_PendingMenuAction; - class cMenuTestImages : public cMenuSetupPage { protected: @@ -2027,15 +2025,15 @@ eOSState cMenuTestImages::ProcessKey(eKeys Key) switch (state) { case osUser1: if(cRemote::CallPlugin("xineliboutput")) - g_PendingMenuAction = new cTestGrayscale(); + xc.pending_menu_action = new cTestGrayscale(); return osEnd; case osUser2: if(cRemote::CallPlugin("xineliboutput")) - g_PendingMenuAction = new cTestBitmap(1); + xc.pending_menu_action = new cTestBitmap(1); return osEnd; case osUser3: if(cRemote::CallPlugin("xineliboutput")) - g_PendingMenuAction = new cTestBitmap(4); + xc.pending_menu_action = new cTestBitmap(4); return osEnd; default: ; } diff --git a/xineliboutput.c b/xineliboutput.c index 6fd6970d..ed0d38a9 100644 --- a/xineliboutput.c +++ b/xineliboutput.c @@ -21,7 +21,7 @@ * * xineliboutput.c: VDR Plugin interface * - * $Id: xineliboutput.c,v 1.48 2012-03-13 12:53:41 phintuka Exp $ + * $Id: xineliboutput.c,v 1.49 2012-03-13 13:05:14 phintuka Exp $ * */ @@ -47,8 +47,6 @@ static const char *VERSION = "1.0.90-cvs"; static const char *DESCRIPTION = trNOOP("X11/xine-lib output plugin"); static const char *MAINMENUENTRY = trNOOP("Media Player"); -cOsdObject *g_PendingMenuAction = NULL; - class cPluginXinelibOutput : public cPlugin { private: @@ -204,9 +202,9 @@ cOsdObject *cPluginXinelibOutput::MainMenuAction(void) return NULL; } - if(g_PendingMenuAction) { - cOsdObject *tmp = g_PendingMenuAction; - g_PendingMenuAction = NULL; + if (xc.pending_menu_action) { + cOsdObject *tmp = xc.pending_menu_action; + xc.pending_menu_action = NULL; return tmp; } |