gui/timeosd: rewrite based on infoclock implementation

Origin commit data
------------------
Branch: ni/coolstream
Commit: 1c53781218
Author: martii <m4rtii@gmx.de>
Date: 2013-12-17 (Tue, 17 Dec 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-12-17 00:11:43 +01:00
committed by vanhofen
parent d02e2981dd
commit fff3556873
7 changed files with 145 additions and 138 deletions

View File

@@ -29,6 +29,7 @@
#endif
#include "gui/volumebar.h"
#include "gui/movieplayer.h"
#include <neutrino.h>
#include <gui/infoclock.h>
@@ -130,6 +131,8 @@ void CVolumeBar::initVolumeBarPosition()
break;
}
case VOLUMEBAR_POS_TOP_LEFT:
if (CMoviePlayerGui::getInstance().osdTimeVisible())
y = clock_y + clock_height + v_spacer + SHADOW_OFFSET;
break;
case VOLUMEBAR_POS_BOTTOM_LEFT:
y = (sh + frameBuffer->getScreenY()) - height - v_spacer;
@@ -319,6 +322,9 @@ void CVolumeHelper::initInfoClock(Font** font)
else
mute_corrY = (vol_height - mute_dy) / 2;
}
time_dx = t1*7 + t2*2;
time_ax = frameBuffer->getScreenX() + h_spacer;
}
void CVolumeHelper::initMuteIcon()