mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-11 15:41:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/components/cc_frm_footer.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fd25630d53
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-30 (Wed, 30 Aug 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-08-30 18:11:59 +02:00
parent 4b44169b39 44a8e0b0b4
commit fec86c7ee5
22 changed files with 236 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/components/cc_item_progressbar.cpp
View File

@@ -437,10 +437,6 @@ void CProgressBarCache::pbcApplyGradient(fb_pixel_t *b)
void CProgressBar::paintProgress(bool do_save_bg)
{
struct timeval t1, t2;
if (debug)
gettimeofday(&t1, NULL);
if (*pb_design == PB_OFF) {
paintInit(false);
return;
@@ -488,14 +484,6 @@ void CProgressBar::paintProgress(bool do_save_bg)
if (is_painted)
pb_last_width = pb_active_width;
//benchmark
if (debug){
gettimeofday(&t2, NULL);
uint64_t duration = ((t2.tv_sec * 1000000ULL + t2.tv_usec) - (t1.tv_sec * 1000000ULL + t1.tv_usec)) / 1000ULL;
if (duration)
fprintf(stderr, "\033[33m[CProgressBar] %s: %" PRIu64 " ms to paint progress \033[0m\n",__func__, duration);
}
}
//NI starbar