From 63ad67a945ae150bf6aa2423ab3f882731442add Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Fri, 3 Mar 2017 14:38:01 +0100 Subject: [PATCH 1/5] CScanTs::handleMsg: Fix handling left/right keys during channel search Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/c9242679a0a567479c3578fc84858ca44d6e0ef0 Author: Michael Liebmann Date: 2017-03-03 (Fri, 03 Mar 2017) --- src/gui/scan.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp index d26ea9229..26a00d41c 100644 --- a/src/gui/scan.cpp +++ b/src/gui/scan.cpp @@ -451,9 +451,13 @@ int CScanTs::handleMsg(neutrino_msg_t msg, neutrino_msg_data_t data) break; case CRCInput::RC_plus: case CRCInput::RC_minus: + CVolume::getInstance()->setVolume(msg); + break; case CRCInput::RC_left: case CRCInput::RC_right: - CVolume::getInstance()->setVolume(msg); + if (g_settings.mode_left_right_key_tv == SNeutrinoSettings::VOLUME) { + CVolume::getInstance()->setVolume(msg); + } break; default: break; From 5a751edef7401f2d6035922e499eaecb1613397e Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 3 Mar 2017 15:39:42 +0100 Subject: [PATCH 2/5] imageinfo_ni: add Lua-API version Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/49783579a3c7984fc8b775aa78c5700b998db6d8 Author: vanhofen Date: 2017-03-03 (Fri, 03 Mar 2017) Origin message was: ------------------ - imageinfo_ni: add Lua-API version --- src/gui/imageinfo_ni.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/gui/imageinfo_ni.cpp b/src/gui/imageinfo_ni.cpp index 3de35b294..d10f36a3d 100644 --- a/src/gui/imageinfo_ni.cpp +++ b/src/gui/imageinfo_ni.cpp @@ -49,6 +49,10 @@ #include #include #include +#ifdef ENABLE_LUA +#include +#endif +#include #include #include @@ -311,8 +315,13 @@ void CImageInfoNI::paint() paintLine(xpos, font_info, "Kernel:"); paintLine(xpos+offset, font_info, uname(&uts_info) < 0 ? "n/a" : uts_info.release); +#ifdef ENABLE_LUA ypos += iheight; + paintLine(xpos, font_info, "Lua-API:"); + paintLine(xpos+offset, font_info, to_string(LUA_API_VERSION_MAJOR) + "." + to_string(LUA_API_VERSION_MINOR)); +#endif + ypos += iheight; paintLine(xpos, font_info, g_Locale->getText(LOCALE_IMAGEINFO_DATE)); paintLine(xpos+offset, font_info, builddate ); From 44cb896f1f10315f60d8598caf67a305d4c9ea08 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 3 Mar 2017 15:39:42 +0100 Subject: [PATCH 3/5] imageinfo_ni: add yWeb version Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/227f5cbfff4d52ab84481c6167cb79b162172556 Author: vanhofen Date: 2017-03-03 (Fri, 03 Mar 2017) Origin message was: ------------------ - imageinfo_ni: add yWeb version --- src/gui/imageinfo_ni.cpp | 11 +++++++++++ src/gui/imageinfo_ni.h | 2 ++ 2 files changed, 13 insertions(+) diff --git a/src/gui/imageinfo_ni.cpp b/src/gui/imageinfo_ni.cpp index d10f36a3d..ee4d1704c 100644 --- a/src/gui/imageinfo_ni.cpp +++ b/src/gui/imageinfo_ni.cpp @@ -321,6 +321,10 @@ void CImageInfoNI::paint() paintLine(xpos+offset, font_info, to_string(LUA_API_VERSION_MAJOR) + "." + to_string(LUA_API_VERSION_MINOR)); #endif + ypos += iheight; + paintLine(xpos, font_info, "yWeb:"); + paintLine(xpos+offset, font_info, getYWebVersion()); + ypos += iheight; paintLine(xpos, font_info, g_Locale->getText(LOCALE_IMAGEINFO_DATE)); paintLine(xpos+offset, font_info, builddate ); @@ -894,3 +898,10 @@ void CImageInfoNI::paint_NET_Info(int posx, int posy) read_old = read_akt; write_old = write_akt; } + +string CImageInfoNI::getYWebVersion() +{ + CConfigFile yV('=', false); + yV.loadConfig(PRIVATE_HTTPDDIR "/Y_Version.txt"); + return yV.getString("version", "n/a"); +} diff --git a/src/gui/imageinfo_ni.h b/src/gui/imageinfo_ni.h index 209a43a34..c889445d8 100644 --- a/src/gui/imageinfo_ni.h +++ b/src/gui/imageinfo_ni.h @@ -140,6 +140,8 @@ class CImageInfoNI : public CMenuTarget void get_NET_Info(uint64_t *read_akt, long *read_packet, long *dummy, uint64_t *write_akt, long *write_packet); void paint_NET_Info(int posx, int posy); + std::string getYWebVersion(); + public: CImageInfoNI(); From 3710a10921c9a4d9df5bb26a1270b97e30cd6f87 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 3 Mar 2017 15:48:31 +0100 Subject: [PATCH 4/5] imageinfo: change handling of yWeb version; use own CConfigFile Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/629f91e22901a0962008aea6e1fa9a68a1cadd23 Author: vanhofen Date: 2017-03-03 (Fri, 03 Mar 2017) Origin message was: ------------------ - imageinfo: change handling of yWeb version; use own CConfigFile --- src/gui/imageinfo.cpp | 13 +++++-------- src/gui/imageinfo.h | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp index 15dd92544..aaa942d65 100644 --- a/src/gui/imageinfo.cpp +++ b/src/gui/imageinfo.cpp @@ -310,7 +310,7 @@ void CImageInfo::InitInfoData() s_api += ", "; #endif s_api += "yWeb "; - s_api += getYApi(); + s_api += getYWebVersion(); s_api += ", "; s_api += HTTPD_NAME; s_api += + " "; @@ -462,12 +462,9 @@ void CImageInfo::hide() } } -string CImageInfo::getYApi() +string CImageInfo::getYWebVersion() { - string ret; - config.loadConfig(Y_VERSION_FILE); - ret = config.getString("version", "n/a"); - config.loadConfig(VERSION_FILE); - return ret; + CConfigFile yV('=', false); + yV.loadConfig(PRIVATE_HTTPDDIR "/Y_Version.txt"); + return yV.getString("version", "n/a"); } - diff --git a/src/gui/imageinfo.h b/src/gui/imageinfo.h index 9d6e399f8..0449b7591 100644 --- a/src/gui/imageinfo.h +++ b/src/gui/imageinfo.h @@ -63,7 +63,7 @@ class CImageInfo : public CMenuTarget std::string getLicenseText(); void ShowWindow(); void ScrollLic(bool scrollDown); - std::string getYApi(); + std::string getYWebVersion(); CComponentsWindowMax *cc_win; CComponentsForm *cc_info; From 4819c8ac41234fd5d8fb2179c8a08bafe4839fa8 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 3 Mar 2017 15:50:47 +0100 Subject: [PATCH 5/5] imageinfo: remove obsolete define Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/b283128d0ff639fd05ab8ec8834e466f266a4639 Author: vanhofen Date: 2017-03-03 (Fri, 03 Mar 2017) Origin message was: ------------------ - imageinfo: remove obsolete define --- src/gui/imageinfo.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp index aaa942d65..8dd342ed8 100644 --- a/src/gui/imageinfo.cpp +++ b/src/gui/imageinfo.cpp @@ -49,7 +49,6 @@ #include #define VERSION_FILE TARGET_PREFIX "/.version" -#define Y_VERSION_FILE DATADIR "/neutrino/httpd/Y_Version.txt" using namespace std;