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

Merge branch 'ni/mp' into ni/cst-next

Browse Source 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-26 19:13:47 +02:00
parent 8f2cbeb841 73da438ec4
commit af8fe3ebc6
220 changed files with 7577 additions and 1615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/infoviewer_bb.cpp
View File

@@ -609,8 +609,8 @@ void CInfoViewerBB::showIcon_Resolution()
case 1920:
icon_name = NEUTRINO_ICON_RESOLUTION_1920;
break;
case 1080:
case 1088:
case 1080:
icon_name = NEUTRINO_ICON_RESOLUTION_1080;
break;
case 1440:
@@ -653,9 +653,9 @@ void CInfoViewerBB::showIcon_Resolution()
}
if (g_settings.infobar_show_res == 1) {//show simple resolution icon on infobar
videoDecoder->getPictureInfo(xres, yres, framerate);
if (yres > 704)
if (yres > 576)
icon_name = NEUTRINO_ICON_RESOLUTION_HD;
else if (yres >= 288)
else if (yres > 0)
icon_name = NEUTRINO_ICON_RESOLUTION_SD;
else
icon_name = NEUTRINO_ICON_RESOLUTION_000;