mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +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

10
src/system/settings.h
View File

@@ -4,6 +4,8 @@
Copyright (C) 2001 Steffen Hehn 'McClean'
Homepage: http://dbox.cyberphoria.org/
Copyright (C) 2007-2012 Stefan Seyfried
Kommentar:
Diese GUI wurde von Grund auf neu programmiert und sollte nun vom
@@ -39,13 +41,15 @@
#include <zapit/client/zapittools.h>
#include <eitd/edvbstring.h> // UTF8
#include <hardware_caps.h>
#include <string>
#include <list>
#ifdef BOXMODEL_APOLLO
#define VIDEOMENU_VIDEOMODE_OPTION_COUNT 16
#else
#define VIDEOMENU_VIDEOMODE_OPTION_COUNT 12
#define VIDEOMENU_VIDEOMODE_OPTION_COUNT 13
#endif
struct SNeutrinoTheme
@@ -698,7 +702,7 @@ struct SNeutrinoSettings
LCD_SHOW_VOLUME ,
LCD_AUTODIMM ,
LCD_DEEPSTANDBY_BRIGHTNESS,
#if HAVE_TRIPLEDRAGON
#if HAVE_TRIPLEDRAGON || USE_STB_HAL
LCD_EPGMODE ,
#endif
LCD_SETTING_COUNT
@@ -946,8 +950,8 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
struct SglobalInfo
{
unsigned char box_Type;
delivery_system_t delivery_system;
bool has_fan;
hw_caps_t *hw_caps;
};
const int RECORDING_OFF = 0;