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

disarm broken HAVE_SPARK_HARDWARE code

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0bff1ff02d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-27 (Tue, 27 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-01-27 10:59:04 +01:00
parent 190c9bb2a7
commit 08f96ff53a
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/keybind_setup.cpp
View File

@@ -283,7 +283,7 @@ int CKeybindSetup::showKeySetup()
cc->setHint("", LOCALE_MENU_HINT_LONGKEYPRESS_DURATION); cc->setHint("", LOCALE_MENU_HINT_LONGKEYPRESS_DURATION);
keySettings->addItem(cc); keySettings->addItem(cc);
#if HAVE_SPARK_HARDWARE #if 0
g_settings.accept_other_remotes = access("/etc/lircd_predata_lock", R_OK) ? 1 : 0; g_settings.accept_other_remotes = access("/etc/lircd_predata_lock", R_OK) ? 1 : 0;
CMenuOptionChooser *mc = new CMenuOptionChooser(LOCALE_KEYBINDINGMENU_ACCEPT_OTHER_REMOTES, CMenuOptionChooser *mc = new CMenuOptionChooser(LOCALE_KEYBINDINGMENU_ACCEPT_OTHER_REMOTES,
&g_settings.accept_other_remotes, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this, &g_settings.accept_other_remotes, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this,
@@ -512,7 +512,7 @@ void CKeybindSetup::showKeyBindSpecialSetup(CMenuWidget *bindSettings_special)
bool CKeybindSetup::changeNotify(const neutrino_locale_t OptionName, void * /* data */) bool CKeybindSetup::changeNotify(const neutrino_locale_t OptionName, void * /* data */)
{ {
#if HAVE_SPARK_HARDWARE #if 0
if (ARE_LOCALES_EQUAL(OptionName, LOCALE_KEYBINDINGMENU_ACCEPT_OTHER_REMOTES)) { if (ARE_LOCALES_EQUAL(OptionName, LOCALE_KEYBINDINGMENU_ACCEPT_OTHER_REMOTES)) {
struct sockaddr_un sun; struct sockaddr_un sun;
memset(&sun, 0, sizeof(sun)); memset(&sun, 0, sizeof(sun));

12
src/gui/plugins.cpp
View File

@@ -409,7 +409,7 @@ void CPlugins::startLuaPlugin(int number)
CLuaInstance *lua = new CLuaInstance(); CLuaInstance *lua = new CLuaInstance();
lua->runScript(script); lua->runScript(script);
delete lua; delete lua;
#if HAVE_SPARK_HARDWARE #if 0
frameBuffer->ClearFB(); frameBuffer->ClearFB();
#endif #endif
videoDecoder->Pig(-1, -1, -1, -1); videoDecoder->Pig(-1, -1, -1, -1);
@@ -422,25 +422,25 @@ void CPlugins::startPlugin(int number)
delScriptOutput(); delScriptOutput();
/* export neutrino settings to the environment */ /* export neutrino settings to the environment */
char tmp[32]; char tmp[32];
#if HAVE_SPARK_HARDWARE #if 0
sprintf(tmp, "%d", g_settings.screen_StartX_int); sprintf(tmp, "%d", g_settings.screen_StartX_int);
#else #else
sprintf(tmp, "%d", g_settings.screen_StartX); sprintf(tmp, "%d", g_settings.screen_StartX);
#endif #endif
setenv("SCREEN_OFF_X", tmp, 1); setenv("SCREEN_OFF_X", tmp, 1);
#if HAVE_SPARK_HARDWARE #if 0
sprintf(tmp, "%d", g_settings.screen_StartY_int); sprintf(tmp, "%d", g_settings.screen_StartY_int);
#else #else
sprintf(tmp, "%d", g_settings.screen_StartY); sprintf(tmp, "%d", g_settings.screen_StartY);
#endif #endif
setenv("SCREEN_OFF_Y", tmp, 1); setenv("SCREEN_OFF_Y", tmp, 1);
#if HAVE_SPARK_HARDWARE #if 0
sprintf(tmp, "%d", g_settings.screen_EndX_int); sprintf(tmp, "%d", g_settings.screen_EndX_int);
#else #else
sprintf(tmp, "%d", g_settings.screen_EndX); sprintf(tmp, "%d", g_settings.screen_EndX);
#endif #endif
setenv("SCREEN_END_X", tmp, 1); setenv("SCREEN_END_X", tmp, 1);
#if HAVE_SPARK_HARDWARE #if 0
sprintf(tmp, "%d", g_settings.screen_EndY_int); sprintf(tmp, "%d", g_settings.screen_EndY_int);
#else #else
sprintf(tmp, "%d", g_settings.screen_EndY); sprintf(tmp, "%d", g_settings.screen_EndY);
@@ -482,7 +482,7 @@ void CPlugins::startPlugin(int number)
my_system(2, plugin_list[number].pluginfile.c_str(), NULL); my_system(2, plugin_list[number].pluginfile.c_str(), NULL);
//frameBuffer->setMode(720, 576, 8 * sizeof(fb_pixel_t)); //frameBuffer->setMode(720, 576, 8 * sizeof(fb_pixel_t));
frameBuffer->Unlock(); frameBuffer->Unlock();
#if HAVE_SPARK_HARDWARE #if 0
frameBuffer->ClearFB(); frameBuffer->ClearFB();
#endif #endif
videoDecoder->Pig(-1, -1, -1, -1); videoDecoder->Pig(-1, -1, -1, -1);

2
src/gui/user_menue.cpp
View File

@@ -378,7 +378,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
menu_item->setHint(NEUTRINO_ICON_HINT_NKPLAY, LOCALE_MENU_HINT_NKPLAY); menu_item->setHint(NEUTRINO_ICON_HINT_NKPLAY, LOCALE_MENU_HINT_NKPLAY);
break; break;
#endif #endif
#if HAVE_SPARK_HARDWARE #if 0
case SNeutrinoSettings::ITEM_THREE_D_MODE: case SNeutrinoSettings::ITEM_THREE_D_MODE:
keyhelper.get(&key,&icon); keyhelper.get(&key,&icon);
menu_item = new CMenuForwarder(LOCALE_THREE_D_SETTINGS, true, NULL, neutrino, "3dmode", key, icon); menu_item = new CMenuForwarder(LOCALE_THREE_D_SETTINGS, true, NULL, neutrino, "3dmode", key, icon);