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

remove unused startchanneltv_nr/startchannelradio_nr

Browse Source
This commit is contained in:
[CST] Focus
2012-06-27 14:31:58 +04:00
parent 52150ba7ab
commit 2448d898a9
4 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/zapit_setup.cpp
View File

@@ -129,13 +129,11 @@ int CSelectChannelWidget::exec(CMenuTarget* parent, const std::string& actionKey
{ {
g_settings.StartChannelTV = actionKey.substr(actionKey.find_first_of("#")+1); g_settings.StartChannelTV = actionKey.substr(actionKey.find_first_of("#")+1);
g_settings.startchanneltv_id = channel_id; g_settings.startchanneltv_id = channel_id;
g_settings.startchanneltv_nr = cnr-1;
} }
else if (strncmp(actionKey.c_str(), "ZCR:", 4) == 0)//...radio else if (strncmp(actionKey.c_str(), "ZCR:", 4) == 0)//...radio
{ {
g_settings.StartChannelRadio = actionKey.substr(actionKey.find_first_of("#")+1); g_settings.StartChannelRadio = actionKey.substr(actionKey.find_first_of("#")+1);
g_settings.startchannelradio_id= channel_id; g_settings.startchannelradio_id= channel_id;
g_settings.startchannelradio_nr = cnr-1;
} }
// ...leave bouquet/channel menu and show a refreshed zapit menu with current start channel(s) // ...leave bouquet/channel menu and show a refreshed zapit menu with current start channel(s)

6
src/neutrino.cpp
View File

@@ -701,8 +701,6 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.StartChannelRadio = configfile.getString("startchannelradio",""); g_settings.StartChannelRadio = configfile.getString("startchannelradio","");
g_settings.startchanneltv_id = configfile.getInt64("startchanneltv_id", 0); g_settings.startchanneltv_id = configfile.getInt64("startchanneltv_id", 0);
g_settings.startchannelradio_id = configfile.getInt64("startchannelradio_id", 0); g_settings.startchannelradio_id = configfile.getInt64("startchannelradio_id", 0);
g_settings.startchanneltv_nr = configfile.getInt32("startchanneltv_nr", 0);
g_settings.startchannelradio_nr = configfile.getInt32("startchannelradio_nr", 0);
g_settings.uselastchannel = configfile.getInt32("uselastchannel" , 1); g_settings.uselastchannel = configfile.getInt32("uselastchannel" , 1);
@@ -1105,8 +1103,6 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setString( "startchannelradio", g_settings.StartChannelRadio ); configfile.setString( "startchannelradio", g_settings.StartChannelRadio );
configfile.setInt64("startchanneltv_id", g_settings.startchanneltv_id); configfile.setInt64("startchanneltv_id", g_settings.startchanneltv_id);
configfile.setInt64("startchannelradio_id", g_settings.startchannelradio_id); configfile.setInt64("startchannelradio_id", g_settings.startchannelradio_id);
configfile.setInt32("startchanneltv_nr", g_settings.startchanneltv_nr);
configfile.setInt32("startchannelradio_nr", g_settings.startchannelradio_nr);
configfile.setInt32("uselastchannel", g_settings.uselastchannel); configfile.setInt32("uselastchannel", g_settings.uselastchannel);
// USERMENU // USERMENU
@@ -1762,8 +1758,6 @@ TIMER_START();
Z_start_arg ZapStart_arg; Z_start_arg ZapStart_arg;
ZapStart_arg.startchanneltv_id = g_settings.startchanneltv_id; ZapStart_arg.startchanneltv_id = g_settings.startchanneltv_id;
ZapStart_arg.startchannelradio_id = g_settings.startchannelradio_id; ZapStart_arg.startchannelradio_id = g_settings.startchannelradio_id;
ZapStart_arg.startchanneltv_nr = g_settings.startchanneltv_nr;
ZapStart_arg.startchannelradio_nr = g_settings.startchannelradio_nr;
ZapStart_arg.uselastchannel = g_settings.uselastchannel; ZapStart_arg.uselastchannel = g_settings.uselastchannel;
ZapStart_arg.video_mode = g_settings.video_Mode; ZapStart_arg.video_mode = g_settings.video_Mode;
ZapStart_arg.ci_clock = g_settings.ci_clock; ZapStart_arg.ci_clock = g_settings.ci_clock;

2
src/system/settings.h
View File

@@ -535,8 +535,6 @@ struct SNeutrinoSettings
std::string StartChannelRadio; std::string StartChannelRadio;
t_channel_id startchanneltv_id; t_channel_id startchanneltv_id;
t_channel_id startchannelradio_id; t_channel_id startchannelradio_id;
int startchanneltv_nr;
int startchannelradio_nr;
int uselastchannel; int uselastchannel;
int power_standby; int power_standby;

2
src/zapit/include/zapit/zapit.h
View File

@@ -31,8 +31,6 @@ typedef struct ZAPIT_start_arg
{ {
t_channel_id startchanneltv_id; t_channel_id startchanneltv_id;
t_channel_id startchannelradio_id; t_channel_id startchannelradio_id;
int startchanneltv_nr;
int startchannelradio_nr;
int uselastchannel; int uselastchannel;
int video_mode; int video_mode;
int ci_clock; int ci_clock;