Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: 86bedc2a3f
Author: vanhofen <vanhofen@gmx.de>
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/imageinfo.cpp

@@ -49,7 +49,6 @@
 #include <nhttpd/yconfig.h>
 
 #define VERSION_FILE TARGET_PREFIX "/.version"
-#define Y_VERSION_FILE DATADIR "/neutrino/httpd/Y_Version.txt"
 
 using namespace std;
 
@@ -310,7 +309,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 +461,9 @@ void CImageInfo::hide()
 	}
 }
 
-string CImageInfo::getYApi()
+string CImageInfo::getYWebVersion()
 {
-	string ret;
+	CConfigFile yV('=', false);
-	config.loadConfig(Y_VERSION_FILE);
+	yV.loadConfig(PRIVATE_HTTPDDIR "/Y_Version.txt");
-	ret = config.getString("version", "n/a");
+	return yV.getString("version", "n/a");
-	config.loadConfig(VERSION_FILE);
-	return ret;
 }
-

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;

src/gui/imageinfo_ni.cpp

@@ -49,6 +49,10 @@
 #include <sstream>
 #include <gui/color_custom.h>
 #include <gui/components/cc.h>
+#ifdef ENABLE_LUA
+#include <gui/lua/lua_api_version.h>
+#endif
+#include <system/helpers.h>
 #include <system/debug.h>
 #include <cs_api.h>
 
@@ -314,8 +318,17 @@ 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, "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 );
 	
@@ -898,3 +911,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");
+}

src/gui/imageinfo_ni.h

@@ -142,6 +142,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();

src/gui/scan.cpp

@@ -466,9 +466,13 @@ neutrino_msg_t 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;