mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 02:11:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

CNeutrinoEventList::findEvents - add search all epg option

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 35bac1ff40
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-17 (Fri, 17 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2013-05-17 21:08:09 +02:00
parent f2e0400728
commit 96873536d1
8 changed files with 63 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/eventlist.cpp
View File

@@ -92,7 +92,6 @@ CNeutrinoEventList::CNeutrinoEventList()
sort_mode = 0;
m_search_list = SEARCH_LIST_NONE;
m_search_epg_item = SEARCH_LIST_NONE;
m_search_epg_item = SEARCH_EPG_TITLE;
m_search_channel_id = 1;
m_search_bouquet_id= 1;
@@ -1034,7 +1033,6 @@ bool CNeutrinoEventList::findEvents(void)
hide();
menu.exec(NULL,"");
search_head_name = g_Locale->getText(LOCALE_EVENTFINDER_SEARCH);
if(event == 1)
{
res = true;
@@ -1071,7 +1069,7 @@ bool CNeutrinoEventList::findEvents(void)
for (it = v.begin(); it != v.end(); ++it){
ch_id_map[*it & 0xFFFFFFFFFFFFULL] = *it;
}
CEitManager::getInstance()->getEventsServiceKey(1/*hack*/,evtlist, m_search_epg_item,m_search_keyword);
CEitManager::getInstance()->getEventsServiceKey(0,evtlist, m_search_epg_item,m_search_keyword, true);//all_chann
std::map<t_channel_id, t_channel_id>::iterator map_it;
CChannelEventList::iterator e;
@@ -1167,14 +1165,15 @@ const CMenuOptionChooser::keyval SEARCH_LIST_OPTIONS[SEARCH_LIST_OPTION_COUNT] =
};
#define SEARCH_EPG_OPTION_COUNT 3
#define SEARCH_EPG_OPTION_COUNT 4
const CMenuOptionChooser::keyval SEARCH_EPG_OPTIONS[SEARCH_EPG_OPTION_COUNT] =
{
// { CNeutrinoEventList::SEARCH_EPG_NONE, LOCALE_PICTUREVIEWER_RESIZE_NONE },
{ CNeutrinoEventList::SEARCH_EPG_TITLE, LOCALE_FONTSIZE_EPG_TITLE },
{ CNeutrinoEventList::SEARCH_EPG_INFO1, LOCALE_FONTSIZE_EPG_INFO1 },
{ CNeutrinoEventList::SEARCH_EPG_INFO2, LOCALE_FONTSIZE_EPG_INFO2 }
// ,{ CNeutrinoEventList::SEARCH_EPG_GENRE, LOCALE_MOVIEBROWSER_INFO_GENRE_MAJOR }
{ CNeutrinoEventList::SEARCH_EPG_INFO2, LOCALE_FONTSIZE_EPG_INFO2 },
// { CNeutrinoEventList::SEARCH_EPG_GENRE, LOCALE_MOVIEBROWSER_INFO_GENRE_MAJOR },
{ CNeutrinoEventList::SEARCH_EPG_ALL, LOCALE_EVENTFINDER_SEARCH_ALL_EPG }
};
@@ -1203,7 +1202,6 @@ int CEventFinderMenu::exec(CMenuTarget* parent, const std::string &actionkey)
{
int res = menu_return::RETURN_REPAINT;
if(actionkey =="")
{
if(parent != NULL)
@@ -1335,6 +1333,7 @@ int CEventFinderMenu::showMenu(void)
bool CEventFinderMenu::changeNotify(const neutrino_locale_t OptionName, void *)
/************************************************************************************************/
{
if (ARE_LOCALES_EQUAL(OptionName, LOCALE_EVENTFINDER_SEARCH_WITHIN_LIST))
{
if (*m_search_list == CNeutrinoEventList::SEARCH_LIST_CHANNEL)

50
src/gui/eventlist.h
View File

@@ -46,32 +46,32 @@
class CNeutrinoEventList
{
// Eventfinder start
public:
typedef enum
{
SEARCH_EPG_NONE,
SEARCH_EPG_TITLE,
SEARCH_EPG_INFO1,
SEARCH_EPG_INFO2,
SEARCH_EPG_GENRE,
SEARCH_EPG_ALL
}SEARCH_EPG;
typedef enum
{
SEARCH_LIST_NONE,
SEARCH_LIST_CHANNEL,
SEARCH_LIST_BOUQUET,
SEARCH_LIST_ALL
}SEARCH_LIST;
private:
int m_search_epg_item;
std::string m_search_keyword;
// Eventfinder start
public:
typedef enum
{
SEARCH_EPG_NONE,
SEARCH_EPG_TITLE,
SEARCH_EPG_INFO1,
SEARCH_EPG_INFO2,
SEARCH_EPG_GENRE,
SEARCH_EPG_ALL
}SEARCH_EPG;
typedef enum
{
SEARCH_LIST_NONE,
SEARCH_LIST_CHANNEL,
SEARCH_LIST_BOUQUET,
SEARCH_LIST_ALL
}SEARCH_LIST;
private:
int m_search_epg_item;
std::string m_search_keyword;
std::string m_search_autokeyword;
int m_search_list;
t_channel_id m_search_channel_id;
t_bouquet_id m_search_bouquet_id;
bool m_showChannel;
int m_search_list;
t_channel_id m_search_channel_id;
t_bouquet_id m_search_bouquet_id;
bool m_showChannel;
int FunctionBarHeight;
int oldIndex;
event_id_t oldEventID;