mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-11 07:30:57 +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/components/cc_detailsline.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 609d466302
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)
This commit is contained in:
vanhofen
2017-01-30 16:32:43 +01:00
parent 1d873df948 b29b69a39b
commit e28f6df00a
11 changed files with 92 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/volumebar.cpp
View File

@@ -33,9 +33,12 @@
#include <neutrino.h>
#include <gui/infoclock.h>
#include <gui/timeosd.h>
#include <driver/neutrinofonts.h>
#include <system/debug.h>
extern CTimeOSD *FileTimeOSD;
using namespace std;
@@ -134,7 +137,7 @@ void CVolumeBar::initVolumeBarPosition()
break;
}
case VOLUMEBAR_POS_TOP_LEFT:
if (CMoviePlayerGui::getInstance().osdTimeVisible())
if (FileTimeOSD->IsVisible())
y = clock_y + clock_height + v_spacer + OFFSET_SHADOW;
break;
case VOLUMEBAR_POS_BOTTOM_LEFT: