- pick mipsbox code from DDT, TangoCash and max10

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

View File

@@ -252,13 +252,13 @@ struct SNeutrinoSettings
int srs_algo;
int srs_ref_volume;
int srs_nmgr_enable;
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
int ac3_pass;
int dts_pass;
#else
int hdmi_dd;
int spdif_dd;
#endif // HAVE_ARM_HARDWARE
#endif // HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
int analog_out;
int audio_volume_percent_ac3;
int audio_volume_percent_pcm;
@@ -508,7 +508,7 @@ struct SNeutrinoSettings
int recording_stream_vtxt_pid;
int recording_stream_subtitle_pids;
int recording_stream_pmt_pid;
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
int recording_bufsize;
int recording_bufsize_dmx;
#endif