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

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

Browse Source 
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-12 22:32:07 +02:00
parent 88d02d6b60 f8e1da4418
commit e6d2ba00b3
41 changed files with 802 additions and 734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/neutrino.cpp
View File

@@ -4646,6 +4646,49 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
hintBox->hide();
delete hintBox;
}
else if (actionKey == "camd_reset")
{
CHintBox hintbox(LOCALE_CAMD_CONTROL, LOCALE_CAMD_MSG_RESET);
hintbox.paint();
printf("[neutrino.cpp] executing \"service emu restart\"\n");
if (my_system(3, "service", "emu", "restart") != 0)
printf("[neutrino.cpp] executing failed\n");
sleep(1);
hintbox.hide();
return menu_return::RETURN_EXIT_ALL;
}
else if (actionKey == "ecmInfo")
{
char *buffer = NULL;
ssize_t read;
size_t len;
FILE *fh;
CFileHelpers fhlp;
if (fhlp.copyFile("/tmp/ecm.info", "/tmp/ecm.info.tmp", 0644))
{
if ((fh = fopen("/tmp/ecm.info.tmp", "r")))
{
std::string str = "";
while ((read = getline(&buffer, &len, fh)) != -1)
{
str += buffer;
}
fclose(fh);
remove("/tmp/ecm.info.tmp");
if(buffer)
free(buffer);
ShowHint(LOCALE_ECMINFO, str.c_str(), 450, 20);
}
}
else
ShowHint(LOCALE_ECMINFO, LOCALE_ECMINFO_NULL, 450, 20);
return menu_return::RETURN_EXIT_ALL;
}
else if(actionKey=="nkplayback" || actionKey=="ytplayback" || actionKey=="tsmoviebrowser" || actionKey=="fileplayback") {
frameBuffer->Clear();
if(mode == NeutrinoMessages::mode_radio )