mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'uncool/cst-next'

Browse Source 
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-12-13 17:41:55 +01:00
parent 61712bcdf2 151d7f25a4
commit 5f89c9a312
320 changed files with 21291 additions and 13199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/plugins.cpp
View File

@@ -63,14 +63,11 @@ extern cVideo * videoDecoder;
#include "plugins.h"
#include <daemonc/remotecontrol.h>
#include <gui/luainstance.h>
#include <gui/lua/luainstance.h>
extern CPlugins * g_PluginList; /* neutrino.cpp */
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
#define PLUGINDIR_VAR "/var/tuxbox/plugins"
#define PLUGINDIR_USB "/mnt/usb/tuxbox/plugins"
CPlugins::CPlugins()
{
frameBuffer = NULL;
@@ -151,8 +148,9 @@ void CPlugins::loadPlugins()
number_of_plugins = 0;
plugin_list.clear();
sindex = 100;
scanDir(GAMESDIR);
scanDir(g_settings.plugin_hdd_dir.c_str());
scanDir(PLUGINDIR_USB);
scanDir(PLUGINDIR_MNT);
scanDir(PLUGINDIR_VAR);
scanDir(PLUGINDIR);