mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 17:31:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

-fix possible errors

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1069 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2011-01-26 19:13:05 +00:00
parent 4202fa903a
commit 27cd2c802f
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/timeosd.cpp
View File

@@ -31,7 +31,7 @@
#include <system/settings.h> #include <system/settings.h>
#include <gui/widget/progressbar.h> #include <gui/widget/progressbar.h>
static CProgressBar *timescale; static CProgressBar *timescale = 0;
#define TIMEOSD_FONT SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME #define TIMEOSD_FONT SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME
#define BARLEN 200 #define BARLEN 200
@@ -41,8 +41,11 @@ CTimeOSD::CTimeOSD()
visible=false; visible=false;
m_mode=MODE_ASC; m_mode=MODE_ASC;
GetDimensions(); GetDimensions();
if (! timescale) if (! timescale ){
if(m_height < 5)
m_height = 10;
timescale = new CProgressBar(true, BARLEN, m_height -5, 40, 100, 70, true); timescale = new CProgressBar(true, BARLEN, m_height -5, 40, 100, 70, true);
}
} }
CTimeOSD::~CTimeOSD() CTimeOSD::~CTimeOSD()
@@ -61,7 +64,8 @@ void CTimeOSD::show(time_t time_show)
m_time_dis = time(NULL); m_time_dis = time(NULL);
m_time_show = time_show; m_time_show = time_show;
frameBuffer->paintBoxRel(m_xstart-2, m_y, 2+BARLEN+2, m_height, COL_INFOBAR_SHADOW_PLUS_0); //border frameBuffer->paintBoxRel(m_xstart-2, m_y, 2+BARLEN+2, m_height, COL_INFOBAR_SHADOW_PLUS_0); //border
timescale->reset(); if(timescale)
timescale->reset();
update(); update();
} }
@@ -119,7 +123,12 @@ void CTimeOSD::update(time_t time_show)
void CTimeOSD::updatePos(short runningPercent) void CTimeOSD::updatePos(short runningPercent)
{ {
timescale->paintProgressBar2(m_xstart, m_y, runningPercent); if(timescale){
if(runningPercent > 100 || runningPercent < 0){
runningPercent = 0;
}
timescale->paintProgressBar2(m_xstart, m_y, runningPercent);
}
} }
void CTimeOSD::hide() void CTimeOSD::hide()
@@ -129,7 +138,8 @@ void CTimeOSD::hide()
return; return;
frameBuffer->paintBackgroundBoxRel(m_xend - m_width - t1, m_y, m_width, m_height); frameBuffer->paintBackgroundBoxRel(m_xend - m_width - t1, m_y, m_width, m_height);
visible=false; visible=false;
timescale->reset(); if(timescale)
timescale->reset();
frameBuffer->paintBackgroundBoxRel(m_xstart-2, m_y, 2+BARLEN+2, m_height); //clear border frameBuffer->paintBackgroundBoxRel(m_xstart-2, m_y, 2+BARLEN+2, m_height); //clear border
} }