diff options
author | Soeren Moch <smoch@web.de> | 2021-02-28 23:18:59 +0100 |
---|---|---|
committer | kamel5 <vdr.kamel5 (at) gmx (dot) net> | 2021-03-10 16:32:14 +0100 |
commit | b249d2003fb6d02e8127b7744af2f2b09be8010e (patch) | |
tree | 756fae2cef5f8eb1752f3df9497e68370499f3c2 /displaymenu.h | |
parent | 88dd896bf6843e7738f5457e8d990a947871ea9a (diff) | |
download | skin-nopacity-b249d2003fb6d02e8127b7744af2f2b09be8010e.tar.gz skin-nopacity-b249d2003fb6d02e8127b7744af2f2b09be8010e.tar.bz2 |
Convert menuItems from cList to std::vector
This allows to access menu items in arbitrary order. This is required to
learn remote control keys in the remote plugin.
Also clear Tabs when creating menu to avoid uninitialized use.
Signed-off-by: Soeren Moch <smoch@web.de>
Diffstat (limited to 'displaymenu.h')
-rw-r--r-- | displaymenu.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/displaymenu.h b/displaymenu.h index a90e2ce..e08b6f0 100644 --- a/displaymenu.h +++ b/displaymenu.h @@ -4,6 +4,8 @@ #include "nopacity.h" #include "menuitem.h" #include <vdr/thread.h> +#include <memory> +#include <vector> class cNopacityDisplayMenu : public cSkinDisplayMenu , cThread { private: @@ -15,15 +17,13 @@ private: int FrameTime; int FadeTime; bool initial; - bool initMenu; bool diskUsageDrawn; int lastDiskUsageState; int lastTimersState; bool timersDrawn; - int menuItemIndexLast; int currentNumItems; cList<cNopacityTimer> timers; - cList<cNopacityMenuItem> menuItems; + std::vector<std::unique_ptr<cNopacityMenuItem>> menuItems; int positionButtons[4]; cRect videoWindowRect; int currentFeed; |