mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +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


Origin commit data
------------------
Commit: 5743a6dd29
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-12-25 (Sun, 25 Dec 2011)
This commit is contained in:
[CST] Focus
2011-12-25 12:37:16 +00:00
parent bf0db08679
commit 8a3e4e1f25
9 changed files with 5 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/Makefile.am
View File

@@ -24,14 +24,12 @@ libneutrino_driver_a_SOURCES = \
record.cpp \
audioplay.cpp \
screen_max.cpp \
slotbuffer.c \
file.cpp \
audiometadata.cpp \
audiofile.cpp \
shutdown_count.cpp \
genpsi.c \
streamts.cpp \
rfmod.cpp \
radiotools.cpp \
radiotext.cpp \
fade.cpp \

52
src/neutrino.cpp
View File

@@ -408,7 +408,6 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.audio_AnalogMode = configfile.getInt32( "audio_AnalogMode", 0 );
g_settings.audio_DolbyDigital = configfile.getBool("audio_DolbyDigital" , false);
g_settings.audio_avs_Control = false;
g_settings.auto_lang = configfile.getInt32( "auto_lang", 0 );
g_settings.auto_subs = configfile.getInt32( "auto_subs", 0 );
@@ -564,28 +563,17 @@ int CNeutrinoApp::loadSetup(const char * fname)
//recording (server + vcr)
g_settings.recording_type = configfile.getInt32("recording_type", RECORDING_FILE);
g_settings.recording_stopplayback = configfile.getBool("recording_stopplayback" , false);
g_settings.recording_stopsectionsd = configfile.getBool("recording_stopsectionsd" , false );
g_settings.recording_server_ip = configfile.getString("recording_server_ip", "127.0.0.1");
strcpy( g_settings.recording_server_port, configfile.getString( "recording_server_port", "4000").c_str() );
g_settings.recording_server_wakeup = configfile.getInt32( "recording_server_wakeup", 0 );
strcpy( g_settings.recording_server_mac, configfile.getString( "recording_server_mac", "11:22:33:44:55:66").c_str() );
g_settings.recording_vcr_no_scart = configfile.getInt32( "recording_vcr_no_scart", false);
strcpy( g_settings.recording_splitsize, configfile.getString( "recording_splitsize", "2048").c_str() );
g_settings.recording_use_o_sync = configfile.getBool("recordingmenu.use_o_sync" , false);
g_settings.recording_use_fdatasync = configfile.getBool("recordingmenu.use_fdatasync" , false);
g_settings.recording_audio_pids_default = configfile.getInt32("recording_audio_pids_default", TIMERD_APIDS_STD | TIMERD_APIDS_AC3);
g_settings.recording_zap_on_announce = configfile.getBool("recording_zap_on_announce" , false);
g_settings.shutdown_timer_record_type = configfile.getBool("shutdown_timer_record_type" , false);
g_settings.recording_stream_vtxt_pid = configfile.getBool("recordingmenu.stream_vtxt_pid" , false);
g_settings.recording_stream_pmt_pid = configfile.getBool("recordingmenu.stream_pmt_pid" , false);
strcpy( g_settings.recording_ringbuffers, configfile.getString( "recordingmenu.ringbuffers", "20").c_str() );
g_settings.recording_choose_direct_rec_dir = configfile.getInt32( "recording_choose_direct_rec_dir", 0 );
g_settings.recording_epg_for_filename = configfile.getBool("recording_epg_for_filename" , true);
g_settings.recording_epg_for_end = configfile.getBool("recording_epg_for_end" , false);
g_settings.recording_save_in_channeldir = configfile.getBool("recording_save_in_channeldir" , false);
g_settings.recording_in_spts_mode = true;
// default plugin for movieplayer
g_settings.movieplayer_plugin = configfile.getString( "movieplayer_plugin", "Teletext" );
@@ -596,12 +584,6 @@ int CNeutrinoApp::loadSetup(const char * fname)
loadKeys();
g_settings.timeshift_pause = configfile.getInt32( "timeshift_pause", 1 );
//rfmod
g_settings.rf_subcarrier = configfile.getInt32( "rf_subcarrier", 1);
g_settings.rf_soundenable = configfile.getInt32( "rf_soundenable", 0);
g_settings.rf_channel = configfile.getInt32( "rf_channel", 36);
g_settings.rf_finetune = configfile.getInt32( "rf_finetune", 0);
g_settings.rf_standby = configfile.getInt32( "rf_standby", 0);
g_settings.cacheTXT = configfile.getInt32( "cacheTXT", 0);
g_settings.minimode = configfile.getInt32( "minimode", 0);
@@ -855,7 +837,6 @@ void CNeutrinoApp::saveSetup(const char * fname)
//audio
configfile.setInt32( "audio_AnalogMode", g_settings.audio_AnalogMode );
configfile.setBool("audio_DolbyDigital" , g_settings.audio_DolbyDigital );
configfile.setInt32( "audio_avs_Control", g_settings.audio_avs_Control );
configfile.setInt32( "auto_lang", g_settings.auto_lang );
configfile.setInt32( "auto_subs", g_settings.auto_subs );
for(int i = 0; i < 3; i++) {
@@ -981,16 +962,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
//recording (server + vcr)
configfile.setInt32 ("recording_type", g_settings.recording_type);
configfile.setBool ("recording_stopplayback" , g_settings.recording_stopplayback );
configfile.setBool ("recording_stopsectionsd" , g_settings.recording_stopsectionsd );
configfile.setString("recording_server_ip", g_settings.recording_server_ip);
configfile.setString("recording_server_port", g_settings.recording_server_port);
configfile.setInt32 ("recording_server_wakeup", g_settings.recording_server_wakeup);
configfile.setString("recording_server_mac", g_settings.recording_server_mac);
configfile.setInt32 ("recording_vcr_no_scart", g_settings.recording_vcr_no_scart);
configfile.setString("recording_splitsize", g_settings.recording_splitsize);
configfile.setBool ("recordingmenu.use_o_sync" , g_settings.recording_use_o_sync );
configfile.setBool ("recordingmenu.use_fdatasync" , g_settings.recording_use_fdatasync );
configfile.setInt32 ("recording_audio_pids_default" , g_settings.recording_audio_pids_default);
configfile.setBool ("recording_zap_on_announce" , g_settings.recording_zap_on_announce );
@@ -998,12 +970,10 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setBool ("recordingmenu.stream_vtxt_pid" , g_settings.recording_stream_vtxt_pid );
configfile.setBool ("recordingmenu.stream_pmt_pid" , g_settings.recording_stream_pmt_pid );
configfile.setString("recordingmenu.ringbuffers" , g_settings.recording_ringbuffers);
configfile.setInt32 ("recording_choose_direct_rec_dir" , g_settings.recording_choose_direct_rec_dir);
configfile.setBool ("recording_epg_for_filename" , g_settings.recording_epg_for_filename );
configfile.setBool ("recording_epg_for_end" , g_settings.recording_epg_for_end );
configfile.setBool ("recording_save_in_channeldir" , g_settings.recording_save_in_channeldir );
configfile.setBool ("recording_in_spts_mode" , g_settings.recording_in_spts_mode );
// default plugin for movieplayer
configfile.setString ( "movieplayer_plugin", g_settings.movieplayer_plugin );
@@ -1011,12 +981,6 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setString ( "plugin_hdd_dir", g_settings.plugin_hdd_dir );
configfile.setString ( "logo_hdd_dir", g_settings.logo_hdd_dir );
configfile.setInt32( "rf_subcarrier", g_settings.rf_subcarrier);
configfile.setInt32( "rf_soundenable", g_settings.rf_soundenable);
configfile.setInt32( "rf_channel", g_settings.rf_channel);
configfile.setInt32( "rf_finetune", g_settings.rf_finetune);
configfile.setInt32( "rf_standby", g_settings.rf_standby);
saveKeys();
configfile.setInt32( "timeshift_pause", g_settings.timeshift_pause );
@@ -2230,7 +2194,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
g_Zapit->getVolume(&volume, &volume);
current_volume = 100 - volume*100/63;
printf("zapit volume %d new current %d mode %d\n", volume, current_volume, g_settings.audio_AnalogMode);
setvol(current_volume,(g_settings.audio_avs_Control));
setvol(current_volume);
#endif
g_RCInput->killTimer(scrambled_timer);
@@ -2672,14 +2636,6 @@ _repeat:
}
else if( msg == NeutrinoMessages::ANNOUNCE_RECORD) {
system(NEUTRINO_RECORDING_TIMER_SCRIPT);
#if 0 // FIXME: we dont have menu to config g_settings.recording_server_mac. Outdated code ?
if( g_settings.recording_server_wakeup ) {
std::string command = "ether-wake ";
command += g_settings.recording_server_mac;
if(system(command.c_str()) != 0)
perror("ether-wake failed");
}
#endif
if (g_settings.recording_type == RECORDING_FILE) {
char * recordingDir = ((CTimerd::RecordingInfo*)data)->recordingDir;
for(int i=0 ; i < NETWORK_NFS_NR_OF_ENTRIES ; i++) {
@@ -3108,7 +3064,7 @@ printf("AudioMute: current %d new %d isEvent: %d\n", current_muted, newValue, is
}
}
void CNeutrinoApp::setvol(int vol, int /*avs*/)
void CNeutrinoApp::setvol(int vol)
{
audioDecoder->setVolume(vol, vol);
}
@@ -3217,12 +3173,12 @@ printf("CNeutrinoApp::setVolume dx %d dy %d\n", dx, dy);
break;
}
setvol(g_settings.current_volume,(g_settings.audio_avs_Control));
setvol(g_settings.current_volume);
timeoutEnd = CRCInput::calcTimeoutEnd(nowait ? 1 : 3);
}
else if (msg == NeutrinoMessages::EVT_VOLCHANGED) {
//current_volume = g_Controld->getVolume((CControld::volume_type)g_settings.audio_avs_Control);//FIXME
//printf("setVolume EVT_VOLCHANGED %d\n", current_volume);
//printf("setVolume EVT_VOLCHANGED %d\n", current_volume);
timeoutEnd = CRCInput::calcTimeoutEnd(3);
}
else if (handleMsg(msg, data) & messages_return::unhandled) {

2
src/neutrino.h
View File

@@ -154,7 +154,7 @@ private:
void scartMode( bool bOnOff );
void standbyMode( bool bOnOff );
void AudioMute( int newValue, bool isEvent= false );
void setvol(int vol, int avs);
void setvol(int vol);
void saveEpg();
void ExitRun(const bool write_si = true, int retcode = 0);

23
src/neutrino_menue.cpp
View File

@@ -183,29 +183,6 @@ void CNeutrinoApp::InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings
#ifdef TEST_MENU
mainMenu.addItem(new CMenuForwarderNonLocalized("Test menu", true, NULL, new CTestMenu()));
#endif
#if 0
g_RFmod = new RFmod();
if (g_RFmod->rfmodfd >=0) {
g_RFmod->init();
CMenuWidget * rfmenu = new CMenuWidget(LOCALE_RFMOD, NEUTRINO_ICON_SETTINGS);
CRfNotifier * rfnot = new CRfNotifier();
CRfExec * rfexec = new CRfExec();
rfmenu->addItem( GenericMenuBack );
rfmenu->addItem( new CMenuForwarder(LOCALE_RECORDINGMENU_SETUPNOW, true, NULL, rfexec, "savesettings", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));
rfmenu->addItem( GenericMenuSeparatorLine );
rfmenu->addItem( new CMenuOptionChooser(LOCALE_RF_CARRIER, &g_settings.rf_subcarrier, RF_CARRIER_OPTIONS, RF_CARRIER_OPTION_COUNT, true, rfnot));
rfmenu->addItem( new CMenuOptionChooser(LOCALE_RF_ENABLE, &g_settings.rf_soundenable, OPTIONS_OFF1_ON0_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, rfnot));
rfmenu->addItem( new CMenuOptionNumberChooser(LOCALE_RF_CHANNEL, &g_settings.rf_channel, true, 21, 69) );
rfmenu->addItem( new CMenuOptionNumberChooser(LOCALE_RF_FINETUNE, &g_settings.rf_finetune, true, 0, 64) );
rfmenu->addItem( new CMenuOptionChooser(LOCALE_RF_STANDBY, &g_settings.rf_standby, OPTIONS_OFF1_ON0_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, rfnot));
rf_dummy = 0;
rfmenu->addItem( new CMenuOptionChooser(LOCALE_RF_TEST, &rf_dummy, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, rfnot));
mainSettings.addItem(new CMenuForwarder(LOCALE_RFMOD, true, NULL, rfmenu));
}
#endif
}
#define FLASHUPDATE_UPDATEMODE_OPTION_COUNT 2

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;