mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- webtv-setup: add possibility to enter webtv-file manually

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>

 Conflicts:
	src/gui/webtv_setup.cpp
This commit is contained in:
svenhoefer
2018-09-21 00:05:28 +02:00
committed by Thilo Graf
parent a22ae5dbe5
commit f4a07b3f7d
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gui/webtv_setup.cpp
View File

@@ -31,6 +31,7 @@
#include <driver/framebuffer.h> #include <driver/framebuffer.h>
#include <gui/movieplayer.h> #include <gui/movieplayer.h>
#include <gui/widget/hintbox.h> #include <gui/widget/hintbox.h>
#include <gui/widget/keyboard_input.h>
#include <zapit/zapit.h> #include <zapit/zapit.h>
#include <neutrino_menue.h> #include <neutrino_menue.h>
#include "webtv_setup.h" #include "webtv_setup.h"
@@ -60,10 +61,12 @@ const CMenuOptionChooser::keyval_ext LIVESTREAM_RESOLUTION_OPTIONS[] =
}; };
#define LIVESTREAM_RESOLUTION_OPTION_COUNT (sizeof(LIVESTREAM_RESOLUTION_OPTIONS)/sizeof(CMenuOptionChooser::keyval_ext)) #define LIVESTREAM_RESOLUTION_OPTION_COUNT (sizeof(LIVESTREAM_RESOLUTION_OPTIONS)/sizeof(CMenuOptionChooser::keyval_ext))
#define CWebTVSetupFooterButtonCount 3 #define CWebTVSetupFooterButtonCount 4
static const struct button_label CWebTVSetupFooterButtons[CWebTVSetupFooterButtonCount] = { static const struct button_label CWebTVSetupFooterButtons[CWebTVSetupFooterButtonCount] =
{
{ NEUTRINO_ICON_BUTTON_RED, LOCALE_WEBTV_XML_DEL }, { NEUTRINO_ICON_BUTTON_RED, LOCALE_WEBTV_XML_DEL },
{ NEUTRINO_ICON_BUTTON_GREEN, LOCALE_WEBTV_XML_ADD }, { NEUTRINO_ICON_BUTTON_GREEN, LOCALE_WEBTV_XML_ADD },
{ NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_WEBTV_XML_ENTER },
{ NEUTRINO_ICON_BUTTON_BLUE, LOCALE_WEBTV_XML_RELOAD } { NEUTRINO_ICON_BUTTON_BLUE, LOCALE_WEBTV_XML_RELOAD }
}; };
@@ -75,7 +78,7 @@ int CWebTVSetup::exec(CMenuTarget* parent, const std::string & actionKey)
selected = m->getSelected(); selected = m->getSelected();
if (selected >= item_offset) { if (selected >= item_offset) {
m->removeItem(selected); m->removeItem(selected);
m->hide(); m->hide();
selected = m->getSelected(); selected = m->getSelected();
changed = true; changed = true;
} }
@@ -115,7 +118,21 @@ int CWebTVSetup::exec(CMenuTarget* parent, const std::string & actionKey)
} }
return res; return res;
} }
if (actionKey == "e" /* enter */) {
std::string tpl = "http://xxx.xxx.xxx.xxx/control/xmltv.m3u";
std::string entry = tpl;
CKeyboardInput *e = new CKeyboardInput(LOCALE_WEBTV_XML_ENTER, &entry, 50);
e->exec(this, "");
delete e;
if (entry.compare(tpl) != 0)
{
m->addItem(new CMenuForwarder(entry, true, NULL, this, "c"));
changed = true;
}
return res;
}
if(actionKey == "r" /* reload */) { if(actionKey == "r" /* reload */) {
changed = true; changed = true;
return menu_return::RETURN_EXIT_ALL; return menu_return::RETURN_EXIT_ALL;
@@ -141,6 +158,7 @@ int CWebTVSetup::Show()
m = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_STREAMING, width, MN_WIDGET_ID_WEBTVSETUP); m = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_STREAMING, width, MN_WIDGET_ID_WEBTVSETUP);
m->addKey(CRCInput::RC_red, this, "d"); m->addKey(CRCInput::RC_red, this, "d");
m->addKey(CRCInput::RC_green, this, "a"); m->addKey(CRCInput::RC_green, this, "a");
m->addKey(CRCInput::RC_yellow, this, "e");
m->addKey(CRCInput::RC_blue, this, "r"); m->addKey(CRCInput::RC_blue, this, "r");
m->addIntroItems(LOCALE_WEBTV_HEAD, LOCALE_LIVESTREAM_HEAD); m->addIntroItems(LOCALE_WEBTV_HEAD, LOCALE_LIVESTREAM_HEAD);