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

- pick mipsbox code from DDT, TangoCash and max10

Browse Source 
Conflicts:
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2019-05-03 22:50:45 +02:00
committed by Thilo Graf
parent 15e8b2d5ea
commit 8991ed60f4
25 changed files with 148 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/neutrino.cpp
View File

@@ -427,13 +427,13 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.srs_algo = configfile.getInt32( "srs_algo", 1);
g_settings.srs_ref_volume = configfile.getInt32( "srs_ref_volume", 40);
g_settings.srs_nmgr_enable = configfile.getInt32( "srs_nmgr_enable", 0);
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
g_settings.ac3_pass = configfile.getInt32( "ac3_pass", 0);
g_settings.dts_pass = configfile.getInt32( "dts_pass", 0);
#else
g_settings.hdmi_dd = configfile.getInt32( "hdmi_dd", 0);
g_settings.spdif_dd = configfile.getInt32( "spdif_dd", 1);
#endif // HAVE_ARM_HARDWARE
#endif // HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
g_settings.analog_out = configfile.getInt32( "analog_out", 1);
g_settings.avsync = configfile.getInt32( "avsync", 1);
g_settings.clockrec = configfile.getInt32( "clockrec", 1);
@@ -457,7 +457,11 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.standby_cpufreq = configfile.getInt32("standby_cpufreq", 100);
g_settings.ci_standby_reset = configfile.getInt32("ci_standby_reset", 0);
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
g_settings.ci_clock = configfile.getInt32("ci_clock", 6);
#else
g_settings.ci_clock = configfile.getInt32("ci_clock", 9);
#endif
g_settings.ci_ignore_messages = configfile.getInt32("ci_ignore_messages", 0);
g_settings.ci_save_pincode = configfile.getInt32("ci_save_pincode", 0);
g_settings.ci_pincode = configfile.getString("ci_pincode", "");
@@ -717,7 +721,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.recording_stream_subtitle_pids = configfile.getBool("recordingmenu.stream_subtitle_pids", true);
g_settings.recording_stream_pmt_pid = configfile.getBool("recordingmenu.stream_pmt_pid" , false);
g_settings.recording_filename_template = configfile.getString("recordingmenu.filename_template" , "%C_%T_%d_%t");
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
g_settings.recording_bufsize = configfile.getInt32("recording_bufsize", 4);
g_settings.recording_bufsize_dmx = configfile.getInt32("recording_bufsize_dmx", 2);
#endif
@@ -1324,7 +1328,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32( "srs_algo", g_settings.srs_algo);
configfile.setInt32( "srs_ref_volume", g_settings.srs_ref_volume);
configfile.setInt32( "srs_nmgr_enable", g_settings.srs_nmgr_enable);
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
configfile.setInt32( "ac3_pass", g_settings.ac3_pass);
configfile.setInt32( "dts_pass", g_settings.dts_pass);
#else
@@ -1533,7 +1537,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setBool ("recordingmenu.stream_subtitle_pids" , g_settings.recording_stream_subtitle_pids );
configfile.setBool ("recordingmenu.stream_pmt_pid" , g_settings.recording_stream_pmt_pid );
configfile.setString("recordingmenu.filename_template" , g_settings.recording_filename_template );
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
configfile.setInt32 ("recording_bufsize" , g_settings.recording_bufsize);
configfile.setInt32 ("recording_bufsize_dmx" , g_settings.recording_bufsize_dmx);
#endif
@@ -2579,7 +2583,7 @@ TIMER_START();
// 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);
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
audioDecoder->SetHdmiDD(g_settings.ac3_pass ? true : false);
audioDecoder->SetSpdifDD(g_settings.dts_pass ? true : false);
#else
@@ -2892,7 +2896,7 @@ void CNeutrinoApp::RealRun()
if (msg <= CRCInput::RC_MaxRC)
CScreenSaver::getInstance()->resetIdleTime();
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
if (mode == NeutrinoModes::mode_radio)
#else
if (mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio)