From c7b5488011da3bb7f423585f29ce81d0c2329874 Mon Sep 17 00:00:00 2001 From: seife Date: Mon, 10 Jan 2011 22:44:28 +0000 Subject: [PATCH] neutrino: remove useless use of float, fix compiler warnings git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1025 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/neutrino.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 925574e63..dcbf6c8ae 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2162,7 +2162,7 @@ int CNeutrinoApp::run(int argc, char **argv) int dx = 0; int dy = 0; frameBuffer->getIconSize(NEUTRINO_ICON_VOLUME,&dx,&dy); - g_volscale = new CProgressBar(true, dy*12.5, dy, 50, 100, 80, true); + g_volscale = new CProgressBar(true, dy * 125 / 10, dy, 50, 100, 80, true); g_CamHandler = new CCAMMenuHandler(); g_CamHandler->init(); @@ -3686,8 +3686,8 @@ printf("CNeutrinoApp::setVolume dx %d dy %d\n", dx, dy); frameBuffer->SaveScreen(x, y, dx, dy, pixbuf); frameBuffer->paintBoxRel(x , y , dx, dy, COL_MENUCONTENT_PLUS_0, g_settings.rounded_corners ? dy/2 : 0); - frameBuffer->paintBoxRel (x + dy + (dy/4)-2, y+(dy/4)-2, ((dy/2)*12.5) +4, dy/2+4, COL_MENUCONTENT_PLUS_3); - frameBuffer->paintBoxRel (x + dy + (dy/4), y+(dy/4), (dy/2)*12.5, dy/2, COL_MENUCONTENT_PLUS_1); + frameBuffer->paintBoxRel(x+dy+dy/4-2, y+dy/4-2, dy*25/4+4, dy/2+4, COL_MENUCONTENT_PLUS_3); + frameBuffer->paintBoxRel(x+dy+dy/4, y+dy/4, dy*25/4, dy/2, COL_MENUCONTENT_PLUS_1); frameBuffer->paintIcon(NEUTRINO_ICON_VOLUME,x+dy/2,y+(dy/4), 0, COL_MENUCONTENT_PLUS_0); g_volscale->reset();