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

fix initializers and shadows

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@123 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 00353cf75d
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-29 (Tue, 29 Dec 2009)



------------------
This commit was generated by Migit
This commit is contained in:
mws
2009-12-29 13:24:33 +00:00
parent 770d1b2222
commit 66c38322c0
6 changed files with 122 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/cam_menu.cpp
View File

@@ -229,13 +229,13 @@ int CCAMMenuHandler::handleCamMsg (const neutrino_msg_t msg, neutrino_msg_data_t
char * sptr = pMenu->subtitle;
char * tptr = sptr;
int bpos = 0;
for(int i = 0; i < slen; i++) {
if((tptr[i] == 0x8A) || ((bpos > 38) && (tptr[i] == 0x20)) ) {
for(int li = 0; li < slen; li++) {
if((tptr[li] == 0x8A) || ((bpos > 38) && (tptr[li] == 0x20)) ) {
bpos = 0;
tptr[i] = 0;
tptr[li] = 0;
printf("CCAMMenuHandler::handleCamMsg: subtitle: %s\n", sptr);
menu->addItem(new CMenuForwarderNonLocalized(convertDVBUTF8(sptr, strlen(sptr), 0).c_str(), false));
sptr = &tptr[i+1];
sptr = &tptr[li+1];
}
bpos++;
}
@@ -262,12 +262,12 @@ printf("CCAMMenuHandler::handleCamMsg: bottom: %s\n", pMenu->bottom);
delete menu;
delete selector;
} else {
char str[255];
snprintf(str, 255, "%s\n%s\n%s", pMenu->title, pMenu->subtitle, pMenu->bottom);
char lstr[255];
snprintf(lstr, 255, "%s\n%s\n%s", pMenu->title, pMenu->subtitle, pMenu->bottom);
if(hintBox)
delete hintBox;
//hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, convertDVBUTF8(pMenu->title, strlen(pMenu->title), 0).c_str());
hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, convertDVBUTF8(str, strlen(str), 0).c_str());
hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, convertDVBUTF8(str, strlen(lstr), 0).c_str());
hintBox->paint();
sleep(4);//FIXME
if(!from_menu) {
@@ -372,7 +372,7 @@ int CCAMMenuHandler::doMenu (int slot)
hintBox = NULL;
CI_CloseMMI(slot);
return menu_return::RETURN_REPAINT;
}
}
/* -1 = not our event, 0 = back to top menu, 1 = continue loop, 2 = quit */
int ret = handleCamMsg(msg, data, true);
if(ret < 0 && (msg > CRCInput::RC_Messages)) {
@@ -398,5 +398,5 @@ int CCAMMenuHandler::doMenu (int slot)
hintBox = NULL;
}
printf("CCAMMenuHandler::doMenu: return\n");
return res;
return res;
}