mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 01:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove rfmod code and unused settings

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2002 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-12-25 12:37:16 +00:00
parent 4a967d86b5
commit 5743a6dd29
9 changed files with 5 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/system/locals.h
View File

@@ -1097,16 +1097,6 @@ typedef enum
LOCALE_RESET_CHANNELS,
LOCALE_RESET_CONFIRM,
LOCALE_RESET_SETTINGS,
LOCALE_RFMOD_CARRIER,
LOCALE_RFMOD_CARRIER4500,
LOCALE_RFMOD_CARRIER5500,
LOCALE_RFMOD_CARRIER6000,
LOCALE_RFMOD_CARRIER6500,
LOCALE_RFMOD_CHANNEL,
LOCALE_RFMOD_ENABLE,
LOCALE_RFMOD_FINETUNE,
LOCALE_RFMOD_STANDBY,
LOCALE_RFMOD_TEST,
LOCALE_SATSETUP_AUTO_SCAN,
LOCALE_SATSETUP_AUTO_SCAN_ALL,
LOCALE_SATSETUP_COMM_INPUT,

10
src/system/locals_intern.h
View File

@@ -1097,16 +1097,6 @@ const char * locale_real_names[] =
"reset_channels",
"reset_confirm",
"reset_settings",
"rfmod.carrier",
"rfmod.carrier4500",
"rfmod.carrier5500",
"rfmod.carrier6000",
"rfmod.carrier6500",
"rfmod.channel",
"rfmod.enable",
"rfmod.finetune",
"rfmod.standby",
"rfmod.test",
"satsetup.auto_scan",
"satsetup.auto_scan_all",
"satsetup.comm_input",

28
src/system/setting_helpers.cpp
View File

@@ -294,34 +294,6 @@ bool CLcdNotifier::changeNotify(const neutrino_locale_t, void *)
return true;
}
int CRfExec::exec(CMenuTarget* /*parent*/, const std::string& /*actionKey*/)
{
g_RFmod->init();
return true;
}
bool CRfNotifier::changeNotify(const neutrino_locale_t OptionName, void * val)
{
//printf("CRfNotifier: Option %d val %d\n", OptionName, *((int *)val));
if (ARE_LOCALES_EQUAL(OptionName, LOCALE_RFMOD_CARRIER)) {
g_RFmod->setSoundSubCarrier(*((int *)val));
}
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_RFMOD_ENABLE)) {
g_RFmod->setSoundEnable(*((int *)val));
}
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_RFMOD_CHANNEL)) {
}
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_RFMOD_FINETUNE)) {
}
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_RFMOD_STANDBY)) {
g_RFmod->setStandby(*((int *)val));
}
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_RFMOD_TEST)) {
g_RFmod->setTestPattern(*((int *)val));
}
return true;
}
bool CPauseSectionsdNotifier::changeNotify(const neutrino_locale_t, void * Data)
{
g_Sectionsd->setPauseScanning((*((int *)Data)) == 0);

10
src/system/setting_helpers.h
View File

@@ -118,16 +118,6 @@ class CLcdNotifier : public CChangeObserver
public:
bool changeNotify(const neutrino_locale_t, void *);
};
class CRfNotifier : public CChangeObserver
{
public:
bool changeNotify(const neutrino_locale_t, void *);
};
class CRfExec : public CMenuTarget
{
public:
int exec(CMenuTarget* parent, const std::string & actionKey);
};
class CPauseSectionsdNotifier : public CChangeObserver
{

34
src/system/settings.h
View File

@@ -64,7 +64,6 @@ struct SNeutrinoSettings
int zapto_pre_time;
int infobar_sat_display;
int infobar_subchan_disp_pos;
int misc_spts;
int fan_speed;
int infobar_show;
int show_infomenu;
@@ -80,7 +79,6 @@ struct SNeutrinoSettings
//audio
int audio_AnalogMode;
int audio_DolbyDigital;
int audio_avs_Control;
int auto_lang;
int auto_subs;
char audio_PCMOffset[3];
@@ -230,28 +228,17 @@ struct SNeutrinoSettings
//recording
int recording_type;
int recording_stopplayback;
int recording_stopsectionsd;
std::string recording_server_ip;
char recording_server_port[10];
int recording_server_wakeup;
char recording_server_mac[31];
int recording_vcr_no_scart;
char recording_splitsize[10];
int recording_use_o_sync;
int recording_use_fdatasync;
unsigned char recording_audio_pids_default;
int recording_audio_pids_std;
int recording_audio_pids_alt;
int recording_audio_pids_ac3;
int recording_stream_vtxt_pid;
int recording_stream_pmt_pid;
char recording_ringbuffers[10];
int recording_choose_direct_rec_dir;
int recording_epg_for_filename;
int recording_epg_for_end;
int recording_save_in_channeldir;
int recording_in_spts_mode;
int recording_zap_on_announce;
int shutdown_timer_record_type;
@@ -305,12 +292,6 @@ struct SNeutrinoSettings
int key_timeshift;
int key_plugin;
int rf_subcarrier;
int rf_soundenable;
int rf_channel;
int rf_finetune;
int rf_standby;
int key_unlock;
int cacheTXT;
int minimode;
@@ -423,18 +404,6 @@ struct SNeutrinoSettings
#define UTF8_TO_FILESYSTEM_ENCODING(a) (g_settings.filesystem_is_utf8 ? (a) : ZapitTools::UTF8_to_Latin1(a).c_str())
#define FILESYSTEM_ENCODING_TO_UTF8_STRING(a) (g_settings.filesystem_is_utf8 ? (a) : ZapitTools::Latin1_to_UTF8(a))
#if 0
#define MISC_SETTING_FILES_COUNT 7
#else
#define MISC_SETTING_FILES_COUNT 4
#endif
// #define MISC_SETTING_SPTS_MODE 0
int misc_option[MISC_SETTING_FILES_COUNT];
// pictureviewer
char picviewer_slide_time[3];
int picviewer_scaling;
@@ -468,8 +437,6 @@ struct SNeutrinoSettings
int power_standby;
int emlog;
int rotor_swap;
int ts_mode;
int hw_sect;
int hdd_sleep;
int hdd_noise;
int hdd_fs;
@@ -512,7 +479,6 @@ struct SNeutrinoSettings
ITEM_CLOCK = 19,
#if 0
ITEM_MOVIEPLAYER_TS,
ITEM_RESTART_CAMD,
#endif
ITEM_MAX // MUST be always the last in the list
} USER_ITEM;