diff --git a/data/y-web/Y_Baselib.js b/data/y-web/Y_Baselib.js
index 7bd0552e6..e47890961 100644
--- a/data/y-web/Y_Baselib.js
+++ b/data/y-web/Y_Baselib.js
@@ -412,11 +412,16 @@ function dbox_popup(_msg)
{
return loadSyncURL("/control/message?popup="+_msg);
}
-function dbox_set_timer(_channel_id, _start, _stop)
+function dbox_set_timer_rec(_channel_id, _start, _stop)
{
var _url = "/control/timer?action=new&type=5&alarm="+_start+"&stop="+_stop+"&announce="+_start+"&channel_id="+_channel_id+"&rs=1";
return loadSyncURL(_url);
}
+function dbox_set_timer_zap(_channel_id, _start)
+{
+ var _url = "/control/timer?action=new&type=3&alarm="+_start+"&channel_id="+_channel_id;
+ return loadSyncURL(_url);
+}
function dbox_zapto(_channel_id)
{
var _url = "/control/zapto?"+_channel_id;
diff --git a/data/y-web/Y_EPG.js b/data/y-web/Y_EPG.js
index f3d3ebd96..bfaec3e13 100644
--- a/data/y-web/Y_EPG.js
+++ b/data/y-web/Y_EPG.js
@@ -30,12 +30,11 @@ function epg_plus_calc_dimensions(){
function epg_zapto(){
dbox_zapto($('d_channel_id').innerHTML);
}
-function epg_set_timer(){
- dbox_set_timer($("d_channel_id").innerHTML, $("d_start").innerHTML, $("d_stop").innerHTML);
+function epg_set_timer_rec(){
+ dbox_set_timer_rec($("d_channel_id").innerHTML, $("d_start").innerHTML, $("d_stop").innerHTML);
}
-function set_zapit(){
- var rec = "/control/timer?action=new&type=3&alarm="+$("d_start").innerHTML+"&channel_id="+$("d_channel_id").innerHTML;
- var res = loadSyncURL(rec);
+function epg_set_timer_zap(){
+ dbox_set_timer_zap($("d_channel_id").innerHTML, $("d_start").innerHTML);
}
function build_epg_clear(){
var ep = $("epg_plus");
diff --git a/data/y-web/Y_EPG_Plus.yhtm b/data/y-web/Y_EPG_Plus.yhtm
index fe0a7f624..db651d5bb 100644
--- a/data/y-web/Y_EPG_Plus.yhtm
+++ b/data/y-web/Y_EPG_Plus.yhtm
@@ -60,8 +60,8 @@ function epg_imdb(){
-
-
+
+
|
diff --git a/data/y-web/Y_Live_EPG.yhtm b/data/y-web/Y_Live_EPG.yhtm
index 9c6477079..01a2ff957 100644
--- a/data/y-web/Y_Live_EPG.yhtm
+++ b/data/y-web/Y_Live_EPG.yhtm
@@ -21,29 +21,27 @@ function sLog_clear()
}
sLog_line_number = 0;
}
-function sLog_addRow(_body, _date, _rec, _zapit, _start, _end, _title)
+function sLog_addRow(_body, _date, _rec, _zap, _start, _end, _title)
{
sLog_line_number++;
var mycurrent_row = y_add_row_to_table(_body, ((sLog_line_number % 2) ==0)?"a":"b" );
y_add_html_cell_to_row(mycurrent_row, "rec", _rec);
- y_add_html_cell_to_row(mycurrent_row, "zap", _zapit);
+ y_add_html_cell_to_row(mycurrent_row, "zap", _zap);
y_add_html_cell_to_row(mycurrent_row, "date", _date);
y_add_html_cell_to_row(mycurrent_row, "starttime", _start);
y_add_html_cell_to_row(mycurrent_row, "endtime", _end);
y_add_html_cell_to_row(mycurrent_row, "epgtitle", _title);
}
-function set_timer(_channel_id, _start, _stop)
+function set_timer_rec(_channel_id, _start, _stop)
{
- var rec = "/control/timer?action=new&type=5&alarm="+_start+"&stop="+_stop+"&announce="+_start+"&channel_id="+_channel_id+"&rs=1";
- var res = loadSyncURL(rec);
- alert("{=L:epg.set_timer=}");
+ var res = dbox_set_timer_rec(_channel_id, _start, _stop);
+ alert("{=L:epg.set_timer_rec=}");
}
-function set_zapit(_channel_id, _start)
+function set_timer_zap(_channel_id, _start)
{
- var rec = "/control/timer?action=new&type=3&alarm="+_start+"&channel_id="+_channel_id;
- var res = loadSyncURL(rec);
- alert("{=L:epg.zap_to=}");
+ var res = dbox_set_timer_zap(_channel_id, _start);
+ alert("{=L:epg.set_timer_zap=}");
}
function show_info(_index)
{
@@ -103,10 +101,10 @@ function _show_epg()
var epg_obj= new Array(_desc, _info1, _info2, _start, _start_t, _stop.toString(), "{=channel=}");
epg_data.push(epg_obj);
- var _rec = "![](\"images/record.png\"/)
";
- var _zapit = "![](\"images/zap.png\"/)
";
- var _tit = ""+_desc+"";
- sLog_addRow(sLog_body, _date, _rec, _zapit, _start_t, _stop_t, _tit);
+ var _rec = "";
+ var _zap = "";
+ var _title = ""+_desc+"";
+ sLog_addRow(sLog_body, _date, _rec, _zap, _start_t, _stop_t, _title);
epg_data_index++;
}
}
diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt
index cdf6bc930..df5cf3f7c 100644
--- a/data/y-web/Y_Version.txt
+++ b/data/y-web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.9.0.39
-date=26.08.2016
+version=2.9.0.40
+date=01.03.2017
type=Release
info=Port Tuxbox-Neutrino
diff --git a/data/y-web/languages/Deutsch b/data/y-web/languages/Deutsch
index e5c2709c0..5ae9f2abc 100644
--- a/data/y-web/languages/Deutsch
+++ b/data/y-web/languages/Deutsch
@@ -203,8 +203,8 @@ epg.hover_for_details=Für Details: Maus über die entsprechende Sendung
epg.refresh=EPG Daten aktualisieren
epg.past_hours=Stunden zurück
epg.next_hours=Stunden vor
-epg.set_timer=Timer für Aufnahme gesetzt
-epg.zap_to=Umschalt-Timer gesetzt
+epg.set_timer_rec=Aufnahme-Timer gesetzt
+epg.set_timer_zap=Umschalt-Timer gesetzt
========EPG Streaminfo
epg.si.streaminfo=Streaminfo
diff --git a/data/y-web/languages/English b/data/y-web/languages/English
index 216ee8e54..229aca6e6 100644
--- a/data/y-web/languages/English
+++ b/data/y-web/languages/English
@@ -206,8 +206,8 @@ epg.hover_for_details=move to program for more details
epg.refresh=get or refresh EPG
epg.past_hours=past hours
epg.next_hours=next hours
-epg.set_timer=Set timer for recording. Done.
-epg.zap_to=Set switch to channel. Done.
+epg.set_timer_rec=Set timer for recording. Done.
+epg.set_timer_zap=Set switch to channel. Done.
========EPG Streaminfo
epg.si.streaminfo=Streaminfo
diff --git a/data/y-web/languages/Polski b/data/y-web/languages/Polski
index 034d3f54a..7588b3cfc 100644
--- a/data/y-web/languages/Polski
+++ b/data/y-web/languages/Polski
@@ -187,8 +187,8 @@ epg.hover_for_details=Przełącz, aby uzyskać więcej informacji
epg.refresh=Aktualizacja EPG
epg.past_hours=Poprzednie
epg.next_hours=Następne
-epg.set_timer=Ustawianie timera
-epg.zap_to=Przełączanie kanału
+epg.set_timer_rec=Ustawianie timera
+epg.set_timer_zap=Przełączanie kanału
# ========= EPG Stream Informacje
epg.si.streaminfo=Informacje Stream
diff --git a/data/y-web/languages/Portuguese b/data/y-web/languages/Portuguese
index 1dffab32c..37d51e692 100644
--- a/data/y-web/languages/Portuguese
+++ b/data/y-web/languages/Portuguese
@@ -191,8 +191,8 @@ epg.hover_for_details=mover para programa para ver detalhes
epg.refresh=buscar ou actualizar a EPG
epg.past_hours=últimas horas
epg.next_hours=próximas horas
-epg.set_timer=Ajustar o programador para gravação. Realizado.
-epg.zap_to=Coloque o canal para mudar. Realizado.
+epg.set_timer_rec=Ajustar o programador para gravação. Realizado.
+epg.set_timer_zap=Coloque o canal para mudar. Realizado.
========EPG Streaminfo
diff --git a/data/y-web/languages/Slovak b/data/y-web/languages/Slovak
index 440ce4ea7..c6ea61153 100644
--- a/data/y-web/languages/Slovak
+++ b/data/y-web/languages/Slovak
@@ -185,8 +185,8 @@ epg.hover_for_details=Presun ukazovateľa na stanicu pre získanie podrobností
epg.refresh=obnovovanie EPG
epg.past_hours=predchádzajúce hodiny
epg.next_hours=nasledujúce hodiny
-epg.set_timer=Nastavenie časovaca. Vykonané.
-epg.zap_to=Prepnutie na kanál. Vykonané.
+epg.set_timer_rec=Nastavenie časovaca. Vykonané.
+epg.set_timer_zap=Prepnutie na kanál. Vykonané.
======= EPG Streaminfo
epg.si.streaminfo=Informácie streamu
diff --git a/src/gui/lua/lua_cc_window.cpp b/src/gui/lua/lua_cc_window.cpp
index 7dc5e77bd..494487614 100644
--- a/src/gui/lua/lua_cc_window.cpp
+++ b/src/gui/lua/lua_cc_window.cpp
@@ -127,6 +127,10 @@ int CLuaInstCCWindow::CCWindowNew(lua_State *L)
CLuaCCWindow **udata = (CLuaCCWindow **) lua_newuserdata(L, sizeof(CLuaCCWindow *));
*udata = new CLuaCCWindow();
(*udata)->w = new CComponentsWindow(x, y, dx, dy, name.c_str(), icon.c_str(), 0, has_shadow, (fb_pixel_t)color_frame, (fb_pixel_t)color_body, (fb_pixel_t)color_shadow);
+ /* Ignore percent conversion of width and height
+ to remain compatible with the Lua API */
+ (*udata)->w->setWidth(dx);
+ (*udata)->w->setHeight(dy);
if (!show_header)
(*udata)->w->showHeader(false);
diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp
index 071236a60..a2f3bba9b 100644
--- a/src/gui/miscsettings_menu.cpp
+++ b/src/gui/miscsettings_menu.cpp
@@ -59,7 +59,7 @@
#include
-extern CPlugins * g_PluginList;
+extern CPlugins * g_Plugins;
extern cVideo *videoDecoder;
CMiscMenue::CMiscMenue()
@@ -98,7 +98,7 @@ int CMiscMenue::exec(CMenuTarget* parent, const std::string &actionKey)
{
const char *action_str = "plugin";
if(chooserDir(g_settings.plugin_hdd_dir, false, action_str))
- g_PluginList->loadPlugins();
+ g_Plugins->loadPlugins();
return menu_return::RETURN_REPAINT;
}
@@ -110,13 +110,13 @@ int CMiscMenue::exec(CMenuTarget* parent, const std::string &actionKey)
MoviePluginSelector.addItem(GenericMenuSeparatorLine);
char id[5];
int enabled_count = 0;
- for(unsigned int count=0;count < (unsigned int) g_PluginList->getNumberOfPlugins();count++)
+ for(unsigned int count=0;count < (unsigned int) g_Plugins->getNumberOfPlugins();count++)
{
- if (!g_PluginList->isHidden(count))
+ if (!g_Plugins->isHidden(count))
{
sprintf(id, "%d", count);
enabled_count++;
- MoviePluginSelector.addItem(new CMenuForwarder(g_PluginList->getName(count), true, NULL, new CMoviePluginChangeExec(), id, CRCInput::convertDigitToKey(count)));
+ MoviePluginSelector.addItem(new CMenuForwarder(g_Plugins->getName(count), true, NULL, new CMoviePluginChangeExec(), id, CRCInput::convertDigitToKey(count)));
}
}
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index ed0ded0a8..f7c479df0 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -1452,7 +1452,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
}
if (msg == (neutrino_msg_t) g_settings.mpkey_plugin) {
- g_PluginList->startPlugin_by_name(g_settings.movieplayer_plugin.c_str ());
+ g_Plugins->startPlugin_by_name(g_settings.movieplayer_plugin.c_str ());
} else if ((msg == (neutrino_msg_t) g_settings.mpkey_stop) || msg == CRCInput::RC_home) { //NI
playstate = CMoviePlayerGui::STOPPED;
keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_STOP;
diff --git a/src/gui/osdlang_setup.cpp b/src/gui/osdlang_setup.cpp
index 36dba32d2..ad96e009b 100644
--- a/src/gui/osdlang_setup.cpp
+++ b/src/gui/osdlang_setup.cpp
@@ -77,7 +77,7 @@ int COsdLangSetup::exec(CMenuTarget* parent, const std::string &actionKey)
if (!actionKey.empty()) {
g_settings.language = actionKey;
- g_PluginList->loadPlugins();
+ g_Plugins->loadPlugins();
g_Locale->loadLocale(g_settings.language.c_str());
return menu_return::RETURN_EXIT;
}
diff --git a/src/gui/personalize.cpp b/src/gui/personalize.cpp
index 1fbb14407..a26179264 100644
--- a/src/gui/personalize.cpp
+++ b/src/gui/personalize.cpp
@@ -392,7 +392,7 @@ int CPersonalizeGui::ShowPersonalizationMenu()
ShowUserMenu();
}
CMenuWidget* plMenu = NULL;
- int pcount = g_PluginList->getNumberOfPlugins();
+ int pcount = g_Plugins->getNumberOfPlugins();
std::string pldesc[pcount];
int pltype[pcount];
if (show_pluginmenu)
@@ -420,31 +420,31 @@ int CPersonalizeGui::ShowPersonalizationMenu()
if (pltype[i] & CPlugins::P_TYPE_DISABLED) {
if (!g_settings.plugins_disabled.empty())
g_settings.plugins_disabled += ",";
- g_settings.plugins_disabled += g_PluginList->getFileName(i);
- g_PluginList->setType(i, CPlugins::P_TYPE_DISABLED);
+ g_settings.plugins_disabled += g_Plugins->getFileName(i);
+ g_Plugins->setType(i, CPlugins::P_TYPE_DISABLED);
} else if (pltype[i] & CPlugins::P_TYPE_GAME) {
if (!g_settings.plugins_game.empty())
g_settings.plugins_game += ",";
- g_settings.plugins_game += g_PluginList->getFileName(i);
- g_PluginList->setType(i, CPlugins::P_TYPE_GAME);
+ g_settings.plugins_game += g_Plugins->getFileName(i);
+ g_Plugins->setType(i, CPlugins::P_TYPE_GAME);
} else if (pltype[i] & CPlugins::P_TYPE_TOOL) {
if (!g_settings.plugins_tool.empty())
g_settings.plugins_tool += ",";
- g_settings.plugins_tool += g_PluginList->getFileName(i);
- g_PluginList->setType(i, CPlugins::P_TYPE_TOOL);
+ g_settings.plugins_tool += g_Plugins->getFileName(i);
+ g_Plugins->setType(i, CPlugins::P_TYPE_TOOL);
} else if (pltype[i] & CPlugins::P_TYPE_SCRIPT) {
if (!g_settings.plugins_script.empty())
g_settings.plugins_script += ",";
- g_settings.plugins_script += g_PluginList->getFileName(i);
- g_PluginList->setType(i, CPlugins::P_TYPE_SCRIPT);
+ g_settings.plugins_script += g_Plugins->getFileName(i);
+ g_Plugins->setType(i, CPlugins::P_TYPE_SCRIPT);
} else if (pltype[i] & CPlugins::P_TYPE_LUA) {
if (!g_settings.plugins_lua.empty())
g_settings.plugins_lua += ",";
- g_settings.plugins_lua += g_PluginList->getFileName(i);
- g_PluginList->setType(i, CPlugins::P_TYPE_LUA);
+ g_settings.plugins_lua += g_Plugins->getFileName(i);
+ g_Plugins->setType(i, CPlugins::P_TYPE_LUA);
}
}
- g_PluginList->loadPlugins();
+ g_Plugins->loadPlugins();
}
if (show_usermenu)
@@ -573,18 +573,18 @@ void CPersonalizeGui::ShowPluginMenu(CMenuWidget* p_widget, std::string da[], in
p_widget->addIntroItems(LOCALE_PERSONALIZE_PLUGINS);
uint d_key = 1;
- int pcount = g_PluginList->getNumberOfPlugins();
+ int pcount = g_Plugins->getNumberOfPlugins();
for (int i = 0; i < pcount; i++)
{
- ia[i] = g_PluginList->getType(i);
- da[i] = g_PluginList->getName(i);
+ ia[i] = g_Plugins->getType(i);
+ da[i] = g_Plugins->getName(i);
if (da[i].empty())
continue;
- std::string pluginDesc = g_PluginList->getDescription(i);
+ std::string pluginDesc = g_Plugins->getDescription(i);
if (!pluginDesc.empty())
da[i] += " (" + pluginDesc + ")";
p_widget->addItem(new CMenuOptionChooser(da[i].c_str(), &ia[i], PERSONALIZE_PLUGINTYPE_OPTIONS, PERSONALIZE_PLUGINTYPE_MAX,
- !g_PluginList->isHidden(i), NULL, getShortcut(d_key++)));
+ !g_Plugins->isHidden(i), NULL, getShortcut(d_key++)));
}
}
diff --git a/src/gui/personalize.h b/src/gui/personalize.h
index 2a92f6f2b..7b63cda0a 100644
--- a/src/gui/personalize.h
+++ b/src/gui/personalize.h
@@ -61,7 +61,7 @@
#include
class CPlugins;
-extern CPlugins * g_PluginList; /* neutrino.cpp */
+extern CPlugins * g_Plugins; /* neutrino.cpp */
//helper class to enable/disable some items in usermenu setup
class CUserMenuNotifier : public CChangeObserver
diff --git a/src/gui/pluginlist.cpp b/src/gui/pluginlist.cpp
index f44432096..33e743300 100644
--- a/src/gui/pluginlist.cpp
+++ b/src/gui/pluginlist.cpp
@@ -61,7 +61,7 @@
#include "plugins.h"
-extern CPlugins * g_PluginList; /* neutrino.cpp */
+extern CPlugins * g_Plugins; /* neutrino.cpp */
CPluginList::CPluginList(const neutrino_locale_t Title, const uint32_t listtype)
{
@@ -74,10 +74,10 @@ CPluginList::CPluginList(const neutrino_locale_t Title, const uint32_t listtype)
int CPluginList::run()
{
- g_PluginList->startPlugin(number);
- if (!g_PluginList->getScriptOutput().empty()) {
+ g_Plugins->startPlugin(number);
+ if (!g_Plugins->getScriptOutput().empty()) {
hide();
- ShowMsg(LOCALE_PLUGINS_RESULT, g_PluginList->getScriptOutput(), CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_SHELL, 320, g_settings.timing[SNeutrinoSettings::TIMING_STATIC_MESSAGES]);
+ ShowMsg(LOCALE_PLUGINS_RESULT, g_Plugins->getScriptOutput(), CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_SHELL, 320, g_settings.timing[SNeutrinoSettings::TIMING_STATIC_MESSAGES]);
}
return menu_return::RETURN_REPAINT;
}
@@ -108,14 +108,14 @@ int CPluginList::exec(CMenuTarget* parent, const std::string &actionKey)
m.setSelected(selected);
m.addIntroItems();
- int nop = g_PluginList->getNumberOfPlugins();
+ int nop = g_Plugins->getNumberOfPlugins();
for(int count = 0; count < nop; count++) {
- if ((g_PluginList->getType(count) & pluginlisttype) && !g_PluginList->isHidden(count) && (g_PluginList->getIntegration(count) == CPlugins::I_TYPE_DISABLED)) {
- neutrino_msg_t d_key = g_PluginList->getKey(count);
+ if ((g_Plugins->getType(count) & pluginlisttype) && !g_Plugins->isHidden(count) && (g_Plugins->getIntegration(count) == CPlugins::I_TYPE_DISABLED)) {
+ neutrino_msg_t d_key = g_Plugins->getKey(count);
keyhelper.get(&key, &dummy, d_key);
- CMenuForwarder *f = new CMenuForwarder(std::string(g_PluginList->getName(count)), true, NULL, this, to_string(count).c_str(), key);
- f->setHint(g_PluginList->getHintIcon(count), g_PluginList->getDescription(count));
+ CMenuForwarder *f = new CMenuForwarder(std::string(g_Plugins->getName(count)), true, NULL, this, to_string(count).c_str(), key);
+ f->setHint(g_Plugins->getHintIcon(count), g_Plugins->getDescription(count));
m.addItem(f);
}
}
@@ -134,7 +134,7 @@ CPluginChooser::CPluginChooser(const neutrino_locale_t Name, const uint32_t list
int CPluginChooser::run()
{
if (number > -1)
- *selectedFilePtr = g_PluginList->getFileName(number);
+ *selectedFilePtr = g_Plugins->getFileName(number);
return menu_return::RETURN_EXIT;
}
@@ -165,12 +165,12 @@ int CPluginsExec::exec(CMenuTarget* parent, const std::string & actionKey)
return menu_return::RETURN_EXIT;
}
else if (sel >= 0)
- g_PluginList->startPlugin(sel);
+ g_Plugins->startPlugin(sel);
- if (!g_PluginList->getScriptOutput().empty())
- ShowMsg(LOCALE_PLUGINS_RESULT, g_PluginList->getScriptOutput(), CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_SHELL);
+ if (!g_Plugins->getScriptOutput().empty())
+ ShowMsg(LOCALE_PLUGINS_RESULT, g_Plugins->getScriptOutput(), CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_SHELL);
- if (g_PluginList->getIntegration(sel) == CPlugins::I_TYPE_DISABLED)
+ if (g_Plugins->getIntegration(sel) == CPlugins::I_TYPE_DISABLED)
return menu_return::RETURN_EXIT;
return menu_return::RETURN_REPAINT;
diff --git a/src/gui/plugins.cpp b/src/gui/plugins.cpp
index 03941a0cd..f6924a63b 100644
--- a/src/gui/plugins.cpp
+++ b/src/gui/plugins.cpp
@@ -65,7 +65,7 @@ extern cVideo * videoDecoder;
#include
#include
-extern CPlugins * g_PluginList; /* neutrino.cpp */
+extern CPlugins * g_Plugins; /* neutrino.cpp */
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
CPlugins::CPlugins()
@@ -347,7 +347,7 @@ void CPlugins::startPlugin_by_name(const std::string & name)
{
for (int i = 0; i < (int) plugin_list.size(); i++)
{
- if (name.compare(g_PluginList->getName(i)) == 0)
+ if (name.compare(g_Plugins->getName(i)) == 0)
{
startPlugin(i);
return;
diff --git a/src/gui/plugins_hide.cpp b/src/gui/plugins_hide.cpp
index e7af97d5d..ed8275c06 100644
--- a/src/gui/plugins_hide.cpp
+++ b/src/gui/plugins_hide.cpp
@@ -41,7 +41,7 @@
#include "gui/pluginlist.h"
#include "gui/plugins.h"
-extern CPlugins *g_PluginList;
+extern CPlugins *g_Plugins;
const CMenuOptionChooser::keyval PLUGIN_HIDE_OPTIONS[] =
{
@@ -72,15 +72,15 @@ int CPluginsHideMenu::menu()
CMenuWidget* pluginsHideMenu = new CMenuWidget(LOCALE_PLUGINS_HIDE, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_PLUGINS_HIDE);
pluginsHideMenu->addIntroItems();
- unsigned int maxPlugins = g_PluginList->getNumberOfPlugins();
+ unsigned int maxPlugins = g_Plugins->getNumberOfPlugins();
int isHidden[maxPlugins];
std::string file[maxPlugins];
for (unsigned int i = 0; i < maxPlugins; i++)
{
- std::string tmp = g_PluginList->getName(i);
- file[i] = g_PluginList->getCfgFile(i);
- isHidden[i] = g_PluginList->isHidden(i);
+ std::string tmp = g_Plugins->getName(i);
+ file[i] = g_Plugins->getCfgFile(i);
+ isHidden[i] = g_Plugins->isHidden(i);
CPluginsHideNotifier * pluginsNotifier = new CPluginsHideNotifier(file[i].c_str());
CMenuOptionChooser * mc = new CMenuOptionChooser(tmp.c_str(), &isHidden[i], PLUGIN_HIDE_OPTIONS, PLUGIN_HIDE_OPTIONS_COUNT, true, pluginsNotifier);
@@ -136,7 +136,7 @@ bool CPluginsHideNotifier::changeNotify(const neutrino_locale_t, void * data)
f << cfg << endl;
f.close();
- g_PluginList->loadPlugins();
+ g_Plugins->loadPlugins();
return menu_return::RETURN_REPAINT;
}
diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp
index 549182fc2..f32ad245d 100644
--- a/src/gui/user_menue.cpp
+++ b/src/gui/user_menue.cpp
@@ -86,7 +86,7 @@
#include
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
-extern CPlugins * g_PluginList; /* neutrino.cpp */
+extern CPlugins * g_Plugins; /* neutrino.cpp */
extern cVideo * videoDecoder;
#if !HAVE_SPARK_HARDWARE
extern CCAMMenuHandler * g_CamHandler;
@@ -336,33 +336,33 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
}
case SNeutrinoSettings::ITEM_PLUGIN_TYPES:
{
- unsigned int number_of_plugins = (unsigned int) g_PluginList->getNumberOfPlugins();
+ unsigned int number_of_plugins = (unsigned int) g_Plugins->getNumberOfPlugins();
if (!number_of_plugins)
continue;
for (unsigned int count = 0; count < number_of_plugins; count++)
{
#if 0
- bool show = g_PluginList->getType(count) == CPlugins::P_TYPE_TOOL ||
- g_PluginList->getType(count) == CPlugins::P_TYPE_LUA;
+ bool show = g_Plugins->getType(count) == CPlugins::P_TYPE_TOOL ||
+ g_Plugins->getType(count) == CPlugins::P_TYPE_LUA;
#endif
bool show = false;
if (g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_GAMES])
- show = show || g_PluginList->getType(count) == CPlugins::P_TYPE_GAME;
+ show = show || g_Plugins->getType(count) == CPlugins::P_TYPE_GAME;
if (g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_TOOLS])
- show = show || g_PluginList->getType(count) == CPlugins::P_TYPE_TOOL;
+ show = show || g_Plugins->getType(count) == CPlugins::P_TYPE_TOOL;
if (g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_SCRIPTS])
- show = show || g_PluginList->getType(count) == CPlugins::P_TYPE_SCRIPT;
+ show = show || g_Plugins->getType(count) == CPlugins::P_TYPE_SCRIPT;
if (g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_LUA])
- show = show || g_PluginList->getType(count) == CPlugins::P_TYPE_LUA;
+ show = show || g_Plugins->getType(count) == CPlugins::P_TYPE_LUA;
- if (show && !g_PluginList->isHidden(count) && (g_PluginList->getIntegration(count) == CPlugins::I_TYPE_DISABLED))
+ if (show && !g_Plugins->isHidden(count) && (g_Plugins->getIntegration(count) == CPlugins::I_TYPE_DISABLED))
{
menu_items++;
- neutrino_msg_t d_key = g_PluginList->getKey(count);
- //printf("[neutrino usermenu] plugin %d, set key %d...\n", count, g_PluginList->getKey(count));
+ neutrino_msg_t d_key = g_Plugins->getKey(count);
+ //printf("[neutrino usermenu] plugin %d, set key %d...\n", count, g_Plugins->getKey(count));
keyhelper.get(&key,&icon, d_key);
- menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, CPluginsExec::getInstance(), to_string(count).c_str(), key, icon);
- menu_item->setHint(g_PluginList->getHintIcon(count), g_PluginList->getDescription(count));
+ menu_item = new CMenuForwarder(g_Plugins->getName(count), true, NULL, CPluginsExec::getInstance(), to_string(count).c_str(), key, icon);
+ menu_item->setHint(g_Plugins->getHintIcon(count), g_Plugins->getDescription(count));
menu->addItem(menu_item, false);
}
@@ -403,14 +403,14 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
case SNeutrinoSettings::ITEM_GAMES:
{
keyhelper.get(&key,&icon);
- menu_item = new CMenuDForwarder(LOCALE_MAINMENU_GAMES, g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME), NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME), "-1", key, icon );
+ menu_item = new CMenuDForwarder(LOCALE_MAINMENU_GAMES, g_Plugins->hasPlugin(CPlugins::P_TYPE_GAME), NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME), "-1", key, icon );
menu_item->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES);
break;
}
case SNeutrinoSettings::ITEM_SCRIPTS:
{
keyhelper.get(&key,&icon);
- menu_item = new CMenuDForwarder(LOCALE_MAINMENU_SCRIPTS, g_PluginList->hasPlugin(CPlugins::P_TYPE_SCRIPT), NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT), "-1", key, icon );
+ menu_item = new CMenuDForwarder(LOCALE_MAINMENU_SCRIPTS, g_Plugins->hasPlugin(CPlugins::P_TYPE_SCRIPT), NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT), "-1", key, icon );
menu_item->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS);
break;
}
@@ -455,14 +455,14 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
case SNeutrinoSettings::ITEM_TOOLS:
{
keyhelper.get(&key,&icon);
- menu_item = new CMenuDForwarder(LOCALE_MAINMENU_TOOLS, g_PluginList->hasPlugin(CPlugins::P_TYPE_TOOL), NULL, new CPluginList(LOCALE_MAINMENU_TOOLS,CPlugins::P_TYPE_TOOL), "-1", key, icon );
+ menu_item = new CMenuDForwarder(LOCALE_MAINMENU_TOOLS, g_Plugins->hasPlugin(CPlugins::P_TYPE_TOOL), NULL, new CPluginList(LOCALE_MAINMENU_TOOLS,CPlugins::P_TYPE_TOOL), "-1", key, icon );
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
break;
}
case SNeutrinoSettings::ITEM_LUA:
{
keyhelper.get(&key,&icon);
- menu_item = new CMenuDForwarder(LOCALE_MAINMENU_LUA, g_PluginList->hasPlugin(CPlugins::P_TYPE_LUA), NULL, new CPluginList(LOCALE_MAINMENU_LUA,CPlugins::P_TYPE_LUA), "-1", key, icon );
+ menu_item = new CMenuDForwarder(LOCALE_MAINMENU_LUA, g_Plugins->hasPlugin(CPlugins::P_TYPE_LUA), NULL, new CPluginList(LOCALE_MAINMENU_LUA,CPlugins::P_TYPE_LUA), "-1", key, icon );
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
break;
}
@@ -535,17 +535,17 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
}
case -1: // plugin
{
- int number_of_plugins = g_PluginList->getNumberOfPlugins();
+ int number_of_plugins = g_Plugins->getNumberOfPlugins();
if (!number_of_plugins)
continue;
int count = 0;
for(; count < number_of_plugins; count++) {
- const char *pname = g_PluginList->getFileName(count);
- if (pname && (std::string(pname) == *it) && !g_PluginList->isHidden(count)) {
- neutrino_msg_t d_key = g_PluginList->getKey(count);
+ const char *pname = g_Plugins->getFileName(count);
+ if (pname && (std::string(pname) == *it) && !g_Plugins->isHidden(count)) {
+ neutrino_msg_t d_key = g_Plugins->getKey(count);
keyhelper.get(&key,&icon, d_key);
- menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, CPluginsExec::getInstance(), to_string(count).c_str(), key, icon);
- menu_item->setHint(g_PluginList->getHintIcon(count), g_PluginList->getDescription(count));
+ menu_item = new CMenuForwarder(g_Plugins->getName(count), true, NULL, CPluginsExec::getInstance(), to_string(count).c_str(), key, icon);
+ menu_item->setHint(g_Plugins->getHintIcon(count), g_Plugins->getDescription(count));
break;
}
}
@@ -605,10 +605,10 @@ const char *CUserMenu::getUserMenuButtonName(int button, bool &active, bool retu
if(loc != NONEXISTANT_LOCALE || text)
return_title = true;
else {
- int nop = g_PluginList->getNumberOfPlugins();
+ int nop = g_Plugins->getNumberOfPlugins();
for(int count = 0; count < nop; count++) {
- if (std::string(g_PluginList->getFileName(count)) == *it) {
- text = g_PluginList->getName(count);
+ if (std::string(g_Plugins->getFileName(count)) == *it) {
+ text = g_Plugins->getName(count);
active = true;
break;
}
diff --git a/src/gui/user_menue_setup.cpp b/src/gui/user_menue_setup.cpp
index a4d9c5cb7..13954524c 100644
--- a/src/gui/user_menue_setup.cpp
+++ b/src/gui/user_menue_setup.cpp
@@ -126,10 +126,10 @@ CUserMenuSetup::CUserMenuSetup(neutrino_locale_t menue_title, int menue_button)
vals[keys[loc]] = loc;
}
- int number_of_plugins = g_PluginList->getNumberOfPlugins();
+ int number_of_plugins = g_Plugins->getNumberOfPlugins();
for (int count = 0; count < number_of_plugins; count++) {
- const char *loc = g_PluginList->getName(count);
- const char *key = g_PluginList->getFileName(count);
+ const char *loc = g_Plugins->getName(count);
+ const char *key = g_Plugins->getFileName(count);
if (loc && *loc && key && *key) {
options.push_back(loc);
keys[loc] = key;
diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index 8334d33d9..68be935fb 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -1046,21 +1046,21 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
void CMenuWidget::integratePlugins(CPlugins::i_type_t integration, const unsigned int shortcut, bool enabled)
{
bool separatorline = false;
- unsigned int number_of_plugins = (unsigned int) g_PluginList->getNumberOfPlugins();
+ unsigned int number_of_plugins = (unsigned int) g_Plugins->getNumberOfPlugins();
unsigned int sc = shortcut;
for (unsigned int count = 0; count < number_of_plugins; count++)
{
- if ((g_PluginList->getIntegration(count) == integration) && !g_PluginList->isHidden(count))
+ if ((g_Plugins->getIntegration(count) == integration) && !g_Plugins->isHidden(count))
{
if (!separatorline)
{
addItem(GenericMenuSeparatorLine);
separatorline = true;
}
- printf("[neutrino] integratePlugins: add %s\n", g_PluginList->getName(count));
+ printf("[neutrino] integratePlugins: add %s\n", g_Plugins->getName(count));
neutrino_msg_t dk = (shortcut != CRCInput::RC_nokey) ? CRCInput::convertDigitToKey(sc++) : CRCInput::RC_nokey;
- CMenuForwarder *fw_plugin = new CMenuForwarder(g_PluginList->getName(count), enabled, NULL, CPluginsExec::getInstance(), to_string(count).c_str(), dk);
- fw_plugin->setHint(g_PluginList->getHintIcon(count), g_PluginList->getDescription(count));
+ CMenuForwarder *fw_plugin = new CMenuForwarder(g_Plugins->getName(count), enabled, NULL, CPluginsExec::getInstance(), to_string(count).c_str(), dk);
+ fw_plugin->setHint(g_Plugins->getHintIcon(count), g_Plugins->getDescription(count));
addItem(fw_plugin);
}
}
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 76f754a90..cddda23cf 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -212,7 +212,7 @@ CBouquetList * RADIOwebList;
CBouquetList * AllFavBouquetList;
-CPlugins * g_PluginList;
+CPlugins * g_Plugins;
CRemoteControl * g_RemoteControl;
CPictureViewer * g_PicViewer;
CCAMMenuHandler * g_CamHandler;
@@ -2460,10 +2460,10 @@ TIMER_START();
#endif
CFSMounter::automount();
- g_PluginList = new CPlugins;
- g_PluginList->setPluginDir(PLUGINDIR);
+ g_Plugins = new CPlugins;
+ g_Plugins->setPluginDir(PLUGINDIR);
//load Pluginlist before main menu (only show script menu if at least one script is available
- g_PluginList->loadPlugins();
+ g_Plugins->loadPlugins();
// setup recording device
setupRecordingDevice();
@@ -2666,9 +2666,9 @@ void CNeutrinoApp::RealRun()
#ifdef ENABLE_LUA
CLuaServer *luaServer = CLuaServer::getInstance();
#endif
- g_PluginList->startPlugin("startup");
- if (!g_PluginList->getScriptOutput().empty()) {
- ShowMsg(LOCALE_PLUGINS_RESULT, g_PluginList->getScriptOutput(), CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_SHELL);
+ g_Plugins->startPlugin("startup");
+ if (!g_Plugins->getScriptOutput().empty()) {
+ ShowMsg(LOCALE_PLUGINS_RESULT, g_Plugins->getScriptOutput(), CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_SHELL);
}
g_RCInput->clearRCMsg();
@@ -3862,9 +3862,9 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
}
}
else if (msg == NeutrinoMessages::EVT_START_PLUGIN) {
- g_PluginList->startPlugin((const char *)data);
- if (!g_PluginList->getScriptOutput().empty()) {
- ShowMsg(LOCALE_PLUGINS_RESULT, g_PluginList->getScriptOutput(), CMsgBox::mbrBack,CMsgBox::mbBack,NEUTRINO_ICON_SHELL);
+ g_Plugins->startPlugin((const char *)data);
+ if (!g_Plugins->getScriptOutput().empty()) {
+ ShowMsg(LOCALE_PLUGINS_RESULT, g_Plugins->getScriptOutput(), CMsgBox::mbrBack,CMsgBox::mbBack,NEUTRINO_ICON_SHELL);
}
delete[] (unsigned char*) data;
@@ -4564,7 +4564,7 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_SERVICEMENU_GETPLUGINS_HINT));
hintBox.paint();
- g_PluginList->loadPlugins();
+ g_Plugins->loadPlugins();
hintBox.hide();
}
@@ -5183,7 +5183,7 @@ void CNeutrinoApp::Cleanup()
printf("cleanup 12\n");fflush(stdout);
delete g_PicViewer; g_PicViewer = NULL;
printf("cleanup 13\n");fflush(stdout);
- delete g_PluginList; g_PluginList = NULL;
+ delete g_Plugins; g_Plugins = NULL;
printf("cleanup 16\n");fflush(stdout);
delete g_CamHandler; g_CamHandler = NULL;
printf("cleanup 17\n");fflush(stdout);
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index 06006e9ee..794b51b2e 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -78,7 +78,7 @@
#include "gui/ni_menu.h" //NI
-extern CPlugins * g_PluginList;
+extern CPlugins * g_Plugins;
extern CRemoteControl * g_RemoteControl;
extern CCAMMenuHandler * g_CamHandler;
// extern bool has_hdd;
@@ -191,26 +191,26 @@ void CNeutrinoApp::InitMenuMain()
CMenuForwarder * mf;
if (!g_settings.easymenu) {
//games
- bool show_games = g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME);
+ bool show_games = g_Plugins->hasPlugin(CPlugins::P_TYPE_GAME);
mf = new CMenuForwarder(LOCALE_MAINMENU_GAMES, show_games, NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME));
mf->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES);
personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_GAMES]);
#if 0
//tools
- bool show_tools = g_PluginList->hasPlugin(CPlugins::P_TYPE_TOOL);
+ bool show_tools = g_Plugins->hasPlugin(CPlugins::P_TYPE_TOOL);
mf = new CMenuForwarder(LOCALE_MAINMENU_TOOLS, show_tools, NULL, new CPluginList(LOCALE_MAINMENU_TOOLS,CPlugins::P_TYPE_TOOL));
mf->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_TOOLS);
personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_TOOLS]);
//scripts
- bool show_scripts = g_PluginList->hasPlugin(CPlugins::P_TYPE_SCRIPT);
+ bool show_scripts = g_Plugins->hasPlugin(CPlugins::P_TYPE_SCRIPT);
mf = new CMenuForwarder(LOCALE_MAINMENU_SCRIPTS, show_scripts, NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT));
mf->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS);
personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SCRIPTS]);
//lua
- bool show_lua = g_PluginList->hasPlugin(CPlugins::P_TYPE_LUA);
+ bool show_lua = g_Plugins->hasPlugin(CPlugins::P_TYPE_LUA);
mf = new CMenuForwarder(LOCALE_MAINMENU_LUA, show_lua, NULL, new CPluginList(LOCALE_MAINMENU_LUA,CPlugins::P_TYPE_LUA));
mf->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_LUA);
personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_LUA]);
diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp
index d75e09ccd..89fba7264 100644
--- a/src/nhttpd/tuxboxapi/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/controlapi.cpp
@@ -64,7 +64,7 @@ extern CInfoIcons *InfoIcons; /* neutrino.cpp */
//NI
#include "gui/update.h"
-extern CPlugins *g_PluginList;//for relodplugins
+extern CPlugins *g_Plugins;//for relodplugins
extern CBouquetManager *g_bouquetManager;
#define EVENTDEV "/dev/input/input0"
@@ -2041,7 +2041,7 @@ void CControlAPI::ReloadNeutrinoSetupCGI(CyhookHandler *hh)
void CControlAPI::ReloadPluginsCGI(CyhookHandler *hh)
{
- g_PluginList->loadPlugins();
+ g_Plugins->loadPlugins();
hh->SendOk();
}
diff --git a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp
index 86b6ca63c..ee5d4709c 100644
--- a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp
+++ b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp
@@ -36,7 +36,7 @@
//NI y-funcs
#include "gui/plugins.h"
-extern CPlugins *g_PluginList;
+extern CPlugins *g_Plugins;
#include "gui/infoicons.h"
extern CInfoIcons *InfoIcons; /* neutrino.cpp */
#include "gui/netfs_setup.h"
diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp
index 8626b2585..d95b0caa7 100644
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -79,7 +79,7 @@
#include
#include
-extern CPlugins * g_PluginList; /* neutrino.cpp */
+extern CPlugins * g_Plugins; /* neutrino.cpp */
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
extern cVideo *videoDecoder;
extern cAudio *audioDecoder;
@@ -405,7 +405,7 @@ int CMoviePluginChangeExec::exec(CMenuTarget* parent, const std::string & action
{
int sel = atoi(actionKey.c_str());
if (sel >= 0)
- g_settings.movieplayer_plugin = g_PluginList->getName(sel);
+ g_settings.movieplayer_plugin = g_Plugins->getName(sel);
}
return menu_return::RETURN_EXIT;