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

-fix select bookmark position

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1371 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2011-04-01 19:28:18 +00:00
parent 2b774400bd
commit f547be0d2a
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/moviebrowser.cpp
View File

@@ -3063,7 +3063,7 @@ int CMovieBrowser::showStartPosSelectionMenu(void) // P2
int pos = -1; int pos = -1;
int result = 0; int result = 0;
int menu_nr= 0; int menu_nr= 0;
int position[MAX_NUMBER_OF_BOOKMARK_ITEMS]; int position[MAX_NUMBER_OF_BOOKMARK_ITEMS] ={0};
if(m_movieSelectionHandler == NULL) return(result); if(m_movieSelectionHandler == NULL) return(result);
@@ -3077,7 +3077,7 @@ int CMovieBrowser::showStartPosSelectionMenu(void) // P2
startPosSelectionMenu.addIntroItems(); startPosSelectionMenu.addIntroItems();
//startPosSelectionMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_START_RECORD_START, true,NULL)); //startPosSelectionMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_START_RECORD_START, true,NULL));
//position[menu_nr++] = 0;
if(m_movieSelectionHandler->bookmarks.start != 0) if(m_movieSelectionHandler->bookmarks.start != 0)
{ {
startPosSelectionMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_MOVIESTART, true, start_pos)); startPosSelectionMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_MOVIESTART, true, start_pos));
@@ -3089,8 +3089,6 @@ int CMovieBrowser::showStartPosSelectionMenu(void) // P2
position[menu_nr++] = m_movieSelectionHandler->bookmarks.lastPlayStop; position[menu_nr++] = m_movieSelectionHandler->bookmarks.lastPlayStop;
} }
startPosSelectionMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_START_RECORD_START, true,NULL)); startPosSelectionMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_START_RECORD_START, true,NULL));
position[menu_nr++] = 0;
int sep_pos = menu_nr; int sep_pos = menu_nr;
for(int i =0 ; i < MI_MOVIE_BOOK_USER_MAX && menu_nr < MAX_NUMBER_OF_BOOKMARK_ITEMS; i++ ) for(int i =0 ; i < MI_MOVIE_BOOK_USER_MAX && menu_nr < MAX_NUMBER_OF_BOOKMARK_ITEMS; i++ )
@@ -3114,12 +3112,13 @@ TRACE("[mb] adding boomark menu N %d, position %d\n", menu_nr, position[menu_nr]
//result = startPosSelectionMenu.getSelected(); //result = startPosSelectionMenu.getSelected();
result = startPosSelectionMenu.getSelectedLine(); result = startPosSelectionMenu.getSelectedLine();
printf("startPosSelectionMenu result %d\n", result); printf("startPosSelectionMenu result %d\n", result);
if(result < 2)// select 2 for startPosSelectionMenu.addIntroItems(); if(result < 3)// select 2 for startPosSelectionMenu.addIntroItems();
return -1; return -1;
//TRACE("[mb] selected bookmark %d\n", result); //TRACE("[mb] selected bookmark %d\n", result);
if(result != 0 && result <= MAX_NUMBER_OF_BOOKMARK_ITEMS) if(result != 0 && result <= MAX_NUMBER_OF_BOOKMARK_ITEMS)
{ {
result-=3;// select -2 for startPosSelectionMenu.addIntroItems(); result -= 3;
if(result > sep_pos) result--; if(result > sep_pos) result--;
pos = position[result]; pos = position[result];
} }