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

gui/moviebrowser.cpp: cleanup, indent code; bug fixes

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 819b5f5dae
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2014-09-26 14:21:36 +04:00
parent 3eed03b929
commit d10cd4bb75
2 changed files with 1292 additions and 1832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2136
src/gui/moviebrowser.cpp
View File

File diff suppressed because it is too large Load Diff

22
src/gui/moviebrowser.h
View File

@@ -263,8 +263,7 @@ class CMovieBrowser : public CMenuTarget
int Dirs_Selectable; // for FileBrowser compatibility, not used in MovieBrowser int Dirs_Selectable; // for FileBrowser compatibility, not used in MovieBrowser
private: // Variables private: // Variables
//CFBWindow* m_pcWindow; CFrameBuffer * framebuffer;
CFrameBuffer * m_pcWindow;
CListFrame* m_pcBrowser; CListFrame* m_pcBrowser;
CListFrame* m_pcLastPlay; CListFrame* m_pcLastPlay;
@@ -337,7 +336,6 @@ class CMovieBrowser : public CMenuTarget
std::vector<std::string> PicExts; std::vector<std::string> PicExts;
std::string getScreenshotName(std::string movie); std::string getScreenshotName(std::string movie);
//bool restart_mb_timeout;
int menu_ret; int menu_ret;
cYTFeedParser ytparser; cYTFeedParser ytparser;
@@ -359,7 +357,6 @@ class CMovieBrowser : public CMenuTarget
void refreshYTMenu(); void refreshYTMenu();
public: // Functions //////////////////////////////////////////////////////////7 public: // Functions //////////////////////////////////////////////////////////7
CMovieBrowser(const char* path); //P1
CMovieBrowser(); //P1 CMovieBrowser(); //P1
~CMovieBrowser(); //P1 ~CMovieBrowser(); //P1
int exec(const char* path); //P1 int exec(const char* path); //P1
@@ -373,24 +370,21 @@ class CMovieBrowser : public CMenuTarget
void fileInfoStale(void); // call this function to force the Moviebrowser to reload all movie information from HD void fileInfoStale(void); // call this function to force the Moviebrowser to reload all movie information from HD
bool readDir(const std::string & dirname, CFileList* flist); bool readDir(const std::string & dirname, CFileList* flist);
bool readDir_vlc(const std::string & dirname, CFileList* flist);
bool readDir_std(const std::string & dirname, CFileList* flist);
bool delFile(CFile& file); bool delFile(CFile& file);
bool delFile_vlc(CFile& file);
bool delFile_std(CFile& file);
int getMenuRet() { return menu_ret; } int getMenuRet() { return menu_ret; }
int getMode() { return show_mode; } int getMode() { return show_mode; }
void setMode(int mode) { show_mode = mode; } void setMode(int mode) {
if (show_mode != mode)
m_file_info_stale = true;
show_mode = mode;
}
private: //Functions private: //Functions
///// MovieBrowser init /////////////// ///// MovieBrowser init ///////////////
void init(void); //P1 void init(void); //P1
void initGlobalSettings(void); //P1 void initGlobalSettings(void); //P1
void initFrames(void); void initFrames(void);
#if 0
void initDevelopment(void); //P1 for development testing only
#endif
void initRows(void); void initRows(void);
void reinit(void); //P1 void reinit(void); //P1
@@ -403,7 +397,6 @@ class CMovieBrowser : public CMenuTarget
void refreshBrowserList(void); //P1 void refreshBrowserList(void); //P1
void refreshFilterList(void); //P1 void refreshFilterList(void); //P1
void refreshMovieInfo(void); //P1 void refreshMovieInfo(void); //P1
void refreshBookmarkList(void); // P3
int refreshFoot(bool show = true); //P2 int refreshFoot(bool show = true); //P2
void refreshTitle(void); //P2 void refreshTitle(void); //P2
void refreshInfo(void); // P2 void refreshInfo(void); // P2
@@ -416,8 +409,9 @@ class CMovieBrowser : public CMenuTarget
bool onButtonPressLastPlayList(neutrino_msg_t msg); // P2 bool onButtonPressLastPlayList(neutrino_msg_t msg); // P2
bool onButtonPressLastRecordList(neutrino_msg_t msg); // P2 bool onButtonPressLastRecordList(neutrino_msg_t msg); // P2
bool onButtonPressFilterList(neutrino_msg_t msg); // P2 bool onButtonPressFilterList(neutrino_msg_t msg); // P2
bool onButtonPressBookmarkList(neutrino_msg_t msg); // P3
bool onButtonPressMovieInfoList(neutrino_msg_t msg); // P2 bool onButtonPressMovieInfoList(neutrino_msg_t msg); // P2
void markItem(CListFrame *list);
void scrollBrowserItem(bool next, bool page);
void onSetFocus(MB_FOCUS new_focus); // P2 void onSetFocus(MB_FOCUS new_focus); // P2
void onSetFocusNext(void); // P2 void onSetFocusNext(void); // P2
void onSetFocusPrev(void); // P2 void onSetFocusPrev(void); // P2