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

neutrino: clean up

Browse Source 
removed unused variables

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1365 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b44a81585
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-03-31 (Thu, 31 Mar 2011)

Origin message was:
------------------
*neutrino: clean up

removed unused variables

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1365 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2011-03-31 13:44:56 +00:00
parent 79da511223
commit 69782525f6
2 changed files with 9 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/neutrino.cpp
View File

@@ -152,15 +152,12 @@
int old_b_id = -1; int old_b_id = -1;
CHintBox * reloadhintBox = 0; CHintBox * reloadhintBox = 0;
uint32_t sec_timer; // int rf_dummy;
int rf_dummy;
bool has_hdd; bool has_hdd;
#include "gui/infoclock.h" #include "gui/infoclock.h"
#include "gui/dboxinfo.h"
CInfoClock *InfoClock; CInfoClock *InfoClock;
int allow_flash = 1; int allow_flash = 1;
extern int was_record; extern int was_record;
extern char current_timezone[50];
Zapit_config zapitCfg; Zapit_config zapitCfg;
char zapit_lat[20]; char zapit_lat[20];
char zapit_long[20]; char zapit_long[20];
@@ -189,8 +186,6 @@ void * zapit_main_thread(void *data);
extern t_channel_id live_channel_id; //zapit extern t_channel_id live_channel_id; //zapit
extern t_channel_id rec_channel_id; //zapit extern t_channel_id rec_channel_id; //zapit
extern CZapitChannel *g_current_channel; extern CZapitChannel *g_current_channel;
// void setZapitConfig(Zapit_config * Cfg);
void getZapitConfig(Zapit_config *Cfg);
void * nhttpd_main_thread(void *data); void * nhttpd_main_thread(void *data);
static pthread_t nhttpd_thread ; static pthread_t nhttpd_thread ;
@@ -964,7 +959,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
} }
#endif #endif
//scansettings //scansettings
if(!scanSettings.saveSettings(NEUTRINO_SCAN_SETTINGS_FILE)) { if(!scansettings.saveSettings(NEUTRINO_SCAN_SETTINGS_FILE)) {
dprintf(DEBUG_NORMAL, "error while saving scan-settings!\n"); dprintf(DEBUG_NORMAL, "error while saving scan-settings!\n");
} }
@@ -4206,8 +4201,6 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
} else } else
tuxtxt_close(); tuxtxt_close();
CScanSetup::getInstance()->exec(NULL, "save_scansettings");
//g_Sectionsd->setEventsAreOldInMinutes((unsigned short) (g_settings.epg_old_hours*60)); //g_Sectionsd->setEventsAreOldInMinutes((unsigned short) (g_settings.epg_old_hours*60));
//g_Sectionsd->setHoursToCache((unsigned short) (g_settings.epg_cache_days*24)); //g_Sectionsd->setHoursToCache((unsigned short) (g_settings.epg_cache_days*24));

24
src/neutrino_menue.cpp
View File

@@ -81,24 +81,12 @@
#include "gui/widget/stringinput.h" #include "gui/widget/stringinput.h"
#include "gui/widget/stringinput_ext.h" #include "gui/widget/stringinput_ext.h"
#include <zapit/fastscan.h>
#include <zapit/frontend_c.h>
#include <zapit/getservices.h>
#include <zapit/satconfig.h>
extern CFrontend * frontend;
extern CAudioPlayerGui * audioPlayer;
extern CPlugins * g_PluginList; extern CPlugins * g_PluginList;
extern bool has_hdd;
extern CZapitClient::SatelliteList satList;
extern Zapit_config zapitCfg;
extern char zapit_lat[20];
extern char zapit_long[20];
extern char current_timezone[50];
extern CRemoteControl * g_RemoteControl; extern CRemoteControl * g_RemoteControl;
extern CCAMMenuHandler * g_CamHandler; extern CCAMMenuHandler * g_CamHandler;
extern bool autoshift; // extern bool has_hdd;
// extern char current_timezone[50];
// extern bool autoshift;
/************************************************************************************** /**************************************************************************************
@@ -222,11 +210,11 @@ const CMenuOptionChooser::keyval FLASHUPDATE_UPDATEMODE_OPTIONS[FLASHUPDATE_UPDA
{ 1, LOCALE_FLASHUPDATE_UPDATEMODE_INTERNET } { 1, LOCALE_FLASHUPDATE_UPDATEMODE_INTERNET }
}; };
void getZapitConfig(Zapit_config *Cfg);
void CNeutrinoApp::InitServiceSettings(CMenuWidget &service/*, CMenuWidget &_scanSettings*/) void CNeutrinoApp::InitServiceSettings(CMenuWidget &service)
{ {
dprintf(DEBUG_DEBUG, "init serviceSettings\n"); dprintf(DEBUG_DEBUG, "init serviceSettings\n");
getZapitConfig(&zapitCfg);
#if 0 #if 0
CZapitDestExec * zexec = new CZapitDestExec(); CZapitDestExec * zexec = new CZapitDestExec();