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

Merge remote-tracking branch 'tuxbox/master'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c92d112d0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2016-11-12 18:06:26 +01:00
parent 44ae8a088c 790508f5e0
commit d8d4d753a5
58 changed files with 6498 additions and 735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/helpers.cpp
View File

@@ -1086,7 +1086,7 @@ std::vector<std::string> split(const std::string &s, char delim)
return vec;
}
#if __cplusplus <= 201103L
#if __cplusplus < 201103L
std::string to_string(int i)
{
std::stringstream s;

2
src/system/helpers.h
View File

@@ -116,7 +116,7 @@ class CFileHelpers
uint32_t GetWidth4FB_HW_ACC(const uint32_t _x, const uint32_t _w, const bool max=true);
#if __cplusplus <= 201103L
#if __cplusplus < 201103L
std::string to_string(int);
std::string to_string(unsigned int);
std::string to_string(long);

12
src/system/httptool.cpp
View File

@@ -66,7 +66,7 @@ int CHTTPTool::show_progress( void *clientp, double dltotal, double dlnow, doubl
return 0;
}
//#define DEBUG
bool CHTTPTool::downloadFile(const std::string & URL, const char * const downloadTarget, int globalProgressEnd)
bool CHTTPTool::downloadFile(const std::string & URL, const char * const downloadTarget, int globalProgressEnd, int connecttimeout/*=10*/, int timeout/*=1800*/)
{
CURL *curl;
CURLcode res;
@@ -97,8 +97,8 @@ printf("url is %s\n", URL.c_str());
curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
curl_easy_setopt(curl, CURLOPT_USERAGENT, userAgent.c_str());
curl_easy_setopt(curl, CURLOPT_NOSIGNAL, (long)1);
curl_easy_setopt(curl, CURLOPT_TIMEOUT, 1800);
curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10);
curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout);
curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, connecttimeout);
curl_easy_setopt(curl, CURLOPT_FAILONERROR, true);
#ifdef DEBUG
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
@@ -136,7 +136,7 @@ printf("download code %d\n", res);
return res==CURLE_OK;
}
std::string CHTTPTool::downloadString(const std::string & URL, int globalProgressEnd)
std::string CHTTPTool::downloadString(const std::string & URL, int globalProgressEnd, int connecttimeout/*=10*/, int timeout/*=1800*/)
{
CURL *curl;
CURLcode res;
@@ -161,8 +161,8 @@ printf("url is %s\n", URL.c_str());
curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
curl_easy_setopt(curl, CURLOPT_USERAGENT, userAgent.c_str());
curl_easy_setopt(curl, CURLOPT_NOSIGNAL, (long)1);
curl_easy_setopt(curl, CURLOPT_TIMEOUT, 1800);
curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10);
curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout);
curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, connecttimeout);
curl_easy_setopt(curl, CURLOPT_FAILONERROR, true);
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, false);
#ifdef DEBUG

4
src/system/httptool.h
View File

@@ -52,8 +52,8 @@ class CHTTPTool
CHTTPTool();
void setStatusViewer( CProgressWindow* statusview );
bool downloadFile( const std::string & URL, const char * const downloadTarget, int globalProgressEnd=-1 );
std::string downloadString(const std::string & URL, int globalProgressEnd=-1 );
bool downloadFile( const std::string & URL, const char * const downloadTarget, int globalProgressEnd=-1, int connecttimeout=10, int timeout=1800);
std::string downloadString(const std::string & URL, int globalProgressEnd=-1, int connecttimeout=10, int timeout=1800);
};

13
src/system/locals.h
View File

@@ -730,6 +730,7 @@ typedef enum
LOCALE_FONTMENU_HEAD,
LOCALE_FONTMENU_INFOBAR,
LOCALE_FONTMENU_MENU,
LOCALE_FONTMENU_MOVIEBROWSER,
LOCALE_FONTMENU_OTHER,
LOCALE_FONTMENU_SCALING,
LOCALE_FONTMENU_SCALING_X,
@@ -762,6 +763,9 @@ typedef enum
LOCALE_FONTSIZE_MENU_HINT,
LOCALE_FONTSIZE_MENU_INFO,
LOCALE_FONTSIZE_MENU_TITLE,
LOCALE_FONTSIZE_MOVIEBROWSER_HEAD,
LOCALE_FONTSIZE_MOVIEBROWSER_INFO,
LOCALE_FONTSIZE_MOVIEBROWSER_LIST,
LOCALE_FONTSIZE_SUBTITLES,
LOCALE_FSK_ALL,
LOCALE_FSK_FROM_12,
@@ -1214,6 +1218,7 @@ typedef enum
LOCALE_MENU_HINT_MISC_ONLINESERVICES,
LOCALE_MENU_HINT_MISC_ZAPIT,
LOCALE_MENU_HINT_MOVIE,
LOCALE_MENU_HINT_MOVIEBROWSER_FONTS,
LOCALE_MENU_HINT_MOVIEBROWSER_SETUP,
LOCALE_MENU_HINT_MOVIEPLAYER_PLUGIN,
LOCALE_MENU_HINT_NET_BROADCAST,
@@ -1656,6 +1661,7 @@ typedef enum
LOCALE_MOVIEBROWSER_BOOK_TYPE,
LOCALE_MOVIEBROWSER_BOOK_TYPE_BACKWARD,
LOCALE_MOVIEBROWSER_BOOK_TYPE_FORWARD,
LOCALE_MOVIEBROWSER_BROWSER_ADDITIONAL,
LOCALE_MOVIEBROWSER_BROWSER_FRAME_HIGH,
LOCALE_MOVIEBROWSER_BROWSER_ROW_HEAD,
LOCALE_MOVIEBROWSER_BROWSER_ROW_ITEM,
@@ -1684,6 +1690,7 @@ typedef enum
LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO2,
LOCALE_MOVIEBROWSER_EDIT_SERIE,
LOCALE_MOVIEBROWSER_ERROR_NO_MOVIES,
LOCALE_MOVIEBROWSER_FILTER_OFF,
LOCALE_MOVIEBROWSER_FOOT_FILTER,
LOCALE_MOVIEBROWSER_FOOT_FOCUS,
LOCALE_MOVIEBROWSER_FOOT_OPTIONS,
@@ -2122,8 +2129,12 @@ typedef enum
LOCALE_REMOTEBOX_CHANNEL_NA,
LOCALE_REMOTEBOX_DEL,
LOCALE_REMOTEBOX_HEAD,
LOCALE_REMOTEBOX_IP,
LOCALE_REMOTEBOX_MOD,
LOCALE_REMOTEBOX_PASS,
LOCALE_REMOTEBOX_PORT,
LOCALE_REMOTEBOX_RBADDR,
LOCALE_REMOTEBOX_RBNAME,
LOCALE_REMOTEBOX_USER,
LOCALE_RESET_ALL,
LOCALE_RESET_CHANNELS,
LOCALE_RESET_CONFIRM,

13
src/system/locals_intern.h
View File

@@ -730,6 +730,7 @@ const char * locale_real_names[] =
"fontmenu.head",
"fontmenu.infobar",
"fontmenu.menu",
"fontmenu.moviebrowser",
"fontmenu.other",
"fontmenu.scaling",
"fontmenu.scaling_x",
@@ -762,6 +763,9 @@ const char * locale_real_names[] =
"fontsize.menu_hint",
"fontsize.menu_info",
"fontsize.menu_title",
"fontsize.moviebrowser_head",
"fontsize.moviebrowser_info",
"fontsize.moviebrowser_list",
"fontsize.subtitles",
"fsk.all",
"fsk.from_12",
@@ -1214,6 +1218,7 @@ const char * locale_real_names[] =
"menu.hint_misc_onlineservices",
"menu.hint_misc_zapit",
"menu.hint_movie",
"menu.hint_moviebrowser_fonts",
"menu.hint_moviebrowser_setup",
"menu.hint_movieplayer_plugin",
"menu.hint_net_broadcast",
@@ -1656,6 +1661,7 @@ const char * locale_real_names[] =
"moviebrowser.book_type",
"moviebrowser.book_type_backward",
"moviebrowser.book_type_forward",
"moviebrowser.browser_additional",
"moviebrowser.browser_frame_high",
"moviebrowser.browser_row_head",
"moviebrowser.browser_row_item",
@@ -1684,6 +1690,7 @@ const char * locale_real_names[] =
"moviebrowser.edit_book_type_info2",
"moviebrowser.edit_serie",
"moviebrowser.error_no_movies",
"moviebrowser.filter_off",
"moviebrowser.foot_filter",
"moviebrowser.foot_focus",
"moviebrowser.foot_options",
@@ -2122,8 +2129,12 @@ const char * locale_real_names[] =
"remotebox_channel_na",
"remotebox_del",
"remotebox_head",
"remotebox_ip",
"remotebox_mod",
"remotebox_pass",
"remotebox_port",
"remotebox_rbaddr",
"remotebox_rbname",
"remotebox_user",
"reset_all",
"reset_channels",
"reset_confirm",

16
src/system/settings.h
View File

@@ -149,6 +149,15 @@ struct SNeutrinoTheme
unsigned char clock_Digit_blue;
};
struct timer_remotebox_item
{
unsigned int port;
std::string user;
std::string pass;
std::string rbname;
std::string rbaddress;
};
struct SNeutrinoSettings
{
std::string version_pseudo;
@@ -454,7 +463,7 @@ struct SNeutrinoSettings
int recording_slow_warning;
int recording_startstop_msg;
int shutdown_timer_record_type;
std::list<std::string> timer_remotebox_ip;
std::vector<timer_remotebox_item> timer_remotebox_ip;
std::string recording_filename_template;
int recording_already_found_check;
@@ -673,6 +682,9 @@ struct SNeutrinoSettings
FONT_TYPE_INFOBAR_SMALL,
FONT_TYPE_FILEBROWSER_ITEM,
FONT_TYPE_MENU_HINT,
FONT_TYPE_MOVIEBROWSER_HEAD,
FONT_TYPE_MOVIEBROWSER_LIST,
FONT_TYPE_MOVIEBROWSER_INFO,
FONT_TYPE_SUBTITLES,
FONT_TYPE_COUNT
};
@@ -895,7 +907,7 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
#define OFFSET_INNER_LARGE 20
#define OFFSET_INNER_MID 10
#define OFFSET_INNER_SMALL 5
#define OFFSET_INNER_MIN 2
struct SglobalInfo
{