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

Fix exchanged end and last play stop bookmarks; close all menus on menu key

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8f441f3f9b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-12-13 (Tue, 13 Dec 2011)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2011-12-13 14:25:46 +00:00
parent 78add27fd2
commit 866dd5c7ec
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/moviebrowser.cpp
View File

@@ -823,7 +823,7 @@ int CMovieBrowser::exec(CMenuTarget* parent, const std::string & actionKey)
else if(actionKey == "show_movie_info_menu") else if(actionKey == "show_movie_info_menu")
{ {
if(m_movieSelectionHandler != NULL) if(m_movieSelectionHandler != NULL)
showMovieInfoMenu(m_movieSelectionHandler); return showMovieInfoMenu(m_movieSelectionHandler);
} }
else if(actionKey == "save_movie_info") else if(actionKey == "save_movie_info")
{ {
@@ -2770,7 +2770,7 @@ void CMovieBrowser::showHelp(void)
} }
#define MAX_STRING 30 #define MAX_STRING 30
void CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info) int CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
{ {
/********************************************************************/ /********************************************************************/
/** MovieInfo menu ******************************************************/ /** MovieInfo menu ******************************************************/
@@ -2792,8 +2792,8 @@ void CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
bookmarkMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_CLEAR_ALL, true, NULL, this, "book_clear_all",CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); bookmarkMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_CLEAR_ALL, true, NULL, this, "book_clear_all",CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));
bookmarkMenu.addItem(GenericMenuSeparatorLine); bookmarkMenu.addItem(GenericMenuSeparatorLine);
bookmarkMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_MOVIESTART, true, bookStartIntInput.getValue(), &bookStartIntInput)); bookmarkMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_MOVIESTART, true, bookStartIntInput.getValue(), &bookStartIntInput));
bookmarkMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_MOVIEEND, true, bookLastIntInput.getValue(), &bookLastIntInput)); bookmarkMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_MOVIEEND, true, bookEndIntInput.getValue(), &bookLastIntInput));
bookmarkMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_LASTMOVIESTOP, true, bookEndIntInput.getValue(), &bookEndIntInput)); bookmarkMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_LASTMOVIESTOP, true, bookLastIntInput.getValue(), &bookEndIntInput));
bookmarkMenu.addItem(GenericMenuSeparatorLine); bookmarkMenu.addItem(GenericMenuSeparatorLine);
for(int li =0 ; li < MI_MOVIE_BOOK_USER_MAX && li < MAX_NUMBER_OF_BOOKMARK_ITEMS; li++ ) for(int li =0 ; li < MI_MOVIE_BOOK_USER_MAX && li < MAX_NUMBER_OF_BOOKMARK_ITEMS; li++ )
@@ -2890,7 +2890,7 @@ void CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
movieInfoMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_RECORDDATE, false, recUserDateInput.getValue()));//LOCALE_FLASHUPDATE_CURRENTVERSIONDATE movieInfoMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_RECORDDATE, false, recUserDateInput.getValue()));//LOCALE_FLASHUPDATE_CURRENTVERSIONDATE
movieInfoMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_SIZE, false, size, NULL)); movieInfoMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_SIZE, false, size, NULL));
movieInfoMenu.exec(NULL,""); int res = movieInfoMenu.exec(NULL,"");
for(int li =0 ; li < MI_MOVIE_BOOK_USER_MAX && li < MAX_NUMBER_OF_BOOKMARK_ITEMS; li++ ) for(int li =0 ; li < MI_MOVIE_BOOK_USER_MAX && li < MAX_NUMBER_OF_BOOKMARK_ITEMS; li++ )
{ {
@@ -2899,6 +2899,7 @@ void CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
delete pBookTypeIntInput[li]; delete pBookTypeIntInput[li];
delete pBookItemMenu[li]; delete pBookItemMenu[li];
} }
return res;
} }
extern "C" int pinghost( const char *hostname ); extern "C" int pinghost( const char *hostname );
@@ -3556,7 +3557,7 @@ int CDirMenu::exec(CMenuTarget* parent, const std::string & actionKey)
parent->hide(); parent->hide();
changed = false; changed = false;
show(); return show();
} }
else if(actionKey.size() == 1) else if(actionKey.size() == 1)
{ {
@@ -3676,10 +3677,10 @@ printf("updateDirState: %d: state %d nfs %d\n", i, dirState[i], dirNfsMountNr[i]
} }
void CDirMenu::show(void) int CDirMenu::show(void)
{ {
if(dirList->empty()) if(dirList->empty())
return; return menu_return::RETURN_REPAINT;
char tmp[20]; char tmp[20];
@@ -3693,9 +3694,8 @@ void CDirMenu::show(void)
tmp[1]=0; tmp[1]=0;
dirMenu.addItem( new CMenuForwarderNonLocalized ( (*dirList)[i].name.c_str(), (dirState[i] != DIR_STATE_UNKNOWN), dirOptionText[i], this,tmp)); dirMenu.addItem( new CMenuForwarderNonLocalized ( (*dirList)[i].name.c_str(), (dirState[i] != DIR_STATE_UNKNOWN), dirOptionText[i], this,tmp));
} }
dirMenu.exec(NULL," "); int ret = dirMenu.exec(NULL," ");
return; return ret;
} }
off64_t get_full_len(char * startname) off64_t get_full_len(char * startname)

4
src/gui/moviebrowser.h
View File

@@ -371,7 +371,7 @@ class CMovieBrowser : public CMenuTarget
///// Menu //////////////////////////////////// ///// Menu ////////////////////////////////////
bool showMenu(MI_MOVIE_INFO* movie_info); // P2 bool showMenu(MI_MOVIE_INFO* movie_info); // P2
void showMovieInfoMenu(MI_MOVIE_INFO* movie_info); // P2 int showMovieInfoMenu(MI_MOVIE_INFO* movie_info); // P2
int showStartPosSelectionMenu(void); // P2 int showStartPosSelectionMenu(void); // P2
///// settings /////////////////////////////////// ///// settings ///////////////////////////////////
@@ -487,7 +487,7 @@ class CDirMenu : public CMenuWidget
public: public:
CDirMenu(std::vector<MB_DIR>* dir_list); CDirMenu(std::vector<MB_DIR>* dir_list);
int exec(CMenuTarget* parent, const std::string & actionKey); int exec(CMenuTarget* parent, const std::string & actionKey);
void show(void); int show(void);
bool isChanged(){return changed;}; bool isChanged(){return changed;};
}; };