From 48c57758ca7a7b2eb522246b83213d354cf82ae3 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Fri, 3 Mar 2017 14:38:01 +0100 Subject: [PATCH 1/3] CScanTs::handleMsg: Fix handling left/right keys during channel search Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c9242679a0a567479c3578fc84858ca44d6e0ef0 Author: Michael Liebmann Date: 2017-03-03 (Fri, 03 Mar 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- 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 a8416659c94820e55ef9a8629e291c7091a4ddc5 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 3 Mar 2017 15:48:31 +0100 Subject: [PATCH 2/3] imageinfo: change handling of yWeb version; use own CConfigFile Origin commit data ------------------ Branch: ni/coolstream 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 ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- 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 393fd9d9bbe20a4ae312999e876b544065b00e06 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 3 Mar 2017 15:50:47 +0100 Subject: [PATCH 3/3] imageinfo: remove obsolete define Origin commit data ------------------ Branch: ni/coolstream 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 ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- 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;