mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-26 23:13:00 +02:00
fix initializers and shadows
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
@@ -103,19 +103,19 @@ FBFontRenderClass::~FBFontRenderClass()
|
||||
|
||||
FT_Error FBFontRenderClass::FTC_Face_Requester(FTC_FaceID face_id, FT_Face* aface)
|
||||
{
|
||||
fontListEntry *font=(fontListEntry *)face_id;
|
||||
if (!font)
|
||||
fontListEntry *lfont=(fontListEntry *)face_id;
|
||||
if (!lfont)
|
||||
return -1;
|
||||
dprintf(DEBUG_DEBUG, "[FONT] FTC_Face_Requester (%s/%s)\n", font->family, font->style);
|
||||
dprintf(DEBUG_DEBUG, "[FONT] FTC_Face_Requester (%s/%s)\n", lfont->family, lfont->style);
|
||||
|
||||
int error;
|
||||
if ((error=FT_New_Face(library, font->filename, 0, aface)))
|
||||
if ((error=FT_New_Face(library, lfont->filename, 0, aface)))
|
||||
{
|
||||
dprintf(DEBUG_NORMAL, "[FONT] FTC_Face_Requester (%s/%s) failed: %i\n", font->family, font->style, error);
|
||||
dprintf(DEBUG_NORMAL, "[FONT] FTC_Face_Requester (%s/%s) failed: %i\n", lfont->family, lfont->style, error);
|
||||
return error;
|
||||
}
|
||||
|
||||
if (strcmp(font->style, (*aface)->style_name) != 0)
|
||||
if (strcmp(lfont->style, (*aface)->style_name) != 0)
|
||||
{
|
||||
FT_Matrix matrix; // Italics
|
||||
|
||||
@@ -156,9 +156,9 @@ FTC_FaceID FBFontRenderClass::getFaceID(const char * const family, const char *
|
||||
return 0;
|
||||
}
|
||||
|
||||
FT_Error FBFontRenderClass::getGlyphBitmap(FTC_ImageTypeRec *font, FT_ULong glyph_index, FTC_SBit *sbit)
|
||||
FT_Error FBFontRenderClass::getGlyphBitmap(FTC_ImageTypeRec *pfont, FT_ULong glyph_index, FTC_SBit *sbit)
|
||||
{
|
||||
return FTC_SBitCache_Lookup(sbitsCache, font, glyph_index, sbit, NULL);
|
||||
return FTC_SBitCache_Lookup(sbitsCache, pfont, glyph_index, sbit, NULL);
|
||||
}
|
||||
|
||||
FT_Error FBFontRenderClass::getGlyphBitmap(FTC_ScalerRec *sc, FT_ULong glyph_index, FTC_SBit *sbit)
|
||||
@@ -521,7 +521,7 @@ void Font::RenderString(int x, int y, const int width, const char *text, const u
|
||||
else
|
||||
{
|
||||
int start, end;
|
||||
int color = -1;
|
||||
int lcolor = -1;
|
||||
|
||||
if (ax < w)
|
||||
start = 0;
|
||||
@@ -534,12 +534,12 @@ void Font::RenderString(int x, int y, const int width, const char *text, const u
|
||||
end = spread_by + 1;
|
||||
|
||||
for (int i = start; i < end; i++)
|
||||
if (color < *(s - i))
|
||||
color = *(s - i);
|
||||
if (lcolor < *(s - i))
|
||||
lcolor = *(s - i);
|
||||
#ifdef USE_NEVIS_GXA
|
||||
frameBuffer->paintPixel(x + glyph->left + ax, y - glyph->top + ay, colors[color]);
|
||||
frameBuffer->paintPixel(x + glyph->left + ax, y - glyph->top + ay, colors[lcolor]);
|
||||
#else
|
||||
*td++= colors[color];
|
||||
*td++= colors[lcolor];
|
||||
#endif
|
||||
s++;
|
||||
}
|
||||
|
||||
@@ -256,7 +256,7 @@ void CAlphaSetup::paint()
|
||||
//paintSlider(x + 10, y + hheight + mheight, alpha2, LOCALE_GTXALPHA_ALPHA2, ALPHA_SETUP_ICON_DESELECTED , false);
|
||||
}
|
||||
|
||||
void CAlphaSetup::paintSlider(const int x, const int y, const unsigned char * const spos, const neutrino_locale_t text, const char * const iconname, const bool /*selected*/) // UTF-8
|
||||
void CAlphaSetup::paintSlider(const int px, const int py, const unsigned char * const spos, const neutrino_locale_t text, const char * const iconname, const bool /*selected*/) // UTF-8
|
||||
{
|
||||
if (!spos)
|
||||
return;
|
||||
@@ -265,8 +265,8 @@ void CAlphaSetup::paintSlider(const int x, const int y, const unsigned char * co
|
||||
|
||||
frameBuffer->paintBoxRel(x+70,y,120,mheight, COL_MENUCONTENT_PLUS_0);
|
||||
|
||||
frameBuffer->paintIcon("volumebody.raw", x + 70 , y + 2 + mheight / 4);
|
||||
frameBuffer->paintIcon(iconname , x + 73 + sspos, y + mheight / 4);
|
||||
frameBuffer->paintIcon("volumebody.raw", px + 70 , py + 2 + mheight / 4);
|
||||
frameBuffer->paintIcon(iconname , px + 73 + sspos, py + mheight / 4);
|
||||
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x,y+mheight, width, g_Locale->getText(text), COL_MENUCONTENT, 0, true); // UTF-8
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(px,py+mheight, width, g_Locale->getText(text), COL_MENUCONTENT, 0, true); // UTF-8
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -437,35 +437,35 @@ void CMotorControl::hide()
|
||||
stopSatFind();
|
||||
}
|
||||
|
||||
void CMotorControl::paintLine(int x, int * y, int width, char * txt)
|
||||
void CMotorControl::paintLine(int px, int * py, int pwidth, char * txt)
|
||||
{
|
||||
*y += mheight;
|
||||
frameBuffer->paintBoxRel(x, *y - mheight, width, mheight, COL_MENUCONTENT_PLUS_0);
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x, *y, width, txt, COL_MENUCONTENT, 0, true);
|
||||
*py += mheight;
|
||||
frameBuffer->paintBoxRel(px, *py - mheight, pwidth, mheight, COL_MENUCONTENT_PLUS_0);
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(px, *py, pwidth, txt, COL_MENUCONTENT, 0, true);
|
||||
}
|
||||
|
||||
void CMotorControl::paintLine(int x, int y, int width, char * txt)
|
||||
void CMotorControl::paintLine(int px, int py, int pwidth, char * txt)
|
||||
{
|
||||
//frameBuffer->paintBoxRel(x, y - mheight, width, mheight, COL_MENUCONTENT_PLUS_0);
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x, y, width, txt, COL_MENUCONTENT, 0, true);
|
||||
//frameBuffer->paintBoxRel(px, py - mheight, pwidth, mheight, COL_MENUCONTENT_PLUS_0);
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(px, py, pwidth, txt, COL_MENUCONTENT, 0, true);
|
||||
}
|
||||
|
||||
void CMotorControl::paintSeparator(int xpos, int * ypos, int width, char * /*txt*/)
|
||||
void CMotorControl::paintSeparator(int xpos, int * pypos, int pwidth, char * /*txt*/)
|
||||
{
|
||||
//int stringwidth = 0;
|
||||
//int stringstartposX = 0;
|
||||
int th = 10;
|
||||
//*ypos += mheight;
|
||||
*ypos += th;
|
||||
frameBuffer->paintHLineRel(xpos, width - 20, *ypos - (th >> 1), COL_MENUCONTENT_PLUS_3);
|
||||
frameBuffer->paintHLineRel(xpos, width - 20, *ypos - (th >> 1) + 1, COL_MENUCONTENT_PLUS_1);
|
||||
*pypos += th;
|
||||
frameBuffer->paintHLineRel(xpos, pwidth - 20, *pypos - (th >> 1), COL_MENUCONTENT_PLUS_3);
|
||||
frameBuffer->paintHLineRel(xpos, pwidth - 20, *pypos - (th >> 1) + 1, COL_MENUCONTENT_PLUS_1);
|
||||
|
||||
#if 0
|
||||
stringwidth = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(txt);
|
||||
stringstartposX = 0;
|
||||
stringstartposX = (xpos + (width >> 1)) - (stringwidth >> 1);
|
||||
frameBuffer->paintBoxRel(stringstartposX - 5, *ypos - mheight, stringwidth + 10, mheight, COL_MENUCONTENT_PLUS_0);
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(stringstartposX, *ypos, stringwidth, txt, COL_MENUCONTENT);
|
||||
stringstartposX = (xpos + (pwidth >> 1)) - (stringwidth >> 1);
|
||||
frameBuffer->paintBoxRel(stringstartposX - 5, *pypos - mheight, stringwidth + 10, mheight, COL_MENUCONTENT_PLUS_0);
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(stringstartposX, *pypos, stringwidth, txt, COL_MENUCONTENT);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -96,52 +96,52 @@ void strReplace(std::string& orig, const char* fstr, const std::string rstr);
|
||||
#define MESSAGEBOX_BROWSER_ROW_ITEM_COUNT 20
|
||||
const CMenuOptionChooser::keyval MESSAGEBOX_BROWSER_ROW_ITEM[MESSAGEBOX_BROWSER_ROW_ITEM_COUNT] =
|
||||
{
|
||||
{ MB_INFO_FILENAME, LOCALE_MOVIEBROWSER_INFO_FILENAME },
|
||||
{ MB_INFO_FILEPATH, LOCALE_MOVIEBROWSER_INFO_PATH },
|
||||
{ MB_INFO_TITLE, LOCALE_MOVIEBROWSER_INFO_TITLE },
|
||||
{ MB_INFO_SERIE, LOCALE_MOVIEBROWSER_INFO_SERIE },
|
||||
{ MB_INFO_INFO1, LOCALE_MOVIEBROWSER_INFO_INFO1 },
|
||||
{ MB_INFO_MAJOR_GENRE, LOCALE_MOVIEBROWSER_INFO_GENRE_MAJOR },
|
||||
{ MB_INFO_MINOR_GENRE, LOCALE_MOVIEBROWSER_INFO_GENRE_MINOR },
|
||||
{ MB_INFO_PARENTAL_LOCKAGE, LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE },
|
||||
{ MB_INFO_CHANNEL, LOCALE_MOVIEBROWSER_INFO_CHANNEL },
|
||||
{ MB_INFO_QUALITY, LOCALE_MOVIEBROWSER_INFO_QUALITY },
|
||||
{ MB_INFO_PREVPLAYDATE, LOCALE_MOVIEBROWSER_INFO_PREVPLAYDATE },
|
||||
{ MB_INFO_RECORDDATE, LOCALE_MOVIEBROWSER_INFO_RECORDDATE },
|
||||
{ MB_INFO_PRODDATE, LOCALE_MOVIEBROWSER_INFO_PRODYEAR },
|
||||
{ MB_INFO_COUNTRY, LOCALE_MOVIEBROWSER_INFO_PRODCOUNTRY },
|
||||
{ MB_INFO_GEOMETRIE, LOCALE_MOVIEBROWSER_INFO_VIDEOFORMAT },
|
||||
{ MB_INFO_AUDIO, LOCALE_MOVIEBROWSER_INFO_AUDIO },
|
||||
{ MB_INFO_LENGTH, LOCALE_MOVIEBROWSER_INFO_LENGTH },
|
||||
{ MB_INFO_SIZE, LOCALE_MOVIEBROWSER_INFO_SIZE },
|
||||
{ MB_INFO_BOOKMARK, LOCALE_MOVIEBROWSER_MENU_MAIN_BOOKMARKS },
|
||||
{ MB_INFO_FILENAME, LOCALE_MOVIEBROWSER_INFO_FILENAME }
|
||||
{ MB_INFO_FILENAME, LOCALE_MOVIEBROWSER_INFO_FILENAME ,0 },
|
||||
{ MB_INFO_FILEPATH, LOCALE_MOVIEBROWSER_INFO_PATH ,0 },
|
||||
{ MB_INFO_TITLE, LOCALE_MOVIEBROWSER_INFO_TITLE ,0 },
|
||||
{ MB_INFO_SERIE, LOCALE_MOVIEBROWSER_INFO_SERIE ,0 },
|
||||
{ MB_INFO_INFO1, LOCALE_MOVIEBROWSER_INFO_INFO1 ,0 },
|
||||
{ MB_INFO_MAJOR_GENRE, LOCALE_MOVIEBROWSER_INFO_GENRE_MAJOR ,0 },
|
||||
{ MB_INFO_MINOR_GENRE, LOCALE_MOVIEBROWSER_INFO_GENRE_MINOR ,0 },
|
||||
{ MB_INFO_PARENTAL_LOCKAGE, LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE ,0 },
|
||||
{ MB_INFO_CHANNEL, LOCALE_MOVIEBROWSER_INFO_CHANNEL ,0 },
|
||||
{ MB_INFO_QUALITY, LOCALE_MOVIEBROWSER_INFO_QUALITY ,0 },
|
||||
{ MB_INFO_PREVPLAYDATE, LOCALE_MOVIEBROWSER_INFO_PREVPLAYDATE ,0 },
|
||||
{ MB_INFO_RECORDDATE, LOCALE_MOVIEBROWSER_INFO_RECORDDATE ,0 },
|
||||
{ MB_INFO_PRODDATE, LOCALE_MOVIEBROWSER_INFO_PRODYEAR ,0 },
|
||||
{ MB_INFO_COUNTRY, LOCALE_MOVIEBROWSER_INFO_PRODCOUNTRY ,0 },
|
||||
{ MB_INFO_GEOMETRIE, LOCALE_MOVIEBROWSER_INFO_VIDEOFORMAT ,0 },
|
||||
{ MB_INFO_AUDIO, LOCALE_MOVIEBROWSER_INFO_AUDIO ,0 },
|
||||
{ MB_INFO_LENGTH, LOCALE_MOVIEBROWSER_INFO_LENGTH ,0 },
|
||||
{ MB_INFO_SIZE, LOCALE_MOVIEBROWSER_INFO_SIZE ,0 },
|
||||
{ MB_INFO_BOOKMARK, LOCALE_MOVIEBROWSER_MENU_MAIN_BOOKMARKS ,0 },
|
||||
{ MB_INFO_FILENAME, LOCALE_MOVIEBROWSER_INFO_FILENAME ,0 }
|
||||
};
|
||||
|
||||
#define MESSAGEBOX_YES_NO_OPTIONS_COUNT 2
|
||||
const CMenuOptionChooser::keyval MESSAGEBOX_YES_NO_OPTIONS[MESSAGEBOX_YES_NO_OPTIONS_COUNT] =
|
||||
{
|
||||
{ 0, LOCALE_MESSAGEBOX_NO },
|
||||
{ 1, LOCALE_MESSAGEBOX_YES }
|
||||
{ 0, LOCALE_MESSAGEBOX_NO ,0 },
|
||||
{ 1, LOCALE_MESSAGEBOX_YES ,0 }
|
||||
};
|
||||
|
||||
#define MESSAGEBOX_PARENTAL_LOCK_OPTIONS_COUNT 3
|
||||
const CMenuOptionChooser::keyval MESSAGEBOX_PARENTAL_LOCK_OPTIONS[MESSAGEBOX_PARENTAL_LOCK_OPTIONS_COUNT] =
|
||||
{
|
||||
{ 1, LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_ACTIVATED_YES },
|
||||
{ 0, LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_ACTIVATED_NO },
|
||||
{ 2, LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_ACTIVATED_NO_TEMP }
|
||||
{ 1, LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_ACTIVATED_YES ,0 },
|
||||
{ 0, LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_ACTIVATED_NO ,0 },
|
||||
{ 2, LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_ACTIVATED_NO_TEMP ,0 }
|
||||
};
|
||||
|
||||
#define MESSAGEBOX_PARENTAL_LOCKAGE_OPTION_COUNT 6
|
||||
const CMenuOptionChooser::keyval MESSAGEBOX_PARENTAL_LOCKAGE_OPTIONS[MESSAGEBOX_PARENTAL_LOCKAGE_OPTION_COUNT] =
|
||||
{
|
||||
{ 0, LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE_0YEAR },
|
||||
{ 6, LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE_6YEAR },
|
||||
{ 12, LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE_12YEAR },
|
||||
{ 16, LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE_16YEAR },
|
||||
{ 18, LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE_18YEAR },
|
||||
{ 99, LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE_ALWAYS }
|
||||
{ 0, LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE_0YEAR ,0},
|
||||
{ 6, LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE_6YEAR,0 },
|
||||
{ 12, LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE_12YEAR ,0},
|
||||
{ 16, LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE_16YEAR ,0},
|
||||
{ 18, LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE_18YEAR,0 },
|
||||
{ 99, LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE_ALWAYS ,0}
|
||||
};
|
||||
|
||||
#define MAX_WINDOW_WIDTH (g_settings.screen_EndX - g_settings.screen_StartX - 40)
|
||||
@@ -1287,8 +1287,8 @@ void CMovieBrowser::refreshFilterList(void)
|
||||
{
|
||||
for(int i = 0; i < GENRE_ALL_COUNT; i++)
|
||||
{
|
||||
std::string tmp = g_Locale->getText(GENRE_ALL[i].value);
|
||||
m_FilterLines.lineArray[0].push_back(tmp);
|
||||
std::string tmpl = g_Locale->getText(GENRE_ALL[i].value);
|
||||
m_FilterLines.lineArray[0].push_back(tmpl);
|
||||
}
|
||||
}
|
||||
else if(m_settings.filter.item == MB_INFO_SERIE)
|
||||
@@ -2743,19 +2743,19 @@ void CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
|
||||
bookmarkMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_LASTMOVIESTOP, true, bookEndIntInput.getValue(), &bookEndIntInput));
|
||||
bookmarkMenu.addItem(GenericMenuSeparatorLine);
|
||||
|
||||
for(int i =0 ; i < MI_MOVIE_BOOK_USER_MAX && i < MAX_NUMBER_OF_BOOKMARK_ITEMS; i++ )
|
||||
for(int li =0 ; i < MI_MOVIE_BOOK_USER_MAX && i < MAX_NUMBER_OF_BOOKMARK_ITEMS; i++ )
|
||||
{
|
||||
pBookNameInput[i] = new CStringInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, &movie_info->bookmarks.user[i].name, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO2, "abcdefghijklmnopqrstuvwxyz0123456789-.: ");
|
||||
pBookPosIntInput[i] = new CIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (int&) movie_info->bookmarks.user[i].pos, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO2);
|
||||
pBookTypeIntInput[i] = new CIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (int&) movie_info->bookmarks.user[i].length, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO2);
|
||||
pBookNameInput[li] = new CStringInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, &movie_info->bookmarks.user[li].name, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO2, "abcdefghijklmnopqrstuvwxyz0123456789-.: ");
|
||||
pBookPosIntInput[li] = new CIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (int&) movie_info->bookmarks.user[li].pos, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO2);
|
||||
pBookTypeIntInput[li] = new CIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (int&) movie_info->bookmarks.user[li].length, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO2);
|
||||
|
||||
pBookItemMenu[i] = new CMenuWidget(LOCALE_MOVIEBROWSER_BOOK_HEAD, "streaming.raw");
|
||||
pBookItemMenu[i]->addItem(GenericMenuSeparator);
|
||||
pBookItemMenu[i]->addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_NAME, true, movie_info->bookmarks.user[i].name,pBookNameInput[i]));
|
||||
pBookItemMenu[i]->addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_POSITION, true, pBookPosIntInput[i]->getValue(), pBookPosIntInput[i]));
|
||||
pBookItemMenu[i]->addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_TYPE, true, pBookTypeIntInput[i]->getValue(),pBookTypeIntInput[i]));
|
||||
pBookItemMenu[li] = new CMenuWidget(LOCALE_MOVIEBROWSER_BOOK_HEAD, "streaming.raw");
|
||||
pBookItemMenu[li]->addItem(GenericMenuSeparator);
|
||||
pBookItemMenu[li]->addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_NAME, true, movie_info->bookmarks.user[li].name,pBookNameInput[li]));
|
||||
pBookItemMenu[li]->addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_POSITION, true, pBookPosIntInput[li]->getValue(), pBookPosIntInput[li]));
|
||||
pBookItemMenu[li]->addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_TYPE, true, pBookTypeIntInput[li]->getValue(),pBookTypeIntInput[li]));
|
||||
|
||||
bookmarkMenu.addItem( new CMenuForwarderNonLocalized (movie_info->bookmarks.user[i].name.c_str(), true, pBookPosIntInput[i]->getValue(),pBookItemMenu[i]));
|
||||
bookmarkMenu.addItem( new CMenuForwarderNonLocalized (movie_info->bookmarks.user[li].name.c_str(), true, pBookPosIntInput[li]->getValue(),pBookItemMenu[li]));
|
||||
}
|
||||
|
||||
/********************************************************************/
|
||||
@@ -2766,8 +2766,8 @@ void CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
|
||||
serieMenu.addItem(GenericMenuSeparator);
|
||||
serieMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_SERIE_NAME, true, movie_info->serieName,&serieUserInput));
|
||||
serieMenu.addItem(GenericMenuSeparatorLine);
|
||||
for(unsigned int i=0; i < m_vHandleSerienames.size(); i++)
|
||||
serieMenu.addItem( new CMenuSelector(m_vHandleSerienames[i]->serieName.c_str(), true, movie_info->serieName));
|
||||
for(unsigned int li=0; li < m_vHandleSerienames.size(); li++)
|
||||
serieMenu.addItem( new CMenuSelector(m_vHandleSerienames[li]->serieName.c_str(), true, movie_info->serieName));
|
||||
|
||||
/********************************************************************/
|
||||
/** update movie info ******************************************************/
|
||||
@@ -2839,12 +2839,12 @@ void CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
|
||||
|
||||
movieInfoMenu.exec(NULL,"");
|
||||
|
||||
for(int i =0 ; i < MI_MOVIE_BOOK_USER_MAX && i < MAX_NUMBER_OF_BOOKMARK_ITEMS; i++ )
|
||||
for(int li =0 ; li < MI_MOVIE_BOOK_USER_MAX && li < MAX_NUMBER_OF_BOOKMARK_ITEMS; li++ )
|
||||
{
|
||||
delete pBookNameInput[i] ;
|
||||
delete pBookPosIntInput[i] ;
|
||||
delete pBookTypeIntInput[i];
|
||||
delete pBookItemMenu[i];
|
||||
delete pBookNameInput[li] ;
|
||||
delete pBookPosIntInput[li] ;
|
||||
delete pBookTypeIntInput[li];
|
||||
delete pBookItemMenu[li];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3210,10 +3210,10 @@ bool CMovieBrowser::getMovieInfoItem(MI_MOVIE_INFO& movie_info, MB_INFO_ITEM ite
|
||||
case MB_INFO_AUDIO: // = 17,
|
||||
#if 1 // MB_INFO_AUDIO test
|
||||
// we just return the number of audiopids
|
||||
char text[10];
|
||||
snprintf(text, 8,"%d",movie_info.audioPids.size());
|
||||
text[9] = 0; // just to make sure string is terminated
|
||||
*item_string = text;
|
||||
char ltext[10];
|
||||
snprintf(ltext, 8,"%d",movie_info.audioPids.size());
|
||||
ltext[9] = 0; // just to make sure string is terminated
|
||||
*item_string = ltext;
|
||||
#else // MB_INFO_AUDIO test
|
||||
for(i=0; i < movie_info.audioPids.size() && i < 10; i++)
|
||||
{
|
||||
|
||||
56
src/mymenu.h
56
src/mymenu.h
@@ -1,63 +1,63 @@
|
||||
#define SCANMODE_OPTION_COUNT 3
|
||||
const CMenuOptionChooser::keyval SCANMODE_OPTIONS[SCANMODE_OPTION_COUNT] =
|
||||
{
|
||||
{ 0, LOCALE_EXTRA_SCAN_FULL},
|
||||
{ 1, LOCALE_EXTRA_SCAN_FAST},
|
||||
{ 2, LOCALE_EXTRA_TPSCAN}
|
||||
{ 0, LOCALE_EXTRA_SCAN_FULL,0},
|
||||
{ 1, LOCALE_EXTRA_SCAN_FAST,0},
|
||||
{ 2, LOCALE_EXTRA_TPSCAN,0}
|
||||
};
|
||||
|
||||
#define HDD_NOISE_OPTION_COUNT 4
|
||||
const CMenuOptionChooser::keyval HDD_NOISE_OPTIONS[HDD_NOISE_OPTION_COUNT] =
|
||||
{
|
||||
{0, LOCALE_OPTIONS_OFF},
|
||||
{128, LOCALE_HDD_SLOW},
|
||||
{190, LOCALE_HDD_MIDDLE},
|
||||
{254, LOCALE_HDD_FAST}
|
||||
{0, LOCALE_OPTIONS_OFF ,0 },
|
||||
{128, LOCALE_HDD_SLOW ,0 },
|
||||
{190, LOCALE_HDD_MIDDLE ,0 },
|
||||
{254, LOCALE_HDD_FAST ,0 }
|
||||
};
|
||||
#define HDD_FILESYS_OPTION_COUNT 3
|
||||
const CMenuOptionChooser::keyval HDD_FILESYS_OPTIONS[HDD_FILESYS_OPTION_COUNT] =
|
||||
{
|
||||
{0, LOCALE_HDD_EXT3},
|
||||
{1, LOCALE_HDD_REISER},
|
||||
{2, LOCALE_OPTIONS_OFF}
|
||||
{0, LOCALE_HDD_EXT3 ,0 },
|
||||
{1, LOCALE_HDD_REISER ,0 },
|
||||
{2, LOCALE_OPTIONS_OFF ,0 }
|
||||
};
|
||||
#define HDD_SLEEP_OPTION_COUNT 7
|
||||
const CMenuOptionChooser::keyval HDD_SLEEP_OPTIONS[HDD_SLEEP_OPTION_COUNT] =
|
||||
{
|
||||
{0, LOCALE_OPTIONS_OFF},
|
||||
{12, LOCALE_HDD_1MIN},
|
||||
{60, LOCALE_HDD_5MIN},
|
||||
{120, LOCALE_HDD_10MIN},
|
||||
{240, LOCALE_HDD_20MIN},
|
||||
{241, LOCALE_HDD_30MIN},
|
||||
{242, LOCALE_HDD_60MIN}
|
||||
{0, LOCALE_OPTIONS_OFF ,0 },
|
||||
{12, LOCALE_HDD_1MIN ,0 },
|
||||
{60, LOCALE_HDD_5MIN ,0 },
|
||||
{120, LOCALE_HDD_10MIN ,0 },
|
||||
{240, LOCALE_HDD_20MIN ,0 },
|
||||
{241, LOCALE_HDD_30MIN ,0 },
|
||||
{242, LOCALE_HDD_60MIN ,0 }
|
||||
};
|
||||
#if 0
|
||||
#define LOGO_OPTION_COUNT 3
|
||||
const CMenuOptionChooser::keyval LOGO_OPTIONS[LOGO_OPTION_COUNT] =
|
||||
{
|
||||
{1, LOCALE_EXTRA_LOGO1},
|
||||
{2, LOCALE_EXTRA_LOGO2},
|
||||
{3, LOCALE_EXTRA_LOGO3}
|
||||
{1, LOCALE_EXTRA_LOGO1 ,0 },
|
||||
{2, LOCALE_EXTRA_LOGO2 ,0 },
|
||||
{3, LOCALE_EXTRA_LOGO3 ,0 }
|
||||
};
|
||||
#endif
|
||||
#define RF_CARRIER_OPTION_COUNT 4
|
||||
const CMenuOptionChooser::keyval RF_CARRIER_OPTIONS[RF_CARRIER_OPTION_COUNT] =
|
||||
{
|
||||
{0, LOCALE_RF_CARRIER_4500},
|
||||
{1, LOCALE_RF_CARRIER_5500},
|
||||
{2, LOCALE_RF_CARRIER_6000},
|
||||
{3, LOCALE_RF_CARRIER_6500}
|
||||
{0, LOCALE_RF_CARRIER_4500 ,0 },
|
||||
{1, LOCALE_RF_CARRIER_5500 ,0 },
|
||||
{2, LOCALE_RF_CARRIER_6000 ,0 },
|
||||
{3, LOCALE_RF_CARRIER_6500 ,0 }
|
||||
};
|
||||
#define OPTIONS_SOUTH0_NORTH1_OPTION_COUNT 2
|
||||
const CMenuOptionChooser::keyval OPTIONS_SOUTH0_NORTH1_OPTIONS[OPTIONS_SOUTH0_NORTH1_OPTION_COUNT] =
|
||||
{
|
||||
{0, LOCALE_EXTRA_SOUTH},
|
||||
{1, LOCALE_EXTRA_NORTH}
|
||||
{0, LOCALE_EXTRA_SOUTH ,0 },
|
||||
{1, LOCALE_EXTRA_NORTH ,0 }
|
||||
};
|
||||
#define OPTIONS_EAST0_WEST1_OPTION_COUNT 2
|
||||
const CMenuOptionChooser::keyval OPTIONS_EAST0_WEST1_OPTIONS[OPTIONS_EAST0_WEST1_OPTION_COUNT] =
|
||||
{
|
||||
{0, LOCALE_EXTRA_EAST},
|
||||
{1, LOCALE_EXTRA_WEST}
|
||||
{0, LOCALE_EXTRA_EAST ,0 },
|
||||
{1, LOCALE_EXTRA_WEST ,0 }
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user