mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-01 18:01:06 +02:00
Zap when recording needs CAM
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7556db08f2
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-05-31 (Tue, 31 May 2016)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -453,6 +453,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
|
||||
g_settings.ci_save_pincode = configfile.getInt32("ci_save_pincode", 0);
|
||||
g_settings.ci_pincode = configfile.getString("ci_pincode", "");
|
||||
g_settings.ci_tuner = configfile.getInt32("ci_tuner", -1);
|
||||
g_settings.ci_rec_zapto = configfile.getInt32("ci_rec_zapto", 0); //NI
|
||||
|
||||
#ifndef CPU_FREQ
|
||||
g_settings.cpufreq = 0;
|
||||
@@ -1071,6 +1072,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
|
||||
configfile.setInt32("ci_save_pincode", g_settings.ci_save_pincode);
|
||||
configfile.setString("ci_pincode", g_settings.ci_pincode);
|
||||
configfile.setInt32("ci_tuner", g_settings.ci_tuner);
|
||||
configfile.setInt32("ci_rec_zapto", g_settings.ci_rec_zapto); //NI
|
||||
|
||||
configfile.setInt32( "make_hd_list", g_settings.make_hd_list);
|
||||
configfile.setInt32( "make_webtv_list", g_settings.make_webtv_list);
|
||||
@@ -3252,7 +3254,12 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
|
||||
if((eventinfo->channel_id != live_channel_id) && !(SAME_TRANSPONDER(live_channel_id, eventinfo->channel_id)))
|
||||
zapTo(eventinfo->channel_id);
|
||||
}
|
||||
|
||||
//NI zap to CI Channel
|
||||
if(g_settings.ci_rec_zapto){
|
||||
CZapitChannel * ch = CServiceManager::getInstance()->FindChannel(eventinfo->channel_id);
|
||||
if (ch && ch->bUseCI && (eventinfo->channel_id != live_channel_id))
|
||||
zapTo(eventinfo->channel_id);
|
||||
}
|
||||
if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) {
|
||||
CRecordManager::getInstance()->Record(eventinfo);
|
||||
autoshift = CRecordManager::getInstance()->TimeshiftOnly();
|
||||
|
Reference in New Issue
Block a user