mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

format channellist.cpp/.h with astyle

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1232 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2011-02-27 22:29:15 +00:00
parent e045569027
commit c17a355457
2 changed files with 363 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/gui/channellist.cpp
View File

@@ -618,13 +618,19 @@ int CChannelList::show()
selected=0; selected=0;
liststart = (selected/listmaxshow)*listmaxshow; liststart = (selected/listmaxshow)*listmaxshow;
paint(); paint();
if(this->new_mode_active && SameTP()) { actzap = true; zapTo(selected); } if(this->new_mode_active && SameTP()) {
actzap = true;
zapTo(selected);
}
} }
else if (msg == (neutrino_msg_t) g_settings.key_list_end) { else if (msg == (neutrino_msg_t) g_settings.key_list_end) {
selected=chanlist.size()-1; selected=chanlist.size()-1;
liststart = (selected/listmaxshow)*listmaxshow; liststart = (selected/listmaxshow)*listmaxshow;
paint(); paint();
if(this->new_mode_active && SameTP()) { actzap = true; zapTo(selected); } if(this->new_mode_active && SameTP()) {
actzap = true;
zapTo(selected);
}
} }
else if (msg == CRCInput::RC_up || (int) msg == g_settings.key_channelList_pageup) else if (msg == CRCInput::RC_up || (int) msg == g_settings.key_channelList_pageup)
{ {
@@ -650,7 +656,10 @@ int CChannelList::show()
showChannelLogo(); showChannelLogo();
} }
if(this->new_mode_active && SameTP()) { actzap = true; zapTo(selected); } if(this->new_mode_active && SameTP()) {
actzap = true;
zapTo(selected);
}
//paintHead(); //paintHead();
} }
else if (msg == CRCInput::RC_down || (int) msg == g_settings.key_channelList_pagedown) else if (msg == CRCInput::RC_down || (int) msg == g_settings.key_channelList_pagedown)
@@ -679,7 +688,10 @@ int CChannelList::show()
showChannelLogo(); showChannelLogo();
} }
if(this->new_mode_active && SameTP()) { actzap = true; zapTo(selected); } if(this->new_mode_active && SameTP()) {
actzap = true;
zapTo(selected);
}
//paintHead(); //paintHead();
} }
@@ -741,16 +753,36 @@ int CChannelList::show()
else if (CRCInput::isNumeric(msg) && (this->historyMode || g_settings.sms_channel)) { else if (CRCInput::isNumeric(msg) && (this->historyMode || g_settings.sms_channel)) {
if (this->historyMode) { //numeric zap if (this->historyMode) { //numeric zap
switch (msg) { switch (msg) {
case CRCInput::RC_0:selected = 0;break; case CRCInput::RC_0:
case CRCInput::RC_1:selected = 1;break; selected = 0;
case CRCInput::RC_2:selected = 2;break; break;
case CRCInput::RC_3:selected = 3;break; case CRCInput::RC_1:
case CRCInput::RC_4:selected = 4;break; selected = 1;
case CRCInput::RC_5:selected = 5;break; break;
case CRCInput::RC_6:selected = 6;break; case CRCInput::RC_2:
case CRCInput::RC_7:selected = 7;break; selected = 2;
case CRCInput::RC_8:selected = 8;break; break;
case CRCInput::RC_9:selected = 9;break; case CRCInput::RC_3:
selected = 3;
break;
case CRCInput::RC_4:
selected = 4;
break;
case CRCInput::RC_5:
selected = 5;
break;
case CRCInput::RC_6:
selected = 6;
break;
case CRCInput::RC_7:
selected = 7;
break;
case CRCInput::RC_8:
selected = 8;
break;
case CRCInput::RC_9:
selected = 9;
break;
}; };
zapOnExit = true; zapOnExit = true;
loop = false; loop = false;
@@ -946,7 +978,8 @@ bool CChannelList::adjustToChannelID(const t_channel_id channel_id, bool bToo)
unsigned int i; unsigned int i;
selected_chid = channel_id; selected_chid = channel_id;
printf("CChannelList::adjustToChannelID me %p [%s] list size %d channel_id %llx\n", this, getName(), chanlist.size(), channel_id);fflush(stdout); printf("CChannelList::adjustToChannelID me %p [%s] list size %d channel_id %llx\n", this, getName(), chanlist.size(), channel_id);
fflush(stdout);
for (i = 0; i < chanlist.size(); i++) { for (i = 0; i < chanlist.size(); i++) {
if(chanlist[i] == NULL) { if(chanlist[i] == NULL) {
printf("CChannelList::adjustToChannelID REPORT BUG !! ******************************** %d is NULL !!\n", i); printf("CChannelList::adjustToChannelID REPORT BUG !! ******************************** %d is NULL !!\n", i);

14
src/gui/channellist.h
View File

@@ -101,11 +101,19 @@ class CChannelList
CZapitChannel* getChannel(int number); CZapitChannel* getChannel(int number);
CZapitChannel* getChannel(t_channel_id channel_id); CZapitChannel* getChannel(t_channel_id channel_id);
CZapitChannel* getChannelFromIndex( uint32_t index) { if (chanlist.size() > index) return chanlist[index]; else return NULL;}; CZapitChannel* getChannelFromIndex( uint32_t index) {
CZapitChannel* operator[]( uint32_t index) { if (chanlist.size() > index) return chanlist[index]; else return NULL;}; if (chanlist.size() > index) return chanlist[index];
else return NULL;
};
CZapitChannel* operator[]( uint32_t index) {
if (chanlist.size() > index) return chanlist[index];
else return NULL;
};
int getKey(int); int getKey(int);
const char * getName (void) const { return name.c_str(); }; const char * getName (void) const {
return name.c_str();
};
const std::string & getActiveChannelName (void) const; // UTF-8 const std::string & getActiveChannelName (void) const; // UTF-8
t_satellite_position getActiveSatellitePosition(void) const; t_satellite_position getActiveSatellitePosition(void) const;
int getActiveChannelNumber (void) const; int getActiveChannelNumber (void) const;