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

moviebrowser.cpp: fix wrong progress scale

Browse Source
This commit is contained in:
Thilo Graf
2013-04-23 22:26:20 +02:00
parent ca9d7add48
commit 3e0636a617
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/moviebrowser.cpp
View File

@@ -4029,13 +4029,13 @@ static off64_t cut_movie(MI_MOVIE_INFO * minfo, CMovieInfo * cmovie)
CFrameBuffer * frameBuffer = CFrameBuffer::getInstance(); CFrameBuffer * frameBuffer = CFrameBuffer::getInstance();
if (! timescale) if (! timescale)
timescale = new CProgressBar();//new CProgressBar(g_settings.progressbar_color, 200, 15, 0, 100, 0); timescale = new CProgressBar();
timescale->setBlink(); timescale->setBlink();
int dx = 256; int dx = 256;
int x = (((g_settings.screen_EndX- g_settings.screen_StartX)- dx) / 2) + g_settings.screen_StartX; int x = (((g_settings.screen_EndX- g_settings.screen_StartX)- dx) / 2) + g_settings.screen_StartX;
int y = g_settings.screen_EndY - 50; int y = g_settings.screen_EndY - 50;
frameBuffer->paintBoxRel (x + 40, y+12, 200, 15, COL_INFOBAR_PLUS_0);//TODO: remove unneeded box paints frameBuffer->paintBoxRel (x + 40, y+12, 200, 15, COL_INFOBAR_PLUS_0);//TODO: remove unneeded box paints
timescale->setProgress(x + 41, y + 12, 200, 15, percent, 200); timescale->setProgress(x + 41, y + 12, 200, 15, percent, 100);
timescale->paint(); timescale->paint();
int len = minfo->length; int len = minfo->length;
off64_t size = minfo->file.Size; off64_t size = minfo->file.Size;
@@ -4182,7 +4182,7 @@ if(buf[0] != 0x47) printf("cut: buffer not aligned at %" PRId64 "\n", sdone);
sdone += r; sdone += r;
spos += r - wptr; spos += r - wptr;
percent = (int) ((float)(spos)/(float)(newsize)*100.); percent = (int) ((float)(spos)/(float)(newsize)*100.);
timescale->setProgress(x + 41, y + 12, 200, 15, percent, 200); timescale->setProgress(x + 41, y + 12, 200, 15, percent, 100);
timescale->paint(); timescale->paint();
#if REAL_CUT #if REAL_CUT
int wr = write(dstfd, &buf[wptr], r-wptr); int wr = write(dstfd, &buf[wptr], r-wptr);
@@ -4289,13 +4289,13 @@ printf("copy: len %d minute %" PRId64 " second %" PRId64 "\n", len, len ? size/l
CFrameBuffer * frameBuffer = CFrameBuffer::getInstance(); CFrameBuffer * frameBuffer = CFrameBuffer::getInstance();
if (! timescale) if (! timescale)
timescale = new CProgressBar();//new CProgressBar(g_settings.progressbar_color, 200, 15, 0, 100, 0); timescale = new CProgressBar();
timescale->setBlink(); timescale->setBlink();
int dx = 256; int dx = 256;
int x = (((g_settings.screen_EndX- g_settings.screen_StartX)- dx) / 2) + g_settings.screen_StartX; int x = (((g_settings.screen_EndX- g_settings.screen_StartX)- dx) / 2) + g_settings.screen_StartX;
int y = g_settings.screen_EndY - 50; int y = g_settings.screen_EndY - 50;
frameBuffer->paintBoxRel (x + 40, y+12, 200, 15, COL_INFOBAR_PLUS_0); //TODO: remove unneeded box paints frameBuffer->paintBoxRel (x + 40, y+12, 200, 15, COL_INFOBAR_PLUS_0); //TODO: remove unneeded box paints
timescale->setProgress(x + 41, y + 12, 200, 15, percent, 200); timescale->setProgress(x + 41, y + 12, 200, 15, percent, 100);
timescale->paint(); timescale->paint();
newsize = 0; newsize = 0;
@@ -4414,7 +4414,7 @@ if(buf[0] != 0x47) printf("copy: buffer not aligned at %" PRId64 "\n", sdone);
spos += r - wptr; spos += r - wptr;
btotal += r; btotal += r;
percent = (int) ((float)(btotal)/(float)(newsize)*100.); percent = (int) ((float)(btotal)/(float)(newsize)*100.);
timescale->setProgress(x + 41, y + 12, 200, 15, percent, 200); timescale->setProgress(x + 41, y + 12, 200, 15, percent, 100);
timescale->paint(); timescale->paint();
#if REAL_CUT #if REAL_CUT
int wr = write(dstfd, &buf[wptr], r-wptr); int wr = write(dstfd, &buf[wptr], r-wptr);