- plugins: formatting code using astyle

Conflicts:
	src/gui/plugins.h

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2022-03-27 22:54:04 +02:00
committed by Thilo Graf
parent 46ae497074
commit 21d4b727a3
2 changed files with 77 additions and 75 deletions

View File

@@ -63,8 +63,8 @@ extern cVideo * videoDecoder;
#include <daemonc/remotecontrol.h> #include <daemonc/remotecontrol.h>
#include <gui/lua/luainstance.h> #include <gui/lua/luainstance.h>
extern CPlugins * g_Plugins; /* neutrino.cpp */ extern CPlugins *g_Plugins;
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */ extern CRemoteControl *g_RemoteControl;
CPlugins::CPlugins() CPlugins::CPlugins()
{ {
@@ -162,12 +162,14 @@ CPlugins::~CPlugins()
bool CPlugins::overrideType(plugin *plugin_data, std::string &setting, p_type type) bool CPlugins::overrideType(plugin *plugin_data, std::string &setting, p_type type)
{ {
if (!setting.empty()) { if (!setting.empty())
{
char s[setting.length() + 1]; char s[setting.length() + 1];
cstrncpy(s, setting, setting.length() + 1); cstrncpy(s, setting, setting.length() + 1);
char *t, *p = s; char *t, *p = s;
while ((t = strsep(&p, ","))) while ((t = strsep(&p, ",")))
if (!strcmp(t, plugin_data->filename.c_str())) { if (!strcmp(t, plugin_data->filename.c_str()))
{
plugin_data->type = type; plugin_data->type = type;
return true; return true;
} }
@@ -475,8 +477,7 @@ int CPlugins::startPlugin(int number)
bool CPlugins::hasPlugin(CPlugins::p_type_t type) bool CPlugins::hasPlugin(CPlugins::p_type_t type)
{ {
for (std::vector<plugin>::iterator it=plugin_list.begin(); for (std::vector<plugin>::iterator it = plugin_list.begin(); it != plugin_list.end(); ++it)
it!=plugin_list.end(); ++it)
{ {
if ((it->type & type) && !it->hide) if ((it->type & type) && !it->hide)
return true; return true;

View File

@@ -96,6 +96,7 @@ class CPlugins
inline int getNumberOfPlugins(void) const { return (int)plugin_list.size() ; } inline int getNumberOfPlugins(void) const { return (int)plugin_list.size() ; }
inline const char *getName (const int number) const { return plugin_list[number].name.c_str() ; } 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 *getPluginFile (const int number) const { return plugin_list[number].pluginfile.c_str(); }
inline const char *getCfgFile (const int number) const { return plugin_list[number].cfgfile.c_str() ; }
inline const char *getPluginDir (const int number) const { return plugin_list[number].plugindir.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 *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 char *getFileName (const int number) const { return plugin_list[number].filename.c_str() ; }