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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: cca2c6ba74
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
This commit is contained in:
vanhofen
2017-03-03 15:51:27 +01:00
parent 4f035ece4b 393fd9d9bb
commit e6dc131f1b
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/imageinfo.cpp
View File

@@ -49,7 +49,6 @@
#include <nhttpd/yconfig.h> #include <nhttpd/yconfig.h>
#define VERSION_FILE TARGET_PREFIX "/.version" #define VERSION_FILE TARGET_PREFIX "/.version"
#define Y_VERSION_FILE DATADIR "/neutrino/httpd/Y_Version.txt"
using namespace std; using namespace std;
@@ -310,7 +309,7 @@ void CImageInfo::InitInfoData()
s_api += ", "; s_api += ", ";
#endif #endif
s_api += "yWeb "; s_api += "yWeb ";
s_api += getYApi(); s_api += getYWebVersion();
s_api += ", "; s_api += ", ";
s_api += HTTPD_NAME; s_api += HTTPD_NAME;
s_api += + " "; 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;
} }

2
src/gui/imageinfo.h
View File

@@ -63,7 +63,7 @@ class CImageInfo : public CMenuTarget
std::string getLicenseText(); std::string getLicenseText();
void ShowWindow(); void ShowWindow();
void ScrollLic(bool scrollDown); void ScrollLic(bool scrollDown);
std::string getYApi(); std::string getYWebVersion();
CComponentsWindowMax *cc_win; CComponentsWindowMax *cc_win;
CComponentsForm *cc_info; CComponentsForm *cc_info;

6
src/gui/scan.cpp
View File

@@ -451,9 +451,13 @@ int CScanTs::handleMsg(neutrino_msg_t msg, neutrino_msg_data_t data)
break; break;
case CRCInput::RC_plus: case CRCInput::RC_plus:
case CRCInput::RC_minus: case CRCInput::RC_minus:
CVolume::getInstance()->setVolume(msg);
break;
case CRCInput::RC_left: case CRCInput::RC_left:
case CRCInput::RC_right: case CRCInput::RC_right:
CVolume::getInstance()->setVolume(msg); if (g_settings.mode_left_right_key_tv == SNeutrinoSettings::VOLUME) {
CVolume::getInstance()->setVolume(msg);
}
break; break;
default: default:
break; break;