frodovdr/vdr-plugin-tvguide
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git synced 2023-10-05 15:01:48 +02:00
Code Issues Releases Wiki Activity

Move some inits to cRecMenuSearchTimerEdit::cRecMenuSearchTimerEdit

Browse Source
This commit is contained in:
kamel5 2019-06-17 12:25:12 +02:00
parent 1a2da2da0a
commit 5b1e174316
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
recmenus.c
View File

@ -757,6 +757,13 @@ cRecMenuSearchTimerEdit::cRecMenuSearchTimerEdit(cTVGuideSearchTimer searchTimer
compareSummary = searchTimer.CompareSummary(); compareSummary = searchTimer.CompareSummary();
useInFavorites = searchTimer.UseInFavorites(); useInFavorites = searchTimer.UseInFavorites();
searchTimer.GetSearchModes(&searchModes);
searchTimer.GetUseChannelModes(&useChannelModes);
searchTimer.GetCompareDateModes(&compareDateModes);
searchTimer.GetSearchTimerModes(&searchTimerModes);
searchTimer.GetDelModes(&delModes);
channelgroupIndex = SplitChannelGroups(&channelGroups, &channelgroups);
SetWidthPercent(70); SetWidthPercent(70);
cString infoText; cString infoText;
if (searchTimer.GetID() > -1) { if (searchTimer.GetID() > -1) {
@ -806,12 +813,6 @@ void cRecMenuSearchTimerEdit::InitMenuItems(void) {
useDayOfWeekPos = 8; useDayOfWeekPos = 8;
avoidRepeatsPos = 14; avoidRepeatsPos = 14;
std::vector<std::string> searchModes;
searchTimer.GetSearchModes(&searchModes);
std::vector<std::string> useChannelModes;
searchTimer.GetUseChannelModes(&useChannelModes);
channelgroupIndex = SplitChannelGroups(&channelGroups, &channelgroups);
mainMenuItems.push_back(new cRecMenuItemText(tr("Search String"), searchString, TEXTINPUTLENGTH, false, searchString)); mainMenuItems.push_back(new cRecMenuItemText(tr("Search String"), searchString, TEXTINPUTLENGTH, false, searchString));
mainMenuItems.push_back(new cRecMenuItemBool(tr("Active"), timerActive, false, false, &timerActive, rmsSearchTimerSave)); mainMenuItems.push_back(new cRecMenuItemBool(tr("Active"), timerActive, false, false, &timerActive, rmsSearchTimerSave));
mainMenuItems.push_back(new cRecMenuItemSelect(tr("Search Mode"), searchModes, mode, false, &mode, rmsSearchTimerSave)); mainMenuItems.push_back(new cRecMenuItemSelect(tr("Search Mode"), searchModes, mode, false, &mode, rmsSearchTimerSave));

8
recmenus.h
View File

@ -208,7 +208,14 @@ public:
class cRecMenuSearchTimerEdit: public cRecMenu { class cRecMenuSearchTimerEdit: public cRecMenu {
private: private:
cTVGuideSearchTimer searchTimer; cTVGuideSearchTimer searchTimer;
cTVGuideSearchTimer sT;
std::vector<std::string> searchModes;
std::vector<std::string> useChannelModes;
std::vector<std::string> channelGroups; std::vector<std::string> channelGroups;
std::vector<std::string> compareDateModes;
std::vector<std::string> searchTimerModes;
std::vector<std::string> delModes;
std::vector<std::string> channelgroups;
std::vector<cRecMenuItem*> mainMenuItems; std::vector<cRecMenuItem*> mainMenuItems;
std::vector<cRecMenuItem*> currentMenuItems; std::vector<cRecMenuItem*> currentMenuItems;
int numMenuItems; int numMenuItems;
@ -226,7 +233,6 @@ private:
int startChannel; int startChannel;
int stopChannel; int stopChannel;
std::string channelGroup; std::string channelGroup;
std::vector<std::string> channelgroups;
int channelgroupIndex; int channelgroupIndex;
bool useTime; bool useTime;
int startTime; int startTime;