- 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

@@ -176,7 +176,7 @@ void CRecordInstance::WaitRecMsg(time_t StartTime, time_t WaitTime)
usleep(100000);
}
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
void recordingFailureHelper(void *data)
{
CRecordInstance *inst = (CRecordInstance *) data;
@@ -276,7 +276,7 @@ record_error_msg_t CRecordInstance::Start(CZapitChannel * channel)
if (record == NULL)
{
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
record = new cRecord(channel->getRecordDemux(), g_settings.recording_bufsize_dmx * 1024 * 1024, g_settings.recording_bufsize * 1024 * 1024);
record->setFailureCallback(&recordingFailureHelper, this);
#else