diff --git a/src/gui/zapit_setup.cpp b/src/gui/zapit_setup.cpp index 97cc14bed..117a70c03 100644 --- a/src/gui/zapit_setup.cpp +++ b/src/gui/zapit_setup.cpp @@ -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_id = channel_id; - g_settings.startchanneltv_nr = cnr-1; } else if (strncmp(actionKey.c_str(), "ZCR:", 4) == 0)//...radio { g_settings.StartChannelRadio = actionKey.substr(actionKey.find_first_of("#")+1); 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) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 23e1ba71c..04a4e483e 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -701,8 +701,6 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.StartChannelRadio = configfile.getString("startchannelradio",""); g_settings.startchanneltv_id = configfile.getInt64("startchanneltv_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); @@ -1105,8 +1103,6 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setString( "startchannelradio", g_settings.StartChannelRadio ); configfile.setInt64("startchanneltv_id", g_settings.startchanneltv_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); // USERMENU @@ -1762,8 +1758,6 @@ TIMER_START(); Z_start_arg ZapStart_arg; ZapStart_arg.startchanneltv_id = g_settings.startchanneltv_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.video_mode = g_settings.video_Mode; ZapStart_arg.ci_clock = g_settings.ci_clock; diff --git a/src/system/settings.h b/src/system/settings.h index 0bd81be2d..cd3939f4f 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -535,8 +535,6 @@ struct SNeutrinoSettings std::string StartChannelRadio; t_channel_id startchanneltv_id; t_channel_id startchannelradio_id; - int startchanneltv_nr; - int startchannelradio_nr; int uselastchannel; int power_standby; diff --git a/src/zapit/include/zapit/zapit.h b/src/zapit/include/zapit/zapit.h index 08d96a1fc..880ddcae0 100644 --- a/src/zapit/include/zapit/zapit.h +++ b/src/zapit/include/zapit/zapit.h @@ -31,8 +31,6 @@ typedef struct ZAPIT_start_arg { t_channel_id startchanneltv_id; t_channel_id startchannelradio_id; - int startchanneltv_nr; - int startchannelradio_nr; int uselastchannel; int video_mode; int ci_clock;