mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-30 08:51:10 +02:00
Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes Conflicts: configure.ac data/icons/shutdown.jpg data/icons/start.jpg data/locale/deutsch.locale data/locale/english.locale lib/libmd5sum/md5.c src/driver/scanepg.cpp src/driver/streamts.cpp src/driver/vfd.cpp src/driver/vfd.h src/driver/volume.cpp src/eitd/dmx.cpp src/eitd/xmlutil.cpp src/gui/Makefile.am src/gui/audiomute.cpp src/gui/channellist.cpp src/gui/dboxinfo.cpp src/gui/epgview.cpp src/gui/eventlist.cpp src/gui/filebrowser.cpp src/gui/hdd_menu.cpp src/gui/infoviewer.cpp src/gui/infoviewer_bb.cpp src/gui/infoviewer_bb.h src/gui/keybind_setup.cpp src/gui/luainstance.cpp src/gui/luainstance.h src/gui/miscsettings_menu.cpp src/gui/moviebrowser.cpp src/gui/movieplayer.cpp src/gui/osd_progressbar_setup.cpp src/gui/osd_progressbar_setup.h src/gui/osd_setup.cpp src/gui/osdlang_setup.cpp src/gui/personalize.cpp src/gui/plugins.cpp src/gui/plugins.h src/gui/scan.cpp src/gui/scan_setup.cpp src/gui/update_settings.cpp src/gui/user_menue.cpp src/gui/user_menue_setup.cpp src/gui/videosettings.cpp src/gui/widget/buttons.cpp src/gui/widget/menue.cpp src/gui/widget/menue.h src/gui/widget/progresswindow.cpp src/neutrino.cpp src/neutrino_menue.cpp src/nhttpd/yhttpd.cpp src/system/helpers.cpp src/system/locals.h src/system/locals_intern.h src/system/setting_helpers.cpp src/zapit/lib/zapitclient.cpp src/zapit/src/fastscan.cpp src/zapit/src/frontend.cpp src/zapit/src/getservices.cpp src/zapit/src/scan.cpp src/zapit/src/scannit.cpp src/zapit/src/scanpmt.cpp src/zapit/src/transponder.cpp src/zapit/src/zapit.cpp
This commit is contained in:
@@ -57,6 +57,18 @@ class CPlugins
|
||||
}
|
||||
p_type_t;
|
||||
|
||||
typedef enum i_type
|
||||
{
|
||||
I_TYPE_DISABLED = 0x1,
|
||||
/*
|
||||
I_TYPE_MAIN = 0x2,
|
||||
*/
|
||||
I_TYPE_MULTIMEDIA = 0x4,
|
||||
I_TYPE_SETTING = 0x8,
|
||||
I_TYPE_SERVICE = 0x10,
|
||||
I_TYPE_INFORMATION = 0x20
|
||||
}
|
||||
i_type_t;
|
||||
|
||||
private:
|
||||
|
||||
@@ -69,11 +81,14 @@ class CPlugins
|
||||
int key;
|
||||
std::string cfgfile;
|
||||
std::string pluginfile;
|
||||
std::string plugindir;
|
||||
std::string hinticon;
|
||||
int version;
|
||||
std::string name; // UTF-8 encoded
|
||||
std::string description; // UTF-8 encoded
|
||||
std::string depend;
|
||||
CPlugins::p_type_t type;
|
||||
CPlugins::i_type_t integration;
|
||||
|
||||
bool fb;
|
||||
bool rc;
|
||||
@@ -82,6 +97,7 @@ class CPlugins
|
||||
int posx, posy, sizex, sizey;
|
||||
bool showpig;
|
||||
bool needoffset;
|
||||
bool shellwindow;
|
||||
bool hide;
|
||||
bool operator< (const plugin& a) const
|
||||
{
|
||||
@@ -100,6 +116,7 @@ class CPlugins
|
||||
bool plugin_exists(const std::string & filename);
|
||||
int find_plugin(const std::string & filename);
|
||||
CPlugins::p_type_t getPluginType(int type);
|
||||
CPlugins::i_type_t getPluginIntegration(int integration);
|
||||
public:
|
||||
CPlugins();
|
||||
~CPlugins();
|
||||
@@ -108,23 +125,32 @@ class CPlugins
|
||||
|
||||
void setPluginDir(const std::string & dir) { plugin_dir = dir; }
|
||||
|
||||
#if 0
|
||||
PluginParam * makeParam(const char * const id, const char * const value, PluginParam * const next);
|
||||
PluginParam * makeParam(const char * const id, const int value, PluginParam * const next);
|
||||
#endif
|
||||
|
||||
inline int getNumberOfPlugins (void ) const { return plugin_list.size() ; }
|
||||
inline const char * getName (const int number) const { return plugin_list[number].name.c_str() ; }
|
||||
inline const char * getPluginFile (const int number) const { return plugin_list[number].pluginfile.c_str(); }
|
||||
inline const char * getPluginDir (const int number) const { return plugin_list[number].plugindir.c_str() ; }
|
||||
inline const char * getHintIcon (const int number) const { return plugin_list[number].hinticon.c_str() ; }
|
||||
inline const char * getFileName (const int number) const { return plugin_list[number].filename.c_str() ; }
|
||||
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 getIntegration (const int number) const { return plugin_list[number].integration ; }
|
||||
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 setType (const int number, int t) { plugin_list[number].type = (CPlugins::p_type_t) t ; }
|
||||
bool overrideType(plugin *plugin_data, std::string &setting, p_type type);
|
||||
|
||||
void startPlugin(int number); // start plugins by number
|
||||
void startPlugin(const char * const filename); // start plugins by filename
|
||||
void startPlugin_by_name(const std::string & name); // start plugins by "name=" in .cfg
|
||||
void startScriptPlugin(int number);
|
||||
void popenScriptPlugin(const char * script);
|
||||
void startLuaPlugin(int number);
|
||||
bool hasPlugin(CPlugins::p_type_t type);
|
||||
|
||||
|
Reference in New Issue
Block a user