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

Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/moviebrowser/mb.cpp
	src/gui/moviebrowser/mb.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 30e1c0ef71
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-29 12:45:02 +02:00
parent da08c55473 0e9db1640b
commit f7614da769
9 changed files with 413 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/gui/moviebrowser/mb.h
View File

@@ -97,6 +97,7 @@ typedef struct
int browserRowNr;
MB_INFO_ITEM browserRowItem[MB_MAX_ROWS];
int browserRowWidth[MB_MAX_ROWS];
int browserAdditional;
// to be added to config later
int lastPlayMaxItems;
@@ -145,23 +146,29 @@ class CMovieBrowser : public CMenuTarget
private: // Variables
CFrameBuffer * framebuffer;
CComponentsPicture *pic;
CListFrame* m_pcBrowser;
CListFrame* m_pcLastPlay;
CListFrame* m_pcLastRecord;
CTextBox* m_pcInfo;
CTextBox* m_pcInfo1; // bottom box
CTextBox* m_pcInfo2; // right box
CListFrame* m_pcFilter;
CBox m_cBoxFrame;
CBox m_cBoxFrameLastPlayList;
CBox m_cBoxFrameLastRecordList;
CBox m_cBoxFrameBrowserList;
CBox m_cBoxFrameInfo;
CBox m_cBoxFrameInfo1;
CBox m_cBoxFrameInfo2;
CBox m_cBoxFrameBookmarkList;
CBox m_cBoxFrameFilter;
CBox m_cBoxFrameFootRel;
CBox m_cBoxFrameTitleRel;
CComponentsDetailLine *m_detailsLine;
CComponentsChannelLogo *m_channelLogo;
CComponentsPicture *m_movieCover;
LF_LINES m_browserListLines;
LF_LINES m_recordListLines;
LF_LINES m_playListLines;
@@ -215,7 +222,6 @@ class CMovieBrowser : public CMenuTarget
CFileList::iterator filelist_it;
P_MI_MOVIE_LIST movielist;
CComponentsChannelLogo* CChannelLogo;
uint64_t old_EpgId;
int movieInfoUpdateAll[MB_INFO_MAX_NUMBER];
int movieInfoUpdateAllIfDestEmptyOnly;
@@ -286,10 +292,15 @@ class CMovieBrowser : public CMenuTarget
void refreshBrowserList(void); //P1
void refreshFilterList(void); //P1
void refreshMovieInfo(void); //P1
void refreshChannelLogo(void); //P1
void initMovieCover(void); //P1
void refreshMovieCover(void); //P1
int refreshFoot(bool show = true); //P2
void refreshTitle(void); //P2
void refreshInfo(void); // P2
void refreshLCD(void); // P2
void refreshDetailsLine(int pos);
void hideDetailsLine();
///// Events ///////////////////////////
bool onButtonPress(neutrino_msg_t msg); // P1
@@ -341,7 +352,7 @@ class CMovieBrowser : public CMenuTarget
bool isParentalLock(MI_MOVIE_INFO& movie_info);
bool getMovieInfoItem(MI_MOVIE_INFO& movie_info, MB_INFO_ITEM item, std::string* item_string);
void updateMovieSelection(void);
void updateInfoSelection(void); //NI
void updateInfoSelection(void);
void updateFilterSelection(void);
void updateSerienames(void);
void autoFindSerie(void);
@@ -355,7 +366,6 @@ class CMovieBrowser : public CMenuTarget
bool addFile(CFile &file, int dirItNr);
};
// I tried a lot to use the menu.cpp as ListBox selection, and I got three solution which are all garbage.
//Might be replaced by somebody who is familiar with this stuff .
@@ -368,7 +378,6 @@ class CSelectedMenu : public CMenuTarget
inline int exec(CMenuTarget* /*parent*/, const std::string & /*actionKey*/){selected = true; return menu_return::RETURN_EXIT;};
};
// This Class creates a menue item, which writes its caption to an given string (or an given int value to an given variable).
// The programm could use this class to verify, what menu was selected.
// A good listbox class might do the same. There might be better ways to do so.
@@ -400,7 +409,6 @@ class CMenuWidgetSelection : public CMenuWidget
int getSelectedLine(void){return exit_pressed ? -1 : selected;};
};
class CFileChooser : public CMenuWidget
{
private:
@@ -411,8 +419,6 @@ class CFileChooser : public CMenuWidget
int exec(CMenuTarget* parent, const std::string & actionKey);
};
class CDirMenu : public CMenuWidget
{
private:
@@ -431,7 +437,4 @@ class CDirMenu : public CMenuWidget
bool isChanged(){return changed;};
};
#endif /*MOVIEBROWSER_H_*/