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

Merge remote-tracking branch 'check/cst-next'

Browse Source 
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-01-26 17:26:26 +01:00
parent ba282cf8c4 7189a98486
commit 2263c8bd2e
106 changed files with 6374 additions and 5374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/system/locals.h
View File

@@ -200,7 +200,6 @@ typedef enum
LOCALE_AUDIOPLAYER_REPEAT_ON,
LOCALE_AUDIOPLAYER_REWIND,
LOCALE_AUDIOPLAYER_SAVE_PLAYLIST,
LOCALE_AUDIOPLAYER_SCREENSAVER_TIMEOUT,
LOCALE_AUDIOPLAYER_SELECT_TITLE_BY_NAME,
LOCALE_AUDIOPLAYER_SHOW_PLAYLIST,
LOCALE_AUDIOPLAYER_SHUFFLE,
@@ -938,7 +937,6 @@ typedef enum
LOCALE_MENU_HINT_AUDIOPLAYER_PLAYLIST,
LOCALE_MENU_HINT_AUDIOPLAYER_REPEAT,
LOCALE_MENU_HINT_AUDIOPLAYER_SC_METADATA,
LOCALE_MENU_HINT_AUDIOPLAYER_SCREENSAVER,
LOCALE_MENU_HINT_AUDIOPLAYER_TITLE,
LOCALE_MENU_HINT_AUTO_LANG,
LOCALE_MENU_HINT_AUTO_SUBS,
@@ -988,6 +986,7 @@ typedef enum
LOCALE_MENU_HINT_EPG_READ,
LOCALE_MENU_HINT_EPG_SAVE,
LOCALE_MENU_HINT_EPG_SAVE_FREQUENTLY,
LOCALE_MENU_HINT_EPG_SAVE_MODE,
LOCALE_MENU_HINT_EPG_SAVE_STANDBY,
LOCALE_MENU_HINT_EPG_SCAN,
LOCALE_MENU_HINT_EPG_SCAN_MODE,
@@ -1317,6 +1316,10 @@ typedef enum
LOCALE_MENU_HINT_SCAN_USEUSALS,
LOCALE_MENU_HINT_SCRAMBLED_MESSAGE,
LOCALE_MENU_HINT_SCREEN_SETUP,
LOCALE_MENU_HINT_SCREENSAVER_DELAY,
LOCALE_MENU_HINT_SCREENSAVER_DIR,
LOCALE_MENU_HINT_SCREENSAVER_TIMEOUT,
LOCALE_MENU_HINT_SCREENSAVER_SETUP,
LOCALE_MENU_HINT_SCREENSHOT_COUNT,
LOCALE_MENU_HINT_SCREENSHOT_COVER,
LOCALE_MENU_HINT_SCREENSHOT_DIR,
@@ -1428,6 +1431,7 @@ typedef enum
LOCALE_MISCSETTINGS_EPG_READ,
LOCALE_MISCSETTINGS_EPG_SAVE,
LOCALE_MISCSETTINGS_EPG_SAVE_FREQUENTLY,
LOCALE_MISCSETTINGS_EPG_SAVE_MODE,
LOCALE_MISCSETTINGS_EPG_SAVE_STANDBY,
LOCALE_MISCSETTINGS_EPG_SCAN,
LOCALE_MISCSETTINGS_EPG_SCAN_ALWAYS,
@@ -2083,6 +2087,11 @@ typedef enum
LOCALE_SCANTS_TEST,
LOCALE_SCANTS_TRANSPONDERS,
LOCALE_SCRAMBLED_CHANNEL,
LOCALE_SCREENSAVER_DELAY,
LOCALE_SCREENSAVER_DIR,
LOCALE_SCREENSAVER_MENU,
LOCALE_SCREENSAVER_OFF,
LOCALE_SCREENSAVER_TIMEOUT,
LOCALE_SCREENSETUP_LOWERRIGHT,
LOCALE_SCREENSETUP_UPPERLEFT,
LOCALE_SCREENSHOT_COUNT,

13
src/system/locals_intern.h
View File

@@ -200,7 +200,6 @@ const char * locale_real_names[] =
"audioplayer.repeat_on",
"audioplayer.rewind",
"audioplayer.save_playlist",
"audioplayer.screensaver_timeout",
"audioplayer.select_title_by_name",
"audioplayer.show_playlist",
"audioplayer.shuffle",
@@ -938,7 +937,6 @@ const char * locale_real_names[] =
"menu.hint_audioplayer_playlist",
"menu.hint_audioplayer_repeat",
"menu.hint_audioplayer_sc_metadata",
"menu.hint_audioplayer_screensaver",
"menu.hint_audioplayer_title",
"menu.hint_auto_lang",
"menu.hint_auto_subs",
@@ -988,6 +986,7 @@ const char * locale_real_names[] =
"menu.hint_epg_read",
"menu.hint_epg_save",
"menu.hint_epg_save_frequently",
"menu.hint_epg_save_mode",
"menu.hint_epg_save_standby",
"menu.hint_epg_scan",
"menu.hint_epg_scan_mode",
@@ -1317,6 +1316,10 @@ const char * locale_real_names[] =
"menu.hint_scan_useusals",
"menu.hint_scrambled_message",
"menu.hint_screen_setup",
"menu.hint_screensaver_delay",
"menu.hint_screensaver_dir",
"menu.hint_screensaver_timeout",
"menu.hint_screensaver_setup",
"menu.hint_screenshot_count",
"menu.hint_screenshot_cover",
"menu.hint_screenshot_dir",
@@ -1428,6 +1431,7 @@ const char * locale_real_names[] =
"miscsettings.epg_read",
"miscsettings.epg_save",
"miscsettings.epg_save_frequently",
"miscsettings.epg_save_mode",
"miscsettings.epg_save_standby",
"miscsettings.epg_scan",
"miscsettings.epg_scan_always",
@@ -2083,6 +2087,11 @@ const char * locale_real_names[] =
"scants.test",
"scants.transponders",
"scrambled_channel",
"screensaver.delay",
"screensaver.dir",
"screensaver.menu",
"screensaver.off",
"screensaver.timeout",
"screensetup.lowerright",
"screensetup.upperleft",
"screenshot.count",

4
src/system/mtdutils/mkfs.jffs2.cpp
View File

@@ -1057,7 +1057,9 @@ struct filesystem_entry *CMkfsJFFS2::recursive_add_host_directory(
skipCheck = true;
}
if ((!skipCheck) && (sb.st_dev != dev_x[dev_jffs2])) /* jffs2 */
if (strstr(targetpath, "/var_init") == targetpath)
return NULL;
if ((!skipCheck) && (sb.st_dev != dev_x[dev_jffs2]) && !(strstr(targetpath, "/var") == targetpath)) /* jffs2 */
return NULL;
}

7
src/system/settings.h
View File

@@ -211,6 +211,11 @@ struct SNeutrinoSettings
int radiotext_enable;
int easymenu;
//screen saver
int screensaver_delay;
std::string screensaver_dir;
int screensaver_timeout;
//vcr
int vcr_AutoSwitch;
@@ -234,6 +239,7 @@ struct SNeutrinoSettings
std::string epg_dir;
int epg_scan;
int epg_scan_mode;
int epg_save_mode;
int epg_search_history_size;
int epg_search_history_max;
@@ -657,7 +663,6 @@ struct SNeutrinoSettings
//audioplayer
int audioplayer_display;
int audioplayer_follow;
int audioplayer_screensaver;
int audioplayer_highprio;
int audioplayer_select_title_by_name;
int audioplayer_repeat_on;

8
src/system/ytcache.cpp
View File

@@ -151,9 +151,9 @@ bool cYTCache::download(MI_MOVIE_INFO *mi)
char cerror[CURL_ERROR_SIZE];
curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, cerror);
if(g_settings.softupdate_proxyserver != "") {
if(!g_settings.softupdate_proxyserver.empty()) {
curl_easy_setopt(curl, CURLOPT_PROXY, g_settings.softupdate_proxyserver.c_str());
if(g_settings.softupdate_proxyusername != "") {
if(!g_settings.softupdate_proxyusername.empty()) {
std::string tmp = g_settings.softupdate_proxyusername + ":" + g_settings.softupdate_proxypassword;
curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, tmp.c_str());
}
@@ -307,7 +307,7 @@ void cYTCache::cancelAll(MI_MOVIE_INFO::miSource source)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
cancelled = false;
if (pending.size() > 0) {
if (!pending.empty()) {
if (pthread_create(&thread, NULL, downloadThread, this)) {
perror("pthread_create");
return;
@@ -344,7 +344,7 @@ std::vector<MI_MOVIE_INFO> cYTCache::getPending(MI_MOVIE_INFO::miSource source,
for (std::vector<MI_MOVIE_INFO>::iterator it = pending.begin(); it != pending.end(); ++it)
if ((*it).source == source)
res.push_back(*it);
if (res.size() > 0 && pending.front().source == source) {
if (!res.empty() && pending.front().source == source) {
if (p_dltotal)
*p_dltotal = dltotal;
if (p_dlnow)

8
src/system/ytparser.cpp
View File

@@ -134,9 +134,9 @@ bool cYTFeedParser::getUrl(std::string &url, std::string &answer, CURL *_curl_ha
curl_easy_setopt(_curl_handle, CURLOPT_TIMEOUT, URL_TIMEOUT);
curl_easy_setopt(_curl_handle, CURLOPT_NOSIGNAL, (long)1);
if(g_settings.softupdate_proxyserver != "") {
if(!g_settings.softupdate_proxyserver.empty()) {
curl_easy_setopt(_curl_handle, CURLOPT_PROXY, g_settings.softupdate_proxyserver.c_str());
if(g_settings.softupdate_proxyusername != "") {
if(!g_settings.softupdate_proxyusername.empty()) {
std::string tmp = g_settings.softupdate_proxyusername + ":" + g_settings.softupdate_proxypassword;
curl_easy_setopt(_curl_handle, CURLOPT_PROXYUSERPWD, tmp.c_str());
}
@@ -174,9 +174,9 @@ bool cYTFeedParser::DownloadUrl(std::string &url, std::string &file, CURL *_curl
curl_easy_setopt(_curl_handle, CURLOPT_TIMEOUT, URL_TIMEOUT);
curl_easy_setopt(_curl_handle, CURLOPT_NOSIGNAL, (long)1);
if(g_settings.softupdate_proxyserver != "") {
if(!g_settings.softupdate_proxyserver.empty()) {
curl_easy_setopt(_curl_handle, CURLOPT_PROXY, g_settings.softupdate_proxyserver.c_str());
if(g_settings.softupdate_proxyusername != "") {
if(!g_settings.softupdate_proxyusername.empty()) {
std::string tmp = g_settings.softupdate_proxyusername + ":" + g_settings.softupdate_proxypassword;
curl_easy_setopt(_curl_handle, CURLOPT_PROXYUSERPWD, tmp.c_str());
}