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 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 318b4926e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-25 12:22:47 +02:00
parent f23c56ed95 c1bda7d95c
commit 01acc7d9ae
8 changed files with 112 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,10 +68,6 @@
#define MAX_BROWSER_FRAME_HEIGHT 80
// void strReplace(std::string& orig, const char* fstr, const std::string &rstr);
#define MB_MAX_ROWS LF_MAX_ROWS
#define MB_MAX_DIRS NETWORK_NFS_NR_OF_ENTRIES
/* MB_SETTINGS to be stored in g_settings anytime ....*/
@@ -95,22 +91,24 @@ typedef struct
int browser_serie_mode;
int serie_auto_create;
/* these variables are used for the listframes */
int browserFrameHeight;
int browserRowNr;
MB_INFO_ITEM browserRowItem[MB_MAX_ROWS];//MB_INFO_ITEM
MB_INFO_ITEM browserRowItem[MB_MAX_ROWS];
int browserRowWidth[MB_MAX_ROWS];
// to be added to config later
int lastPlayMaxItems;
int lastPlayRowNr;
MB_INFO_ITEM lastPlayRow[2];
int lastPlayRowWidth[2];
MB_INFO_ITEM lastPlayRow[3];
int lastPlayRowWidth[3];
int lastRecordMaxItems;
int lastRecordRowNr;
MB_INFO_ITEM lastRecordRow[2];
int lastRecordRowWidth[2];
MB_INFO_ITEM lastRecordRow[3];
int lastRecordRowWidth[3];
int ytmode;
int ytorderby;
int ytresults;