mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Testing list edit problem #249; Commented some not used code

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@426 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2010-02-26 17:49:28 +00:00
parent 55956cf728
commit 42078cdd8f
5 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/bouquetlist.cpp
View File

@@ -113,6 +113,7 @@ int CBouquetList::getActiveBouquetNumber()
return selected; return selected;
} }
#if 0
void CBouquetList::adjustToChannel( int nChannelNr) void CBouquetList::adjustToChannel( int nChannelNr)
{ {
for (uint32_t i=0; i<Bouquets.size(); i++) { for (uint32_t i=0; i<Bouquets.size(); i++) {
@@ -124,7 +125,7 @@ void CBouquetList::adjustToChannel( int nChannelNr)
} }
} }
} }
#endif
bool CBouquetList::hasChannelID(t_channel_id channel_id) bool CBouquetList::hasChannelID(t_channel_id channel_id)
{ {
for (uint32_t i = 0; i < Bouquets.size(); i++) { for (uint32_t i = 0; i < Bouquets.size(); i++) {
@@ -342,14 +343,18 @@ int CBouquetList::show(bool bShowChannelList)
hide(); hide();
return -3; return -3;
} else if(msg == CRCInput::RC_yellow || msg == CRCInput::RC_sat) { } else if(msg == CRCInput::RC_yellow || msg == CRCInput::RC_sat) {
if(bShowChannelList) {
CNeutrinoApp::getInstance()->SetChannelMode(LIST_MODE_SAT); CNeutrinoApp::getInstance()->SetChannelMode(LIST_MODE_SAT);
hide(); hide();
return -3; return -3;
}
} else if(msg == CRCInput::RC_blue) { } else if(msg == CRCInput::RC_blue) {
if(bShowChannelList) {
CNeutrinoApp::getInstance()->SetChannelMode(LIST_MODE_ALL); CNeutrinoApp::getInstance()->SetChannelMode(LIST_MODE_ALL);
hide(); hide();
return -3; return -3;
} }
}
else if(Bouquets.size() == 0) else if(Bouquets.size() == 0)
continue; //FIXME msgs not forwarded to neutrino !! continue; //FIXME msgs not forwarded to neutrino !!
else if ( msg == CRCInput::RC_setup) { else if ( msg == CRCInput::RC_setup) {

2
src/gui/bouquetlist.h
View File

@@ -114,7 +114,7 @@ class CBouquetList
int activateBouquet(int id, bool bShowChannelList); int activateBouquet(int id, bool bShowChannelList);
int show(bool bShowChannelList = true); int show(bool bShowChannelList = true);
int showChannelList(int nBouquet = -1); int showChannelList(int nBouquet = -1);
void adjustToChannel(int nChannelNr); //void adjustToChannel(int nChannelNr);
bool adjustToChannelID(t_channel_id channel_id); bool adjustToChannelID(t_channel_id channel_id);
int exec( bool bShowChannelList); int exec( bool bShowChannelList);
bool hasChannelID(t_channel_id channel_id); bool hasChannelID(t_channel_id channel_id);

13
src/gui/channellist.cpp
View File

@@ -89,6 +89,7 @@ int info_height = 0;
bool new_mode_active = 0; bool new_mode_active = 0;
//int list_changed = 0; //int list_changed = 0;
static bool pipzap; static bool pipzap;
extern int g_channel_list_changed;
extern CBouquetManager *g_bouquetManager; extern CBouquetManager *g_bouquetManager;
void sectionsd_getChannelEvents(CChannelEventList &eList, const bool tv_mode, t_channel_id *chidlist, int clen); void sectionsd_getChannelEvents(CChannelEventList &eList, const bool tv_mode, t_channel_id *chidlist, int clen);
@@ -485,7 +486,7 @@ int CChannelList::show()
bool loop=true; bool loop=true;
while (loop) { while (loop) {
g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd ); g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd, true);
if ( msg <= CRCInput::RC_MaxRC ) if ( msg <= CRCInput::RC_MaxRC )
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]);
@@ -516,8 +517,8 @@ int CChannelList::show()
} }
else if ( msg == CRCInput::RC_setup) { else if ( msg == CRCInput::RC_setup) {
old_b_id = bouquetList->getActiveBouquetNumber(); old_b_id = bouquetList->getActiveBouquetNumber();
int ret = doChannelMenu(); g_channel_list_changed = doChannelMenu();
if(ret) { if(g_channel_list_changed) {
res = -4; res = -4;
loop = false; loop = false;
} else { } else {
@@ -889,6 +890,7 @@ printf("CChannelList::adjustToChannelID me %x [%s] list size %d channel_id %llx\
return false; return false;
} }
#if 0
int CChannelList::hasChannel(int nChannelNr) int CChannelList::hasChannel(int nChannelNr)
{ {
for (uint32_t i=0;i<chanlist.size();i++) { for (uint32_t i=0;i<chanlist.size();i++) {
@@ -897,6 +899,7 @@ int CChannelList::hasChannel(int nChannelNr)
} }
return(-1); return(-1);
} }
#endif
int CChannelList::hasChannelID(t_channel_id channel_id) int CChannelList::hasChannelID(t_channel_id channel_id)
{ {
@@ -988,7 +991,8 @@ int CChannelList::numericZap(int key)
if (key == g_settings.key_zaphistory) { if (key == g_settings.key_zaphistory) {
if(!autoshift && CNeutrinoApp::getInstance()->recordingstatus) { if(!autoshift && CNeutrinoApp::getInstance()->recordingstatus) {
CChannelList * orgList = bouquetList->orgChannelList; //CChannelList * orgList = bouquetList->orgChannelList;
CChannelList * orgList = CNeutrinoApp::getInstance()->channelList;
CChannelList * channelList = new CChannelList(g_Locale->getText(LOCALE_CHANNELLIST_CURRENT_TP), false, true); CChannelList * channelList = new CChannelList(g_Locale->getText(LOCALE_CHANNELLIST_CURRENT_TP), false, true);
t_channel_id recid = rec_channel_id >> 16; t_channel_id recid = rec_channel_id >> 16;
for ( unsigned int i = 0 ; i < orgList->chanlist.size(); i++) { for ( unsigned int i = 0 ; i < orgList->chanlist.size(); i++) {
@@ -1304,7 +1308,6 @@ printf("CChannelList::quickZap: new selected %d total %d active bouquet %d total
else if ((key==g_settings.key_quickzap_up) || (key == CRCInput::RC_right)) { else if ((key==g_settings.key_quickzap_up) || (key == CRCInput::RC_right)) {
selected = (selected+1)%chanlist.size(); selected = (selected+1)%chanlist.size();
} }
//printf("[neutrino] quick zap selected = %d bouquetList %x getActiveBouquetNumber %d orgChannelList %x\n", selected, bouquetList, bouquetList->getActiveBouquetNumber(), bouquetList->orgChannelList);
CNeutrinoApp::getInstance()->channelList->zapTo(getKey(selected)-1); CNeutrinoApp::getInstance()->channelList->zapTo(getKey(selected)-1);
} }
g_RCInput->clearRCMsg(); //FIXME test for n.103 g_RCInput->clearRCMsg(); //FIXME test for n.103

2
src/gui/channellist.h
View File

@@ -114,7 +114,7 @@ class CChannelList
int show(); int show();
int exec(); int exec();
void quickZap(int key, bool cycle = false); void quickZap(int key, bool cycle = false);
int hasChannel(int nChannelNr); //int hasChannel(int nChannelNr);
int hasChannelID(t_channel_id channel_id); int hasChannelID(t_channel_id channel_id);
void setSelected( int nChannelNr); // for adjusting bouquet's channel list after numzap or quickzap void setSelected( int nChannelNr); // for adjusting bouquet's channel list after numzap or quickzap

24
src/neutrino.cpp
View File

@@ -199,6 +199,8 @@ int prev_video_mode;
int xres = 72; int xres = 72;
int yres = 72; // TODO: no globals for that. int yres = 72; // TODO: no globals for that.
int g_channel_list_changed;
void stop_daemons(bool stopall = true); void stop_daemons(bool stopall = true);
// uncomment if you want to have a "test" menue entry (rasc) // uncomment if you want to have a "test" menue entry (rasc)
@@ -1704,19 +1706,25 @@ void CNeutrinoApp::channelsInit(bool /*bOnly*/)
if(g_settings.make_hd_list) if(g_settings.make_hd_list)
hdBouquet = new CBouquet(0, (char *) "HD", false); hdBouquet = new CBouquet(0, (char *) "HD", false);
/* TODO: check, is really needed to have main "all channels" list sorted
according to channel number ? Anything besides
channelList::zapTo(pos) using direct [number] access in list ??
zapTo(pos) used in epgplus.cpp and channellist.cpp
getActiveChannelNumber used to get index for direct access too ?
*/
int tvi = 0, ri = 0, hi = 0; int tvi = 0, ri = 0, hi = 0;
for (tallchans_iterator it = allchans.begin(); it != allchans.end(); it++) { for (tallchans_iterator it = allchans.begin(); it != allchans.end(); it++) {
if (it->second.getServiceType() == ST_DIGITAL_TELEVISION_SERVICE) { if (it->second.getServiceType() == ST_DIGITAL_TELEVISION_SERVICE) {
TVchannelList->putChannel(&(it->second)); TVchannelList->putChannel(&(it->second));
tvi++; tvi++;
#if 1
if(g_settings.make_hd_list) if(g_settings.make_hd_list)
if(it->second.isHD()) { if(it->second.isHD()) {
//printf("HD channel: %d %s sid %x\n", it->second.getSatellitePosition(), it->second.getName().c_str(), it->second.getServiceId()); //printf("HD channel: %d %s sid %x\n", it->second.getSatellitePosition(), it->second.getName().c_str(), it->second.getServiceId());
hdBouquet->channelList->addChannel(&(it->second)); hdBouquet->channelList->addChannel(&(it->second));
hi++; hi++;
} }
#endif
} }
else if (it->second.getServiceType() == ST_DIGITAL_RADIO_SOUND_SERVICE) { else if (it->second.getServiceType() == ST_DIGITAL_RADIO_SOUND_SERVICE) {
RADIOchannelList->putChannel(&(it->second)); RADIOchannelList->putChannel(&(it->second));
@@ -3037,18 +3045,18 @@ _repeat:
nNewChannel = bouquetList->exec(true); nNewChannel = bouquetList->exec(true);
goto _repeat; goto _repeat;
} }
else if(nNewChannel == -4) { //else if(nNewChannel == -4)
if(g_channel_list_changed)
{
SetChannelMode(old_mode);
g_channel_list_changed = 0;
if(old_b_id < 0) old_b_id = old_b; if(old_b_id < 0) old_b_id = old_b;
g_Zapit->saveBouquets(); g_Zapit->saveBouquets();
} }
if(g_settings.mode_clock) if(g_settings.mode_clock)
InfoClock->StartClock(); InfoClock->StartClock();
#if 0
/* FIXME: more check for StartSubtitles() like was no zap ?? */
if(mode == mode_tv)
StartSubtitles();
#endif
return messages_return::handled; return messages_return::handled;
} }
} }