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

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

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/osd_setup.cpp
	src/neutrino.cpp
	src/neutrino.h
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: ba8bdde8c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-13 21:41:04 +01:00
parent 5ae7e351ae 168e359e2a
commit 315955cc0d
19 changed files with 432 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
acinclude.m4
View File

@@ -22,6 +22,14 @@ if test "$DEBUG" = "yes"; then
AC_DEFINE(DEBUG,1,[Enable debug messages])
fi
AC_ARG_ENABLE(reschange,
AS_HELP_STRING(--enable-reschange,enable change the osd resolution (default for hd2)))
AM_CONDITIONAL(ENABLE_RESCHANGE,test "$enable_reschange" = "yes")
if test "$enable_reschange" = "yes"; then
AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION,1,[enable change the osd resolution])
fi
AC_ARG_ENABLE(tmsdk,
AS_HELP_STRING(--enable-tmsdk, compile inside sdk),
,[enable_tmsdk=no])
@@ -565,6 +573,7 @@ if test "$BOXMODEL" = "hd1"; then
AC_DEFINE(BOXMODEL_CS_HD1, 1, [coolstream hd1/neo/neo2/zee])
elif test "$BOXMODEL" = "hd2"; then
AC_DEFINE(BOXMODEL_CS_HD2, 1, [coolstream tank/trinity/trinity v2/trinity duo/zee<65>/link])
AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION,1,[enable change the osd resolution])
elif test "$BOXMODEL" = "dm500"; then
AC_DEFINE(BOXMODEL_DM500, 1, [dreambox 500])
elif test "$BOXMODEL" = "ip200"; then