mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-29 16:31:11 +02:00
Merge branch 'dvbsi++' into next
This commit is contained in:
@@ -1782,8 +1782,7 @@ TIMER_START();
|
||||
ZapStart_arg.volume = g_settings.current_volume;
|
||||
|
||||
/* create decoders, read channels */
|
||||
CZapit::getInstance()->Start(&ZapStart_arg);
|
||||
|
||||
bool zapit_init = CZapit::getInstance()->Start(&ZapStart_arg);
|
||||
// init audio settings
|
||||
audioDecoder->SetSRS(g_settings.srs_enable, g_settings.srs_nmgr_enable, g_settings.srs_algo, g_settings.srs_ref_volume);
|
||||
//audioDecoder->setVolume(g_settings.current_volume, g_settings.current_volume);
|
||||
@@ -1801,6 +1800,12 @@ TIMER_START();
|
||||
|
||||
g_RCInput = new CRCInput();
|
||||
|
||||
/* later on, we'll crash anyway, so tell about it. */
|
||||
if (! zapit_init)
|
||||
ShowMsgUTF(LOCALE_MESSAGEBOX_INFO,
|
||||
"Zapit initialization failed.\nThis is a fatal error, sorry.",
|
||||
CMessageBox::mbrBack, CMessageBox::mbBack);
|
||||
|
||||
InitZapitClient();
|
||||
g_Zapit->setStandby(false);
|
||||
|
||||
@@ -1825,10 +1830,7 @@ TIMER_START();
|
||||
cpuFreq = new cCpuFreqManager();
|
||||
cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000);
|
||||
|
||||
g_info.delivery_system = DVB_S;
|
||||
if(CFEManager::getInstance()->getLiveFE() != NULL){
|
||||
g_info.delivery_system = CFEManager::getInstance()->getLiveFE()->getInfo()->type == FE_QPSK ? DVB_S : DVB_C;
|
||||
}
|
||||
g_info.delivery_system = CFEManager::getInstance()->getLiveFE()->getInfo()->type == FE_QPSK ? DVB_S : DVB_C;
|
||||
|
||||
g_info.delivery_system = CFEManager::getInstance()->getLiveFE()->getInfo()->type == FE_QPSK ? DVB_S : DVB_C;
|
||||
#if HAVE_TRIPLEDRAGON
|
||||
|
Reference in New Issue
Block a user