diff options
Diffstat (limited to 'menu_searchedit.c')
| -rw-r--r-- | menu_searchedit.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/menu_searchedit.c b/menu_searchedit.c index a296fe8..624a343 100644 --- a/menu_searchedit.c +++ b/menu_searchedit.c @@ -49,9 +49,7 @@ cSearchExtCats SearchExtCats; cMenuEditSearchExt::cMenuEditSearchExt(cSearchExt *SearchExt, bool New, bool Template, bool FromEPG) :cOsdMenu(tr("Edit search"),32) { -#if VDRVERSNUM >= 10728 SetMenuCategory(mcPlugin); -#endif templateMode = Template; SearchModes[0] = strdup(tr("phrase")); @@ -103,7 +101,6 @@ cMenuEditSearchExt::cMenuEditSearchExt(cSearchExt *SearchExt, bool New, bool Tem CompareDateModes[2] = strdup(tr("same week")); CompareDateModes[3] = strdup(tr("same month")); -#if APIVERSNUM > 10710 // collect content string IDs std::set<std::string> contentStrings; for(unsigned int i=0; i<CONTENT_DESCRIPTOR_MAX;i++) @@ -115,7 +112,6 @@ cMenuEditSearchExt::cMenuEditSearchExt(cSearchExt *SearchExt, bool New, bool Tem contentStringIDs.push_back(i); } } -#endif useContentDescriptors = false; if (!templateMode && New) @@ -175,13 +171,11 @@ cMenuEditSearchExt::cMenuEditSearchExt(cSearchExt *SearchExt, bool New, bool Tem } contentStringsFlags = NULL; -#if APIVERSNUM > 10710 // set the flags for the content descriptors contentStringsFlags = (int*) malloc((CONTENT_DESCRIPTOR_MAX+1) * sizeof(int)); for(unsigned int i=0; i<=CONTENT_DESCRIPTOR_MAX;i++) contentStringsFlags[i] = data.HasContent(i); useContentDescriptors = (data.contentsFilter.size() > 0); -#endif catarrayAvoidRepeats = NULL; catvaluesNumeric = NULL; @@ -255,7 +249,6 @@ void cMenuEditSearchExt::Set() Add(new cMenuEditBoolItem( tr("Use description"), &data.useDescription, trVDR("no"), trVDR("yes"))); AddHelp(tr("Help$Set this to 'Yes' if you like to search in the summary of an event.")); -#if APIVERSNUM > 10710 Add(new cMenuEditBoolItem( tr("Use content descriptor"), &useContentDescriptors, trVDR("no"), trVDR("yes"))); AddHelp(tr("Help$Set this to 'Yes' if you want to search the contents by a descriptor.")); if (useContentDescriptors) @@ -267,7 +260,6 @@ void cMenuEditSearchExt::Set() Add(new cMenuEditBoolItem(IndentMenuItem(tr(cEvent::ContentToString(contentStringIDs[i])), level), &contentStringsFlags[contentStringIDs[i]], trVDR("no"), trVDR("yes"))); } } -#endif // show Categories only if we have them if (SearchExtCats.Count() > 0) @@ -834,9 +826,7 @@ eOSState cMenuEditSearchExt::ProcessKey(eKeys Key) cMenuEditDaysOfWeek::cMenuEditDaysOfWeek(int* DaysOfWeek, int Offset, bool Negate) :cOsdMenu(tr("Edit user-defined days of week"),30) { -#if VDRVERSNUM >= 10728 SetMenuCategory(mcPlugin); -#endif int i=0; offset = Offset; negate = Negate; @@ -880,9 +870,7 @@ eOSState cMenuEditDaysOfWeek::ProcessKey(eKeys Key) cMenuSearchEditCompCats::cMenuSearchEditCompCats(int* catarrayAvoidRepeats) :cOsdMenu(tr("Compare categories"),30) { -#if VDRVERSNUM >= 10728 SetMenuCategory(mcPlugin); -#endif search_catarrayAvoidRepeats = catarrayAvoidRepeats; edit_catarrayAvoidRepeats = (int*) malloc(SearchExtCats.Count() * sizeof(int)); cSearchExtCat *SearchExtCat = SearchExtCats.First(); @@ -930,9 +918,7 @@ eOSState cMenuSearchEditCompCats::ProcessKey(eKeys Key) cMenuBlacklistsSelection::cMenuBlacklistsSelection(cList<cBlacklistObject>* pBlacklists) :cOsdMenu(tr("Select blacklists"),30) { -#if VDRVERSNUM >= 10728 SetMenuCategory(mcPlugin); -#endif blacklists = pBlacklists; blacklistsSel = new int[Blacklists.Count()]; cMutexLock BlacklistLock(&Blacklists); @@ -1075,9 +1061,7 @@ eOSState cMenuBlacklistsSelection::ProcessKey(eKeys Key) cMenuCatValuesSelect::cMenuCatValuesSelect(char* CatValues, int CatIndex, int SearchMode) :cOsdMenu(tr("Values for EPG category"), 1, 40) { -#if VDRVERSNUM >= 10728 SetMenuCategory(mcPlugin); -#endif catValues = CatValues; catIndex = CatIndex; @@ -1208,9 +1192,7 @@ eOSState cMenuCatValuesSelect::ProcessKey(eKeys Key) cMenuSearchActivSettings::cMenuSearchActivSettings(cSearchExt *SearchExt) :cOsdMenu(tr("Activation of search timer"), 25) { -#if VDRVERSNUM >= 10728 SetMenuCategory(mcPlugin); -#endif searchExt = SearchExt; if (searchExt) |