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

*neutrino usermenu plugin: fix plugin call

Browse Source 
Plugin call was broken because of a merge error.

add config parameter 'index' and 'key' for plugins
This allows (optional) to config an user definied sort and setup rc-key for plugin via
plugin.cfg.

Sort by filename is still working as before in second instance.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1660 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
thilo
2011-09-02 17:05:55 +00:00
parent 10f4967cf6
commit e6dbbc323f
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/plugins.cpp
View File

@@ -160,7 +160,8 @@ void CPlugins::loadPlugins()
scanDir(PLUGINDIR_USB); scanDir(PLUGINDIR_USB);
scanDir(PLUGINDIR_VAR); scanDir(PLUGINDIR_VAR);
scanDir(PLUGINDIR); scanDir(PLUGINDIR);
sort(plugin_list.begin(), plugin_list.end());
sort (plugin_list.begin(), plugin_list.end());
} }
CPlugins::~CPlugins() CPlugins::~CPlugins()
@@ -182,6 +183,8 @@ bool CPlugins::parseCfg(plugin *plugin_data)
while (linecount < 20 && getline(inFile, line[linecount++])) while (linecount < 20 && getline(inFile, line[linecount++]))
{}; {};
plugin_data->index = 0;
plugin_data->key = 0; //CRCInput::RC_nokey
plugin_data->fb = false; plugin_data->fb = false;
plugin_data->rc = false; plugin_data->rc = false;
plugin_data->lcd = false; plugin_data->lcd = false;
@@ -200,7 +203,15 @@ bool CPlugins::parseCfg(plugin *plugin_data)
getline(iss, cmd, '='); getline(iss, cmd, '=');
getline(iss, parm, '='); getline(iss, parm, '=');
if (cmd == "pluginversion") if (cmd == "index")
{
plugin_data->index = atoi(parm.c_str());
}
else if (cmd == "key")
{
plugin_data->key = atoi(parm.c_str());
}
else if (cmd == "pluginversion")
{ {
plugin_data->version = atoi(parm.c_str()); plugin_data->version = atoi(parm.c_str());
} }

8
src/gui/plugins.h
View File

@@ -62,7 +62,9 @@ class CPlugins
struct plugin struct plugin
{ {
int index;
std::string filename; std::string filename;
int key;
std::string cfgfile; std::string cfgfile;
std::string pluginfile; std::string pluginfile;
int version; int version;
@@ -70,7 +72,7 @@ class CPlugins
std::string description; // UTF-8 encoded std::string description; // UTF-8 encoded
std::string depend; std::string depend;
CPlugins::p_type_t type; CPlugins::p_type_t type;
bool fb; bool fb;
bool rc; bool rc;
bool lcd; bool lcd;
@@ -81,7 +83,7 @@ class CPlugins
bool hide; bool hide;
bool operator< (const plugin& a) const bool operator< (const plugin& a) const
{ {
return this->filename < a.filename ; return this->index < a.index ;
} }
}; };
@@ -116,6 +118,8 @@ class CPlugins
inline const std::string & getDescription (const int number) const { return plugin_list[number].description ; } inline const std::string & getDescription (const int number) const { return plugin_list[number].description ; }
inline int getType (const int number) const { return plugin_list[number].type ; } inline int getType (const int number) const { return plugin_list[number].type ; }
inline bool isHidden (const int number) const { return plugin_list[number].hide ; } inline bool isHidden (const int number) const { return plugin_list[number].hide ; }
inline int getIndex (const int number) const { return plugin_list[number].index ; }
inline neutrino_msg_t getKey (const int number) const { return (neutrino_msg_t)plugin_list[number].key; }
void startPlugin(int number,int param); void startPlugin(int number,int param);
void start_plugin_by_name(const std::string & filename,int param);// start plugins by "name=" in .cfg void start_plugin_by_name(const std::string & filename,int param);// start plugins by "name=" in .cfg

8
src/gui/user_menue.cpp
View File

@@ -300,10 +300,12 @@ bool CUserMenu::showUserMenu(int button)
sprintf(id, "%d", count); sprintf(id, "%d", count);
menu_items++; menu_items++;
menu_prev = SNeutrinoSettings::ITEM_PLUGIN; menu_prev = SNeutrinoSettings::ITEM_PLUGIN;
//keyhelper.get(&key,&icon,CRCInput::RC_blue); neutrino_msg_t d_key = g_PluginList->getKey(count);
keyhelper.get(&key,&icon); //printf("[neutrino usermenu] plugin %d, set key %d...\n", count, g_PluginList->getKey(count));
StreamFeaturesChanger = new CStreamFeaturesChangeExec();
keyhelper.get(&key,&icon, d_key);
menu_item = new CMenuForwarderNonLocalized(g_PluginList->getName(count), true, NULL, StreamFeaturesChanger, id, key, icon); menu_item = new CMenuForwarderNonLocalized(g_PluginList->getName(count), true, NULL, StreamFeaturesChanger, id, key, icon);
//menu->addItem(menu_item, (cnt == 0));
menu->addItem(menu_item, 0); menu->addItem(menu_item, 0);
cnt++; cnt++;
} }