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

user_menu: get resolution value for livestreams

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a9bee721d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)

Origin message was:
------------------
- user_menu: get resolution value for livestreams

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-03-03 09:03:59 +01:00
committed by Michael Liebmann
parent fe7c215286
commit 5e8cccbe23
3 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/gui/user_menue.cpp
View File

@@ -79,10 +79,12 @@
#include <system/helpers.h>
#include <zapit/zapit.h>
#include <video.h>
#include <daemonc/remotecontrol.h>
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
extern CPlugins * g_PluginList; /* neutrino.cpp */
extern cVideo * videoDecoder;
#if !HAVE_SPARK_HARDWARE
extern CCAMMenuHandler * g_CamHandler;
#endif
@@ -525,15 +527,28 @@ const char *CUserMenu::getUserMenuButtonName(int button, bool &active, bool retu
case SNeutrinoSettings::ITEM_NONE:
case SNeutrinoSettings::ITEM_BAR:
case SNeutrinoSettings::ITEM_LIVESTREAM_RESOLUTION:
if(loc == NONEXISTANT_LOCALE && !text) {
/* TODO
get const char *valname from struct
keyval_ext LIVESTREAM_RESOLUTION_OPTIONS
*/
text = to_string(g_settings.livestreamResolution).c_str();
} else
return_title = true;
active = true;
if (mode == NeutrinoMessages::mode_webtv && !CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty()) {
if(loc == NONEXISTANT_LOCALE && !text) {
CWebTVResolution webtvres;
text = webtvres.getResolutionValue();
if (!(videoDecoder->getBlank()))
{
int xres = 0, yres = 0, framerate;
videoDecoder->getPictureInfo(xres, yres, framerate);
if (xres && yres)
{
std::string res = to_string(xres) + "x" + to_string(yres);
if (res.compare(text))
{
std::string tmp = (string)text + " (" + res + ")";
text = tmp.c_str();
}
}
}
} else
return_title = true;
active = true;
}
continue;
case SNeutrinoSettings::ITEM_EPG_MISC:
return_title = true;

10
src/gui/webtv_setup.cpp
View File

@@ -210,4 +210,12 @@ int CWebTVResolution::Show()
return res;
}
// vim:ts=4
const char *CWebTVResolution::getResolutionValue()
{
for (unsigned int i = 0; i < LIVESTREAM_RESOLUTION_OPTION_COUNT; ++i)
{
if (g_settings.livestreamResolution == LIVESTREAM_RESOLUTION_OPTIONS[i].key)
return LIVESTREAM_RESOLUTION_OPTIONS[i].valname;
}
return "";
}

1
src/gui/webtv_setup.h
View File

@@ -48,6 +48,7 @@ class CWebTVResolution : public CMenuTarget
CMenuWidget *m;
public:
CWebTVResolution();
const char *getResolutionValue();
int exec(CMenuTarget* parent, const std::string & actionKey);
int Show();
};