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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/driver/screenshot.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7102774beb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-15 22:54:00 +01:00
parent e67e33d323 5708ad998c
commit 6bb52f0731
15 changed files with 250 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/movieplayer.cpp
View File

@@ -2517,7 +2517,7 @@ void CMoviePlayerGui::showSubtitle(neutrino_msg_data_t data)
int xoff = (double) sub->rects[i]->x * xc;
int yoff = (double) sub->rects[i]->y * yc;
int nw = GetWidth4FB_HW_ACC(xoff, (double) sub->rects[i]->w * xc);
int nw = frameBuffer->getWidth4FB_HW_ACC(xoff, (double) sub->rects[i]->w * xc);
int nh = (double) sub->rects[i]->h * yc;
printf("Draw: #%d at %d,%d size %dx%d colors %d (x=%d y=%d w=%d h=%d) \n", i+1,