mirror of
https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git
synced 2023-10-05 15:01:48 +02:00
Eliminate all currentMenuItems
This commit is contained in:
parent
ef4ff3d115
commit
507ecc60f6
@ -759,7 +759,6 @@ cRecMenuSearchTimerEdit::~cRecMenuSearchTimerEdit(void) {
|
|||||||
delete *it;
|
delete *it;
|
||||||
}
|
}
|
||||||
mainMenuItems.clear();
|
mainMenuItems.clear();
|
||||||
currentMenuItems.clear();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int cRecMenuSearchTimerEdit::SplitChannelGroups(std::vector<std::string> *channelGroups, std::vector<std::string> *channelgroups) {
|
int cRecMenuSearchTimerEdit::SplitChannelGroups(std::vector<std::string> *channelGroups, std::vector<std::string> *channelgroups) {
|
||||||
@ -852,7 +851,7 @@ void cRecMenuSearchTimerEdit::CreateMenuItems(void) {
|
|||||||
|
|
||||||
int start = GetStartIndex();
|
int start = GetStartIndex();
|
||||||
for (int i = start; i < numMenuItems; i++) {
|
for (int i = start; i < numMenuItems; i++) {
|
||||||
if (!AddMenuItemInitial(currentMenuItems[i])) {
|
if (!AddMenuItemInitial(mainMenuItems[i])) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -923,7 +922,7 @@ int cRecMenuSearchTimerEdit::GetTotalNumMenuItems(void) {
|
|||||||
|
|
||||||
cRecMenuItem *cRecMenuSearchTimerEdit::GetMenuItem(int number) {
|
cRecMenuItem *cRecMenuSearchTimerEdit::GetMenuItem(int number) {
|
||||||
if ((number > -1) && (number < numMenuItems)) {
|
if ((number > -1) && (number < numMenuItems)) {
|
||||||
return currentMenuItems[number];
|
return mainMenuItems[number];
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -217,7 +217,6 @@ private:
|
|||||||
std::vector<std::string> delModes;
|
std::vector<std::string> delModes;
|
||||||
std::vector<std::string> channelgroups;
|
std::vector<std::string> channelgroups;
|
||||||
std::vector<cRecMenuItem*> mainMenuItems;
|
std::vector<cRecMenuItem*> mainMenuItems;
|
||||||
std::vector<cRecMenuItem*> currentMenuItems;
|
|
||||||
bool init;
|
bool init;
|
||||||
int numMenuItems;
|
int numMenuItems;
|
||||||
int useChannelPos;
|
int useChannelPos;
|
||||||
|
Loading…
Reference in New Issue
Block a user