7 files changed, 11 insertions, 11 deletions
diff --git a/src/menunode.cpp b/src/menunode.cpp
index ab862e6..42197e2 100644
--- a/src/menunode.cpp
+++ b/src/menunode.cpp
@@ -31,7 +31,7 @@ void MenuNode::SetParent(MenuNode* parent)
     _parent = parent;
 }
 
-SubMenuPatch::MainMenuItem* MenuNode::CreateMainMenuItem()
+SubMenuPatch::IMainMenuItem* MenuNode::CreateMainMenuItem()
 {
     return NULL;
 }
diff --git a/src/menunode.h b/src/menunode.h
index 66286a1..7899bb5 100644
--- a/src/menunode.h
+++ b/src/menunode.h
@@ -22,7 +22,7 @@ class MenuNode
         MenuNode* Parent();
         MenuNodeList& Childs();
         MenuNode* AddChild(MenuNode* child);
-        virtual SubMenuPatch::MainMenuItem* CreateMainMenuItem();
+        virtual SubMenuPatch::IMainMenuItem* CreateMainMenuItem();
 };
 
 #endif
diff --git a/src/pluginmenuitem.cpp b/src/pluginmenuitem.cpp
index d44d747..f2a30ae 100644
--- a/src/pluginmenuitem.cpp
+++ b/src/pluginmenuitem.cpp
@@ -1,5 +1,6 @@
 #include "pluginmenuitem.h"
 #include <vdr/submenupatch.h>
+#include "pluginmainmenuitem.h"
 
 PluginMenuItem::PluginMenuItem(const char* pluginMainMenuEntry, int pluginIndex)
 {
@@ -7,8 +8,7 @@ PluginMenuItem::PluginMenuItem(const char* pluginMainMenuEntry, int pluginIndex)
     _pluginIndex = pluginIndex;
 }
 
-SubMenuPatch::MainMenuItem* PluginMenuItem::CreateMainMenuItem()
+SubMenuPatch::IMainMenuItem* PluginMenuItem::CreateMainMenuItem()
 {
-    return SubMenuPatch::MainMenuItem::CreatePluginMenuItem(
-      _pluginMainMenuEntry, _pluginIndex);
+    return new PluginMainMenuItem(_pluginMainMenuEntry, _pluginIndex);
 }
diff --git a/src/pluginmenuitem.h b/src/pluginmenuitem.h
index 069abce..b9fbde4 100644
--- a/src/pluginmenuitem.h
+++ b/src/pluginmenuitem.h
@@ -13,7 +13,7 @@ class PluginMenuItem: public MenuNode
 
     public:
         PluginMenuItem(const char* pluginMainMenuEntry, int pluginIndex);
-        SubMenuPatch::MainMenuItem* CreateMainMenuItem();
+        SubMenuPatch::IMainMenuItem* CreateMainMenuItem();
 };
 
 #endif
diff --git a/src/submenuprovider.cpp b/src/submenuprovider.cpp
index 114fc04..b76c635 100644
--- a/src/submenuprovider.cpp
+++ b/src/submenuprovider.cpp
@@ -63,7 +63,7 @@ void SubMenuProvider::EnterSubMenu(cOsdItem* item)
 {
     for(unsigned int itemIndex=0; itemIndex < _currentMainMenuItems.size(); itemIndex++)
     {
-        MainMenuItem* menuItem = _currentMainMenuItems.at(itemIndex);
+        IMainMenuItem* menuItem = _currentMainMenuItems.at(itemIndex);
         if (menuItem->IsCustomMenuItem() && (menuItem->CustomMenuItem() == item))
         {
             _currentMenu = _currentMenu->Childs().at(itemIndex);
diff --git a/src/vdrmenuitem.cpp b/src/vdrmenuitem.cpp
index 1ca704d..e36d25d 100644
--- a/src/vdrmenuitem.cpp
+++ b/src/vdrmenuitem.cpp
@@ -1,5 +1,6 @@
 #include "vdrmenuitem.h"
 #include <vdr/submenupatch.h>
+#include "custommainmenuitem.h"
 
 VdrMenuItem::VdrMenuItem(std::string itemText, eOSState itemState)
 {
@@ -7,8 +8,7 @@ VdrMenuItem::VdrMenuItem(std::string itemText, eOSState itemState)
     _itemState = itemState;
 }
 
-SubMenuPatch::MainMenuItem* VdrMenuItem::CreateMainMenuItem()
+SubMenuPatch::IMainMenuItem* VdrMenuItem::CreateMainMenuItem()
 {
-    return SubMenuPatch::MainMenuItem::CreateCustomMenuItem(
-      new cOsdItem(_itemText.c_str(), _itemState));
+    return new CustomMainMenuItem(new cOsdItem(_itemText.c_str(), _itemState));
 }
diff --git a/src/vdrmenuitem.h b/src/vdrmenuitem.h
index 166e5e0..c518fe8 100644
--- a/src/vdrmenuitem.h
+++ b/src/vdrmenuitem.h
@@ -14,7 +14,7 @@ class VdrMenuItem: public MenuNode
 
     public:
         VdrMenuItem(std::string itemText, eOSState itemState);
-        SubMenuPatch::MainMenuItem* CreateMainMenuItem();
+        SubMenuPatch::IMainMenuItem* CreateMainMenuItem();
 };
 
 #endif