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

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

Browse Source 
Conflicts:
	configure.ac
	data/locale/english.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.h
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 20d546e42f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-18 09:53:55 +02:00
parent 65c1db32c4 d762134fb3
commit f504430ba9
10 changed files with 23258 additions and 34020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/movieplayer.cpp
View File

@@ -95,10 +95,15 @@ bool glcd_play = false;
#include <system/stacktrace.h>
#ifndef HAVE_COOL_HARDWARE
#define LCD_MODE CVFD::MODE_MOVIE
#else
#define LCD_MODE CVFD::MODE_MENU_UTF8
#endif
//NI InfoIcons
#include <gui/infoicons.h>
extern cVideo * videoDecoder;
extern cAudio * audioDecoder;
extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */
@@ -3072,7 +3077,6 @@ void CMoviePlayerGui::showSubtitle(neutrino_msg_data_t data)
#endif
frameBuffer->blit2FB(newdata, nw, nh, xoff, yoff);
free(newdata);
min_x = std::min(min_x, xoff);
max_x = std::max(max_x, xoff + nw);