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

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/global.h


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



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-01 11:04:00 +02:00
parent 2f7743c901 57c803b083
commit 134a82959d
3 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/moviebrowser/mb.cpp
View File

@@ -1361,7 +1361,7 @@ void CMovieBrowser::refreshMovieInfo(void)
//printf("refreshMovieInfo: EpgId %llx id %llx y %d\n", m_movieSelectionHandler->epgId, m_movieSelectionHandler->channelId, m_cBoxFrameTitleRel.iY);
int lx = 0;//never read m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX+m_cBoxFrameTitleRel.iWidth-logo_w-10;
int ly = 0;//never read m_cBoxFrameTitleRel.iY+m_cBoxFrame.iY+ (m_cBoxFrameTitleRel.iHeight-logo_h)/2;
short pb_hdd_offset = g_settings.infobar_show_sysfs_hdd ? 104 : 0;
short pb_hdd_offset = 104;
if (show_mode == MB_SHOW_YT)
pb_hdd_offset = 0;
@@ -1439,7 +1439,7 @@ void CMovieBrowser::refreshMovieInfo(void)
void CMovieBrowser::info_hdd_level(bool paint_hdd)
{
if (show_mode == MB_SHOW_YT || !g_settings.infobar_show_sysfs_hdd)
if (show_mode == MB_SHOW_YT)
return;
struct statfs s;