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

Merge branch 'uncool/dvbsi++' commit c6136d612f

Browse Source 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


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



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-12-30 21:35:20 +01:00
parent d7219efd37 d57e57367f
commit a07b5d6289
84 changed files with 898 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/plugins.cpp
View File

@@ -155,7 +155,7 @@ void CPlugins::loadPlugins()
frameBuffer = CFrameBuffer::getInstance();
number_of_plugins = 0;
plugin_list.clear();
sindex = 100;
scanDir(g_settings.plugin_hdd_dir.c_str());
scanDir(PLUGINDIR_USB);
scanDir(PLUGINDIR_VAR);
@@ -183,7 +183,7 @@ bool CPlugins::parseCfg(plugin *plugin_data)
while (linecount < 20 && getline(inFile, line[linecount++]))
{};
plugin_data->index = 0;
plugin_data->index = sindex++;
plugin_data->key = 0; //CRCInput::RC_nokey
plugin_data->fb = false;
plugin_data->rc = false;