mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
Key macros can now call plugins that don't have a main menu entry
This commit is contained in:
11
menu.c
11
menu.c
@@ -4,7 +4,7 @@
|
||||
* See the main source file 'vdr.c' for copyright information and
|
||||
* how to reach the author.
|
||||
*
|
||||
* $Id: menu.c 1.357 2005/08/27 09:37:23 kls Exp $
|
||||
* $Id: menu.c 1.358 2005/09/03 10:34:46 kls Exp $
|
||||
*/
|
||||
|
||||
#include "menu.h"
|
||||
@@ -2402,11 +2402,11 @@ cMenuPluginItem::cMenuPluginItem(const char *Name, int Index)
|
||||
|
||||
cOsdObject *cMenuMain::pluginOsdObject = NULL;
|
||||
|
||||
cMenuMain::cMenuMain(bool Replaying, eOSState State, const char *Plugin)
|
||||
cMenuMain::cMenuMain(bool Replaying, eOSState State)
|
||||
:cOsdMenu("")
|
||||
{
|
||||
replaying = Replaying;
|
||||
Set(Plugin);
|
||||
Set();
|
||||
|
||||
// Initial submenus:
|
||||
|
||||
@@ -2417,7 +2417,6 @@ cMenuMain::cMenuMain(bool Replaying, eOSState State, const char *Plugin)
|
||||
case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, true)); break;
|
||||
case osSetup: AddSubMenu(new cMenuSetup); break;
|
||||
case osCommands: AddSubMenu(new cMenuCommands(tr("Commands"), &Commands)); break;
|
||||
case osPlugin: break; // the actual work is done in Set()
|
||||
default: break;
|
||||
}
|
||||
}
|
||||
@@ -2429,7 +2428,7 @@ cOsdObject *cMenuMain::PluginOsdObject(void)
|
||||
return o;
|
||||
}
|
||||
|
||||
void cMenuMain::Set(const char *Plugin)
|
||||
void cMenuMain::Set(void)
|
||||
{
|
||||
Clear();
|
||||
//XXX //SetTitle("VDR"); // this is done below, including disk usage
|
||||
@@ -2463,7 +2462,7 @@ void cMenuMain::Set(const char *Plugin)
|
||||
if (p) {
|
||||
const char *item = p->MainMenuEntry();
|
||||
if (item)
|
||||
Add(new cMenuPluginItem(hk(item), i), Plugin && strcmp(Plugin, p->Name()) == 0);
|
||||
Add(new cMenuPluginItem(hk(item), i));
|
||||
}
|
||||
else
|
||||
break;
|
||||
|
Reference in New Issue
Block a user