[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-554-g91bef1b
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-554-g91bef1b
|
From: GetAway <tux...@ne...> - 2015-05-14 07:29:34
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 91bef1b61c652d7f600f38259d129a494b48d663 (commit)
via 4676f6a1c620b13ccf619556c3a54a72e2bd6965 (commit)
via eecdd87aba22cd00e50ab82cf969b5fd4d985533 (commit)
from fdca0ea1c62b7c43bd6810dea975c81897547597 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 91bef1b61c652d7f600f38259d129a494b48d663
Author: GetAway <get...@t-...>
Date: Thu May 14 09:28:43 2015 +0200
yWeb: remove save of setting that is not used
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt
index 8bd4289..c5b0ed2 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt
@@ -35,7 +35,6 @@ start-block~Live_save_settings
{=ini-set:/var/tuxbox/config/Y-Web.conf;slavebox;{=slavebox=}~open=}
{=ini-set:/var/tuxbox/config/Y-Web.conf;vlc_record_path;{=vlc_record_path=}~cache=}
{=ini-set:/var/tuxbox/config/Y-Web.conf;deinterlace;{=deinterlace=}~cache=}
-{=ini-set:/var/tuxbox/config/Y-Web.conf;deinterlace_filter;{=v=}~cache=}
{=ini-set:/var/tuxbox/config/Y-Web.conf;udp;{=udp=}~cache=}
{=ini-set:/var/tuxbox/config/Y-Web.conf;http_caching;{=http_caching=}~save=}
end-block~Live_save_settings
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 362fee4..3938606 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.3.00
-date=09.05.2015
+version=2.8.3.01
+date=14.05.2015
type=Release
info=Tuxbox
commit 4676f6a1c620b13ccf619556c3a54a72e2bd6965
Author: Christian Schuett <Gau...@ho...>
Date: Wed May 13 19:41:17 2015 +0200
Neutrino network setup: add missing observer to netmask input
also simplify, remove unused and avoid redundant code
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/src/gui/network_setup.cpp b/tuxbox/neutrino/src/gui/network_setup.cpp
index 29d1cd2..f4906aa 100644
--- a/tuxbox/neutrino/src/gui/network_setup.cpp
+++ b/tuxbox/neutrino/src/gui/network_setup.cpp
@@ -85,22 +85,13 @@ CNetworkSetup::CNetworkSetup()
width = w_max (500, 100);
selected = -1;
- network_automatic_start = networkConfig->automatic_start;
- network_dhcp = networkConfig->inet_static ? NETWORK_DHCP_OFF : NETWORK_DHCP_ON;
- network_address = networkConfig->address;
- network_netmask = networkConfig->netmask;
- network_broadcast = networkConfig->broadcast;
- network_nameserver = networkConfig->nameserver;
- network_gateway = networkConfig->gateway;
-
- old_network_automatic_start = networkConfig->automatic_start;
- old_network_dhcp = networkConfig->inet_static ? NETWORK_DHCP_OFF : NETWORK_DHCP_ON;
- old_network_address = networkConfig->address;
- old_network_netmask = networkConfig->netmask;
- old_network_broadcast = networkConfig->broadcast;
- old_network_nameserver = networkConfig->nameserver;
- old_network_gateway = networkConfig->gateway;
-
+ network_automatic_start = old_network_automatic_start = networkConfig->automatic_start;
+ network_dhcp = old_network_dhcp = networkConfig->inet_static ? NETWORK_DHCP_OFF : NETWORK_DHCP_ON;
+ network_address = old_network_address = networkConfig->address;
+ network_netmask = old_network_netmask = networkConfig->netmask;
+ network_broadcast = networkConfig->broadcast;
+ network_nameserver = old_network_nameserver = networkConfig->nameserver;
+ network_gateway = old_network_gateway = networkConfig->gateway;
}
CNetworkSetup::~CNetworkSetup()
@@ -108,7 +99,6 @@ CNetworkSetup::~CNetworkSetup()
}
-
int CNetworkSetup::exec(CMenuTarget* parent, const std::string &actionKey)
{
int res = menu_return::RETURN_REPAINT;
@@ -146,6 +136,7 @@ int CNetworkSetup::exec(CMenuTarget* parent, const std::string &actionKey)
return res;
}
+
void CNetworkSetup::setBroadcast(void)
{
in_addr_t na = inet_addr(network_address.c_str());
@@ -179,11 +170,9 @@ int CNetworkSetup::showNetworkSetup()
//prepare input entries
CIPInput networkSettings_NetworkIP (LOCALE_NETWORKMENU_IPADDRESS , network_address , LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2, this);
- CIPInput networkSettings_NetMask (LOCALE_NETWORKMENU_NETMASK , network_netmask );
- CIPInput networkSettings_Broadcast (LOCALE_NETWORKMENU_BROADCAST , network_broadcast );
+ CIPInput networkSettings_NetMask (LOCALE_NETWORKMENU_NETMASK , network_netmask , LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2, this);
CIPInput networkSettings_Gateway (LOCALE_NETWORKMENU_GATEWAY , network_gateway );
CIPInput networkSettings_NameServer (LOCALE_NETWORKMENU_NAMESERVER, network_nameserver);
-
//auto start
CMenuOptionChooser* o1 = new CMenuOptionChooser(LOCALE_NETWORKMENU_SETUPONSTARTUP, &network_automatic_start, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
@@ -194,11 +183,11 @@ int CNetworkSetup::showNetworkSetup()
CMenuForwarder *m1 = new CMenuForwarder(LOCALE_NETWORKMENU_IPADDRESS , networkConfig->inet_static, network_address , &networkSettings_NetworkIP );
CMenuForwarder *m2 = new CMenuForwarder(LOCALE_NETWORKMENU_NETMASK , networkConfig->inet_static, network_netmask , &networkSettings_NetMask );
setBroadcast();
- CMenuForwarder *m3 = new CMenuForwarder(LOCALE_NETWORKMENU_BROADCAST , false, network_broadcast);
+ CMenuForwarder *m3 = new CMenuForwarder(LOCALE_NETWORKMENU_BROADCAST , false , network_broadcast );
CMenuForwarder *m4 = new CMenuForwarder(LOCALE_NETWORKMENU_GATEWAY , networkConfig->inet_static, network_gateway , &networkSettings_Gateway );
CMenuForwarder *m5 = new CMenuForwarder(LOCALE_NETWORKMENU_NAMESERVER, networkConfig->inet_static, network_nameserver, &networkSettings_NameServer);
- CDHCPNotifier dhcpNotifier(m1,m2,m3,m4,m5);
+ CDHCPNotifier dhcpNotifier(m1,m2,m4,m5);
CMenuOptionChooser* o2 = new CMenuOptionChooser(LOCALE_NETWORKMENU_DHCP, &network_dhcp, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, &dhcpNotifier);
//paint menu items
@@ -241,7 +230,6 @@ int CNetworkSetup::showNetworkSetup()
ntp->addItem( ntp1);
ntp->addItem( ntp2);
ntp->addItem( ntp3);
-
#ifdef ENABLE_GUI_MOUNT
CMenuWidget* networkmounts = new CMenuWidget(LOCALE_MAINSETTINGS_NETWORK, NEUTRINO_ICON_SETTINGS, width);
@@ -558,10 +546,9 @@ void CNetworkSetup::showCurrentNetworkSettings()
bool CNetworkSetup::changeNotify(const neutrino_locale_t OptionName, void * /*Data*/)
{
- if (ARE_LOCALES_EQUAL(OptionName, LOCALE_NETWORKMENU_IPADDRESS)) {
- setBroadcast();
- }
- else if(OptionName == LOCALE_NETWORKMENU_NETMASK) {
+ if (ARE_LOCALES_EQUAL(OptionName, LOCALE_NETWORKMENU_IPADDRESS) ||
+ ARE_LOCALES_EQUAL(OptionName, LOCALE_NETWORKMENU_NETMASK))
+ {
setBroadcast();
}
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_NETWORKMENU_NTPSERVER) ||
@@ -573,19 +560,18 @@ bool CNetworkSetup::changeNotify(const neutrino_locale_t OptionName, void * /*Da
return false;
}
-CDHCPNotifier::CDHCPNotifier( CMenuForwarder* a1, CMenuForwarder* a2, CMenuForwarder* a3, CMenuForwarder* a4, CMenuForwarder* a5)
+CDHCPNotifier::CDHCPNotifier(CMenuForwarder* a1, CMenuForwarder* a2, CMenuForwarder* a3, CMenuForwarder* a4)
{
toDisable[0] = a1;
toDisable[1] = a2;
toDisable[2] = a3;
toDisable[3] = a4;
- toDisable[4] = a5;
}
bool CDHCPNotifier::changeNotify(const neutrino_locale_t, void * data)
{
CNetworkConfig::getInstance()->inet_static = ((*(int*)(data)) == CNetworkSetup::NETWORK_DHCP_OFF);
- for(int x=0;x<5;x++)
+ for (int x = 0; x < 4; x++)
toDisable[x]->setActive(CNetworkConfig::getInstance()->inet_static);
return false;
}
diff --git a/tuxbox/neutrino/src/gui/network_setup.h b/tuxbox/neutrino/src/gui/network_setup.h
index 2723eb7..9137518 100644
--- a/tuxbox/neutrino/src/gui/network_setup.h
+++ b/tuxbox/neutrino/src/gui/network_setup.h
@@ -57,7 +57,6 @@ class CNetworkSetup : public CMenuTarget, CChangeObserver
int old_network_automatic_start;
std::string old_network_address;
std::string old_network_netmask;
- std::string old_network_broadcast;
std::string old_network_nameserver;
std::string old_network_gateway;
@@ -106,9 +105,9 @@ class CNetworkSetup : public CMenuTarget, CChangeObserver
class CDHCPNotifier : public CChangeObserver
{
private:
- CMenuForwarder* toDisable[5];
+ CMenuForwarder* toDisable[4];
public:
- CDHCPNotifier( CMenuForwarder*, CMenuForwarder*, CMenuForwarder*, CMenuForwarder*, CMenuForwarder*);
+ CDHCPNotifier(CMenuForwarder*, CMenuForwarder*, CMenuForwarder*, CMenuForwarder*);
bool changeNotify(const neutrino_locale_t, void * data);
};
commit eecdd87aba22cd00e50ab82cf969b5fd4d985533
Author: Jacek Jendrzej <cra...@go...>
Date: Wed May 13 21:10:05 2015 +0200
add new line and line feed to xml
and port some code for "saveStringToXMLfile"
Signed-off-by: GetAway <get...@t-...>
diff --git a/dvb/zapit/lib/zapittools.cpp b/dvb/zapit/lib/zapittools.cpp
index 1c1ce51..6d17be5 100644
--- a/dvb/zapit/lib/zapittools.cpp
+++ b/dvb/zapit/lib/zapittools.cpp
@@ -94,6 +94,13 @@ namespace ZapitTools {
case '\'':
r += "'";
break;
+ case 0x0a:
+ r +="
";
+ break;
+ case 0x0d:
+ r +="
";
+ break;
+
default:
r += *s;
}
diff --git a/tuxbox/neutrino/daemons/sectionsd/SIutils.cpp b/tuxbox/neutrino/daemons/sectionsd/SIutils.cpp
index a47ec0d..332bf4b 100644
--- a/tuxbox/neutrino/daemons/sectionsd/SIutils.cpp
+++ b/tuxbox/neutrino/daemons/sectionsd/SIutils.cpp
@@ -162,7 +162,7 @@ time_t changeUTCtoCtime(const unsigned char *buffer, int local_time)
}
// Thanks to tmbinc
-int saveStringToXMLfile(FILE *out, const char *c, int withControlCodes)
+int saveStringToXMLfile(FILE *out, const char *c /*, int withControlCodes*/)
{
if(!c)
return 1;
@@ -178,15 +178,28 @@ int saveStringToXMLfile(FILE *out, const char *c, int withControlCodes)
*/
for(;*c; c++) {
switch ((unsigned char)*c) {
- case '&':
- fprintf(out, "&");
- break;
- case '<':
- fprintf(out, "<");
- break;
- case '\"':
- fprintf(out, """);
- break;
+ case '<':
+ fprintf(out, "<");
+ break;
+ case '>':
+ fprintf(out, ">");
+ break;
+ case '&':
+ fprintf(out, "&");
+ break;
+ case '\"':
+ fprintf(out, """);
+ break;
+ case '\'':
+ fprintf(out, "'");
+ break;
+ case 0x0a:
+ fprintf(out,"
");
+ break;
+ case 0x0d:
+ fprintf(out,"
");
+ break;
+#if 0
case 0x81:
case 0x82:
break;
@@ -209,6 +222,12 @@ int saveStringToXMLfile(FILE *out, const char *c, int withControlCodes)
fprintf(out, "%c", *c);
else
fprintf(out, "&#%d;", *c);
+#else
+ default:
+ if ((unsigned char)*c<32)
+ break;
+ fprintf(out, "%c", *c);
+#endif
} // case
} // for
diff --git a/tuxbox/neutrino/daemons/sectionsd/SIutils.hpp b/tuxbox/neutrino/daemons/sectionsd/SIutils.hpp
index 4dc269e..f1976b0 100644
--- a/tuxbox/neutrino/daemons/sectionsd/SIutils.hpp
+++ b/tuxbox/neutrino/daemons/sectionsd/SIutils.hpp
@@ -29,7 +29,7 @@ time_t changeUTCtoCtime(const unsigned char *buffer, int local_time=1);
// returns the descriptor type as readable text
const char *decode_descr (unsigned char tag_value);
-int saveStringToXMLfile(FILE *out, const char *string, int withControlCodes=0);
+int saveStringToXMLfile(FILE *out, const char *string /*, int withControlCodes=0*/);
// Entfernt die ControlCodes aus dem String (-> String wird evtl. kuerzer)
void removeControlCodes(char *string);
diff --git a/tuxbox/neutrino/src/gui/movieinfo.cpp b/tuxbox/neutrino/src/gui/movieinfo.cpp
index c7c20b7..e7410ed 100644
--- a/tuxbox/neutrino/src/gui/movieinfo.cpp
+++ b/tuxbox/neutrino/src/gui/movieinfo.cpp
@@ -725,6 +725,8 @@ std::string decodeXmlSpecialChars(std::string s)
StrSearchReplace(s,"&","&");
StrSearchReplace(s,""","\"");
StrSearchReplace(s,"'","\'");
+ StrSearchReplace(s,"
","\n");
+ StrSearchReplace(s,"
","\n");
return s;
}
-----------------------------------------------------------------------
Summary of changes:
dvb/zapit/lib/zapittools.cpp | 7 +++
tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt | 1 -
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 +-
tuxbox/neutrino/daemons/sectionsd/SIutils.cpp | 39 ++++++++++++++-----
tuxbox/neutrino/daemons/sectionsd/SIutils.hpp | 2 +-
tuxbox/neutrino/src/gui/movieinfo.cpp | 2 +
tuxbox/neutrino/src/gui/network_setup.cpp | 46 ++++++++--------------
tuxbox/neutrino/src/gui/network_setup.h | 5 +-
8 files changed, 59 insertions(+), 47 deletions(-)
--
Tuxbox-GIT: apps
|
