diff options
| -rw-r--r-- | src/MenuItemDefinitionFactory.cpp | 4 | ||||
| -rw-r--r-- | vdr-patch/vdr-menuorg-0.5.0.diff | 4 | ||||
| -rw-r--r-- | vdr-patch/vdr-menuorg-2.3.x.diff | 4 | ||||
| -rw-r--r-- | vdr-patch/vdr-menuorg-update.diff | 22 |
4 files changed, 28 insertions, 6 deletions
diff --git a/src/MenuItemDefinitionFactory.cpp b/src/MenuItemDefinitionFactory.cpp index e2819de..bf33332 100644 --- a/src/MenuItemDefinitionFactory.cpp +++ b/src/MenuItemDefinitionFactory.cpp @@ -59,12 +59,12 @@ void MenuItemDefinitionFactory::ProcessPluginMenuNode(PluginMenuNode* node) void MenuItemDefinitionFactory::ProcessSubMenuNode(SubMenuNode* node) { - _createdMenuItemDefinition = new OsdItemDefinition(node, new cOsdItem(node->Text().c_str(), osUser1), _isSelected); + _createdMenuItemDefinition = new OsdItemDefinition(node, new cOsdItem(node->Text().c_str(), osUser3), _isSelected); } void MenuItemDefinitionFactory::ProcessCommandMenuNode(CommandMenuNode* node) { - _createdMenuItemDefinition = new OsdItemDefinition(node, new cOsdItem(node->Text().c_str(), osUser2), _isSelected); + _createdMenuItemDefinition = new OsdItemDefinition(node, new cOsdItem(node->Text().c_str(), osUser4), _isSelected); } void MenuItemDefinitionFactory::ProcessSeparatorMenuNode(SeparatorMenuNode* node) diff --git a/vdr-patch/vdr-menuorg-0.5.0.diff b/vdr-patch/vdr-menuorg-0.5.0.diff index 953e739..c67d8fe 100644 --- a/vdr-patch/vdr-menuorg-0.5.0.diff +++ b/vdr-patch/vdr-menuorg-0.5.0.diff @@ -147,7 +147,7 @@ index 7732697..3f1453a 100644 + } + } + break; -+ case osUser1: { ++ case osUser3: { + if (MenuOrgPatch::IsCustomMenuAvailable()) { + MenuOrgPatch::EnterSubMenu(Get(Current())); + Set(); @@ -155,7 +155,7 @@ index 7732697..3f1453a 100644 + } + } + break; -+ case osUser2: { ++ case osUser4: { + if (MenuOrgPatch::IsCustomMenuAvailable()) { + cOsdMenu* osdMenu = MenuOrgPatch::Execute(Get(Current())); + if (osdMenu) diff --git a/vdr-patch/vdr-menuorg-2.3.x.diff b/vdr-patch/vdr-menuorg-2.3.x.diff index 5eeb0fa..a12f540 100644 --- a/vdr-patch/vdr-menuorg-2.3.x.diff +++ b/vdr-patch/vdr-menuorg-2.3.x.diff @@ -147,7 +147,7 @@ index 233b025..396bbea 100644 + } + } + break; -+ case osUser1: { ++ case osUser3: { + if (MenuOrgPatch::IsCustomMenuAvailable()) { + MenuOrgPatch::EnterSubMenu(Get(Current())); + Set(); @@ -155,7 +155,7 @@ index 233b025..396bbea 100644 + } + } + break; -+ case osUser2: { ++ case osUser4: { + if (MenuOrgPatch::IsCustomMenuAvailable()) { + cOsdMenu* osdMenu = MenuOrgPatch::Execute(Get(Current())); + if (osdMenu) diff --git a/vdr-patch/vdr-menuorg-update.diff b/vdr-patch/vdr-menuorg-update.diff new file mode 100644 index 0000000..47cdd00 --- /dev/null +++ b/vdr-patch/vdr-menuorg-update.diff @@ -0,0 +1,22 @@ +diff --git a/menu.c b/menu.c +index 59b4a86..dcb1fc9 100644 +--- a/menu.c ++++ b/menu.c +@@ -4478,7 +4478,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key) + } + } + break; +- case osUser1: { ++ case osUser3: { + if (MenuOrgPatch::IsCustomMenuAvailable()) { + MenuOrgPatch::EnterSubMenu(Get(Current())); + Set(); +@@ -4486,7 +4486,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key) + } + } + break; +- case osUser2: { ++ case osUser4: { + if (MenuOrgPatch::IsCustomMenuAvailable()) { + cOsdMenu* osdMenu = MenuOrgPatch::Execute(Get(Current())); + if (osdMenu) |