Merge remote-tracking branch 'tuxbox/master'

Origin commit data ------------------ Branch: ni/coolstream Commit: a409047714 Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de> Date: 2017-01-22 (Sun, 22 Jan 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit
2025-08-31 09:21:09 +02:00 · 2017-01-22 22:59:39 +01:00
parent 3cbd0716f4 01bf84742d
commit d6861c1054
653 changed files with 2136 additions and 2008 deletions
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -739,6 +739,7 @@ typedef enum
 	LOCALE_FONTMENU_SCALING_Y,
 	LOCALE_FONTMENU_SCALING_Y_HINT2,
 	LOCALE_FONTMENU_SIZES,
+	LOCALE_FONTSIZE_BUTTON_TEXT,
 	LOCALE_FONTSIZE_CHANNEL_NUM_ZAP,
 	LOCALE_FONTSIZE_CHANNELLIST,
 	LOCALE_FONTSIZE_CHANNELLIST_DESCR,
@@ -1068,6 +1069,7 @@ typedef enum
 	LOCALE_MENU_HINT_EPG_OLD_EVENTS,
 	LOCALE_MENU_HINT_EPG_READ,
 	LOCALE_MENU_HINT_EPG_READ_FREQUENTLY,
+	LOCALE_MENU_HINT_EPG_READ_NOW,
 	LOCALE_MENU_HINT_EPG_SAVE,
 	LOCALE_MENU_HINT_EPG_SAVE_FREQUENTLY,
 	LOCALE_MENU_HINT_EPG_SAVE_MODE,
@@ -1544,6 +1546,7 @@ typedef enum
 	LOCALE_MISCSETTINGS_EPG_OLD_EVENTS_HINT2,
 	LOCALE_MISCSETTINGS_EPG_READ,
 	LOCALE_MISCSETTINGS_EPG_READ_FREQUENTLY,
+	LOCALE_MISCSETTINGS_EPG_READ_NOW,
 	LOCALE_MISCSETTINGS_EPG_SAVE,
 	LOCALE_MISCSETTINGS_EPG_SAVE_FREQUENTLY,
 	LOCALE_MISCSETTINGS_EPG_SAVE_MODE,
@@ -1855,22 +1858,25 @@ typedef enum
 	LOCALE_MOVIEPLAYER_CHAPTERS,
 	LOCALE_MOVIEPLAYER_FILEPLAYBACK,
 	LOCALE_MOVIEPLAYER_HEAD,
+	LOCALE_MOVIEPLAYER_HELP_ADDITIONAL,
+	LOCALE_MOVIEPLAYER_HELP_BUTTON_1,
+	LOCALE_MOVIEPLAYER_HELP_BUTTON_2,
+	LOCALE_MOVIEPLAYER_HELP_BUTTON_3,
+	LOCALE_MOVIEPLAYER_HELP_BUTTON_4,
+	LOCALE_MOVIEPLAYER_HELP_BUTTON_5,
+	LOCALE_MOVIEPLAYER_HELP_BUTTON_6,
+	LOCALE_MOVIEPLAYER_HELP_BUTTON_7,
+	LOCALE_MOVIEPLAYER_HELP_BUTTON_8,
+	LOCALE_MOVIEPLAYER_HELP_BUTTON_9,
+	LOCALE_MOVIEPLAYER_HELP_BUTTON_BACKWARD,
+	LOCALE_MOVIEPLAYER_HELP_BUTTON_FORWARD,
+	LOCALE_MOVIEPLAYER_HELP_BUTTON_MENU,
+	LOCALE_MOVIEPLAYER_HELP_BUTTON_PAUSE,
+	LOCALE_MOVIEPLAYER_HELP_BUTTON_STOP,
 	LOCALE_MOVIEPLAYER_PLUGIN,
 	LOCALE_MOVIEPLAYER_STARTING,
 	LOCALE_MOVIEPLAYER_TITLES,
 	LOCALE_MOVIEPLAYER_TOOMANYBOOKMARKS,
-	LOCALE_MOVIEPLAYER_TSHELP1,
-	LOCALE_MOVIEPLAYER_TSHELP10,
-	LOCALE_MOVIEPLAYER_TSHELP11,
-	LOCALE_MOVIEPLAYER_TSHELP12,
-	LOCALE_MOVIEPLAYER_TSHELP2,
-	LOCALE_MOVIEPLAYER_TSHELP3,
-	LOCALE_MOVIEPLAYER_TSHELP4,
-	LOCALE_MOVIEPLAYER_TSHELP5,
-	LOCALE_MOVIEPLAYER_TSHELP6,
-	LOCALE_MOVIEPLAYER_TSHELP7,
-	LOCALE_MOVIEPLAYER_TSHELP8,
-	LOCALE_MOVIEPLAYER_TSHELP9,
 	LOCALE_MOVIEPLAYER_TSPLAYBACK,
 	LOCALE_MOVIEPLAYER_YTPLAYBACK,
 	LOCALE_MPKEY_AUDIO,
@@ -2395,8 +2401,8 @@ typedef enum
 	LOCALE_TIMERLIST_REPEAT_WEEKDAYS,
 	LOCALE_TIMERLIST_REPEAT_WEEKLY,
 	LOCALE_TIMERLIST_REPEATCOUNT,
-	LOCALE_TIMERLIST_REPEATCOUNT_HELP1,
-	LOCALE_TIMERLIST_REPEATCOUNT_HELP2,
+	LOCALE_TIMERLIST_REPEATCOUNT_HINT_1,
+	LOCALE_TIMERLIST_REPEATCOUNT_HINT_2,
 	LOCALE_TIMERLIST_SAVE,
 	LOCALE_TIMERLIST_STANDBY,
 	LOCALE_TIMERLIST_STANDBY_OFF,
@@ -2475,6 +2481,7 @@ typedef enum
 	LOCALE_USERMENU_TITLE_GREEN,
 	LOCALE_USERMENU_TITLE_RED,
 	LOCALE_USERMENU_TITLE_YELLOW,
+	LOCALE_USERMENUS_HEAD,
 	LOCALE_VIDEO_MODE_OK,
 	LOCALE_VIDEOMENU_43MODE,
 	LOCALE_VIDEOMENU_ANALOG_AUTO,
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -739,6 +739,7 @@ const char * locale_real_names[] =
 	"fontmenu.scaling_y",
 	"fontmenu.scaling_y_hint2",
 	"fontmenu.sizes",
+	"fontsize.button_text",
 	"fontsize.channel_num_zap",
 	"fontsize.channellist",
 	"fontsize.channellist_descr",
@@ -1068,6 +1069,7 @@ const char * locale_real_names[] =
 	"menu.hint_epg_old_events",
 	"menu.hint_epg_read",
 	"menu.hint_epg_read_frequently",
+	"menu.hint_epg_read_now",
 	"menu.hint_epg_save",
 	"menu.hint_epg_save_frequently",
 	"menu.hint_epg_save_mode",
@@ -1544,6 +1546,7 @@ const char * locale_real_names[] =
 	"miscsettings.epg_old_events_hint2",
 	"miscsettings.epg_read",
 	"miscsettings.epg_read_frequently",
+	"miscsettings.epg_read_now",
 	"miscsettings.epg_save",
 	"miscsettings.epg_save_frequently",
 	"miscsettings.epg_save_mode",
@@ -1855,22 +1858,25 @@ const char * locale_real_names[] =
 	"movieplayer.chapters",
 	"movieplayer.fileplayback",
 	"movieplayer.head",
+	"movieplayer.help_additional",
+	"movieplayer.help_button_1",
+	"movieplayer.help_button_2",
+	"movieplayer.help_button_3",
+	"movieplayer.help_button_4",
+	"movieplayer.help_button_5",
+	"movieplayer.help_button_6",
+	"movieplayer.help_button_7",
+	"movieplayer.help_button_8",
+	"movieplayer.help_button_9",
+	"movieplayer.help_button_backward",
+	"movieplayer.help_button_forward",
+	"movieplayer.help_button_menu",
+	"movieplayer.help_button_pause",
+	"movieplayer.help_button_stop",
 	"movieplayer.plugin",
 	"movieplayer.starting",
 	"movieplayer.titles",
 	"movieplayer.toomanybookmarks",
-	"movieplayer.tshelp1",
-	"movieplayer.tshelp10",
-	"movieplayer.tshelp11",
-	"movieplayer.tshelp12",
-	"movieplayer.tshelp2",
-	"movieplayer.tshelp3",
-	"movieplayer.tshelp4",
-	"movieplayer.tshelp5",
-	"movieplayer.tshelp6",
-	"movieplayer.tshelp7",
-	"movieplayer.tshelp8",
-	"movieplayer.tshelp9",
 	"movieplayer.tsplayback",
 	"movieplayer.ytplayback",
 	"mpkey.audio",
@@ -2395,8 +2401,8 @@ const char * locale_real_names[] =
 	"timerlist.repeat.weekdays",
 	"timerlist.repeat.weekly",
 	"timerlist.repeatcount",
-	"timerlist.repeatcount.help1",
-	"timerlist.repeatcount.help2",
+	"timerlist.repeatcount.hint_1",
+	"timerlist.repeatcount.hint_2",
 	"timerlist.save",
 	"timerlist.standby",
 	"timerlist.standby.off",
@@ -2475,6 +2481,7 @@ const char * locale_real_names[] =
 	"usermenu.title_green",
 	"usermenu.title_red",
 	"usermenu.title_yellow",
+	"usermenus.head",
 	"video_mode_ok",
 	"videomenu.43mode",
 	"videomenu.analog_auto",
--- a/src/system/mtdutils/compr.cpp
+++ b/src/system/mtdutils/compr.cpp
@@ -60,11 +60,17 @@ static inline void list_del(struct list_head *entry)
 #define list_entry(ptr, type, member) \
 	((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))

+#if __cplusplus < 201103
 #define list_for_each_entry(pos, head, member)                          \
 	for (pos = list_entry((head)->next, typeof(*pos), member);      \
 			&pos->member != (head);                                    \
 			pos = list_entry(pos->member.next, typeof(*pos), member))
-
+#else
+#define list_for_each_entry(pos, head, member)                          \
+	for (pos = list_entry((head)->next, __typeof__(*pos), member);      \
+			&pos->member != (head);                                    \
+			pos = list_entry(pos->member.next, __typeof__(*pos), member))
+#endif

 /* Available compressors are on this_ list */
 static LIST_HEAD(jffs2_compressor_list);
--- a/src/system/mtdutils/compr_zlib.cpp
+++ b/src/system/mtdutils/compr_zlib.cpp
@@ -44,6 +44,9 @@
 #include "common.h"
 #include "compr.h"

+#if __cplusplus >= 201103
+#include "algorithm"
+#endif
 /* Plan: call deflate() with avail_in == *sourcelen,
   avail_out = *dstlen - 12 and flush == Z_FINISH.
   If it doesn't manage to finish,	call it again with
@@ -76,7 +79,11 @@ static int jffs2_zlib_compress(unsigned char *data_in, unsigned char *cpage_out,

 	while (strm.total_out < *dstlen - STREAM_END_SPACE && strm.total_in < *sourcelen) {
 		strm.avail_out = *dstlen - (strm.total_out + STREAM_END_SPACE);
+#if __cplusplus < 201103
 		strm.avail_in = min((unsigned)(*sourcelen-strm.total_in), strm.avail_out);
+#else
+		strm.avail_in = std::min((unsigned)(*sourcelen-strm.total_in), strm.avail_out);
+#endif
 		ret = deflate(&strm, Z_PARTIAL_FLUSH);
 		if (ret != Z_OK) {
 			deflateEnd(&strm);
--- a/src/system/mtdutils/include/common.h
+++ b/src/system/mtdutils/include/common.h
@@ -37,13 +37,15 @@
 extern "C" {
 #endif

-#ifndef MIN	/* some C lib headers define this for us */
+#if __cplusplus < 201103
+#ifndef MIN 	/* some C lib headers define this for us */
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 #endif
 #ifndef MAX
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
 #endif
 #define min(a, b) MIN(a, b) /* glue for linux kernel source */
+#endif
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))

 #ifndef O_CLOEXEC
--- a/src/system/mtdutils/mkfs.jffs2.cpp
+++ b/src/system/mtdutils/mkfs.jffs2.cpp
@@ -66,6 +66,9 @@
 #include <crc32.h>
 #include <inttypes.h>

+#if __cplusplus >= 201103
+#include <algorithm>
+#endif
 #include <string>

 #include "rbtree.h"
@@ -755,7 +758,11 @@ void CMkfsJFFS2::pad_block_if_less_than(int req)
 void CMkfsJFFS2::padblock(void)
 {
 	while (out_ofs % erase_block_size) {
+#if __cplusplus < 201103
 		full_write(out_fd, ffbuf, min(sizeof(ffbuf),
+#else
+		full_write(out_fd, ffbuf, std::min(sizeof(ffbuf),
+#endif
 					      (size_t)(erase_block_size - (out_ofs % erase_block_size))));
 	}
 }
@@ -868,7 +875,11 @@ void CMkfsJFFS2::create_target_filesystem(struct filesystem_entry *root)
 			}
 		} else {
 			while (out_ofs < pad_fs_size) {
+#if __cplusplus < 201103
 				full_write(out_fd, ffbuf, min(sizeof(ffbuf), (size_t)(pad_fs_size - out_ofs)));
+#else
+				full_write(out_fd, ffbuf, std::min(sizeof(ffbuf), (size_t)(pad_fs_size - out_ofs)));
+#endif
 			}

 		}
--- a/src/system/mtdutils/rbtree.h
+++ b/src/system/mtdutils/rbtree.h
@@ -136,9 +136,15 @@ static inline void rb_set_color(struct rb_node *rb, int color)
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #endif

+#if __cplusplus < 201103
 #define container_of(ptr, type, member) ({                      \
        const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
        (type *)( (char *)__mptr - offsetof(type,member) );})
+#else
+#define container_of(ptr, type, member) ({                      \
+        const __typeof__( ((type *)0)->member ) *__mptr = (ptr);    \
+        (type *)( (char *)__mptr - offsetof(type,member) );})
+#endif

 #define	rb_entry(ptr, type, member) container_of(ptr, type, member)

--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -147,6 +147,14 @@ struct SNeutrinoTheme
 	unsigned char clock_Digit_red;
 	unsigned char clock_Digit_green;
 	unsigned char clock_Digit_blue;
+
+	int progressbar_design;
+	int progressbar_design_channellist;
+	int progressbar_gradient;
+	int progressbar_timescale_red;
+	int progressbar_timescale_green;
+	int progressbar_timescale_yellow;
+	int progressbar_timescale_invert;
 };

 struct timer_remotebox_item
@@ -199,12 +207,6 @@ struct SNeutrinoSettings
 	int infobar_show;
 	int infobar_show_channellogo;
 	int infobar_progressbar;
-	int progressbar_design;
-	int progressbar_gradient;
-	int progressbar_timescale_red;
-	int progressbar_timescale_green;
-	int progressbar_timescale_yellow;
-	int progressbar_timescale_invert;
 	int infobar_casystem_display;
 	int infobar_casystem_dotmatrix;
 	int infobar_casystem_frame;
@@ -592,7 +594,6 @@ struct SNeutrinoSettings
 	int eventlist_epgplus;
 	int channellist_additional;
 	int channellist_epgtext_align_right;
-	int channellist_progressbar_design;
 	int channellist_foot;
 	int channellist_new_zap_mode;
 	int channellist_sort_mode;
@@ -691,6 +692,7 @@ struct SNeutrinoSettings
 		FONT_TYPE_MOVIEBROWSER_INFO,
 		FONT_TYPE_SUBTITLES,
 		FONT_TYPE_MESSAGE_TEXT,
+		FONT_TYPE_BUTTON_TEXT,
 		FONT_TYPE_COUNT
 	};

@@ -790,15 +792,18 @@ struct SNeutrinoSettings
 	// USERMENU
 	typedef enum
 	{
-		BUTTON_RED = 0,  // Do not change ordering of members, add new item just before BUTTON_MAX!!!
+		// Do not change ordering of members, add new item just before BUTTON_MAX!!!
+		BUTTON_RED = 0,
 		BUTTON_GREEN = 1,
 		BUTTON_YELLOW = 2,
 		BUTTON_BLUE = 3,
-		BUTTON_MAX   // MUST be always the last in the list
+		BUTTON_MAX // MUST be always the last in the list
 	} USER_BUTTON;
+
 	typedef enum
 	{
-		ITEM_NONE = 0, // Do not change ordering of members, add new item just before ITEM_MAX!!!
+		// Do not change ordering of members, add new item just before ITEM_MAX!!!
+		ITEM_NONE = 0,
 		ITEM_BAR = 1,
 		ITEM_EPG_LIST = 2,
 		ITEM_EPG_SUPER = 3,
@@ -824,18 +829,16 @@ struct SNeutrinoSettings
 		ITEM_FILEPLAY = 23,
 		ITEM_TOOLS = 24,
 		ITEM_LUA = 25,
-
 		ITEM_HDDMENU = 26,
 		ITEM_AUDIOPLAY = 27,
 		ITEM_INETPLAY = 28,
 		ITEM_NETSETTINGS = 29,
 		ITEM_SWUPDATE = 30,
-
 		ITEM_LIVESTREAM_RESOLUTION = 31,
 		ITEM_ADZAP = 32,
-
-		ITEM_MAX   // MUST be always the last in the list
+		ITEM_MAX // MUST be always the last in the list
 	} USER_ITEM;
+
 	typedef struct {
 		unsigned int key;
 		std::string items;
@@ -910,12 +913,15 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
 #define RADIUS_NONE	0

 // offsets
-#define OFFSET_SHADOW	6
-#define OFFSET_INTER	6
+#define OFFSET_SHADOW		6
+#define OFFSET_INTER		6
 #define OFFSET_INNER_LARGE	20
 #define OFFSET_INNER_MID	10
 #define OFFSET_INNER_SMALL	5
 #define OFFSET_INNER_MIN	2
+#define OFFSET_INNER_NONE	0
+
+#define SCROLLBAR_WIDTH		OFFSET_INNER_MID + 2*OFFSET_INNER_MIN

 struct SglobalInfo
 {