mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 02:11:11 +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

8
src/gui/audio_setup.cpp
View File

@@ -154,7 +154,7 @@ int CAudioSetup::showAudioSetup()
CMenuOptionChooser * as_oj_ddsubchn = new CMenuOptionChooser(LOCALE_AUDIOMENU_DOLBYDIGITAL, &g_settings.audio_DolbyDigital, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, audioSetupNotifier);
as_oj_ddsubchn->setHint("", LOCALE_MENU_HINT_AUDIO_DD);
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
CMenuOptionChooser * as_oj_ac3 = new CMenuOptionChooser(LOCALE_AUDIOMENU_AC3, &g_settings.ac3_pass, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, audioSetupNotifier);
as_oj_ac3->setHint("", LOCALE_MENU_HINT_AUDIO_AC3);
@@ -171,7 +171,7 @@ int CAudioSetup::showAudioSetup()
//dd via spdif
CMenuOptionChooser * as_oj_dd_spdif = new CMenuOptionChooser(LOCALE_AUDIOMENU_SPDIF_DD, &g_settings.spdif_dd, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, audioSetupNotifier);
as_oj_dd_spdif->setHint("", LOCALE_MENU_HINT_AUDIO_SPDIF_DD);
#endif // HAVE_ARM_HARDWARE
#endif // HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
CMenuOptionChooser * as_oj_avsync = NULL;
CMenuOptionNumberChooser * as_oj_vsteps = NULL;
@@ -235,14 +235,14 @@ int CAudioSetup::showAudioSetup()
audioSettings->addItem(as_oj_analogmode);
audioSettings->addItem(GenericMenuSeparatorLine);
//---------------------------------------------------------
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
audioSettings->addItem(as_oj_ac3);
audioSettings->addItem(as_oj_dts);
#else
if (g_info.hw_caps->has_HDMI)
audioSettings->addItem(as_oj_dd_hdmi);
audioSettings->addItem(as_oj_dd_spdif);
#endif // HAVE_ARM_HARDWARE
#endif // HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
audioSettings->addItem(as_oj_ddsubchn);
//---------------------------------------------------------
audioSettings->addItem(GenericMenuSeparatorLine);

2
src/gui/audiomute.cpp
View File

@@ -64,7 +64,7 @@ void CAudioMute::AudioMute(int newValue, bool isEvent)
CVFD::getInstance()->setMuted(newValue);
neutrino->setCurrentMuted(newValue);
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
if (g_settings.hdmi_cec_volume)
hdmi_cec::getInstance()->toggle_mute();
else

47
src/gui/cam_menu.cpp
View File

@@ -54,6 +54,31 @@
#include <zapit/zapit.h>
#include <driver/abstime.h>
#if 0 //CA init
extern Zapit_config zapitCfg;
const CMenuOptionChooser::keyval OPTIONS_CA_INIT_OPTIONS[] =
{
{ 0, LOCALE_CA_INIT_0 },
{ 1, LOCALE_CA_INIT_1 },
{ 2, LOCALE_CA_INIT_2 }
};
#define OPTIONS_CA_INIT_OPTION_COUNT (sizeof(OPTIONS_CA_INIT_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
const CMenuOptionChooser::keyval OPTIONS_CI_MODE_OPTIONS[] =
{
{ 0, LOCALE_CI_MODE_0 },
{ 1, LOCALE_CI_MODE_1 },
{ 2, LOCALE_CI_MODE_2 }
};
#define OPTIONS_CI_MODE_OPTION_COUNT (sizeof(OPTIONS_CI_MODE_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
#define CI_CLOCK_OPTION_COUNT 2
static const CMenuOptionChooser::keyval CI_CLOCK_OPTIONS[CI_CLOCK_OPTION_COUNT] = {
{ 6, LOCALE_CI_CLOCK_NORMAL },
{ 7, LOCALE_CI_CLOCK_HIGH }
};
#endif
void CCAMMenuHandler::init(void)
{
hintBox = NULL;
@@ -107,14 +132,30 @@ int CCAMMenuHandler::doMainMenu()
CMenuWidget* cammenu = new CMenuWidget(LOCALE_CI_SETTINGS, NEUTRINO_ICON_SETTINGS);
cammenu->addIntroItems();
#if 0 //CA init CI|CARD|BOTH
CZapit::getInstance()->GetConfig(zapitCfg);
CMenuOptionChooser *ca_init = new CMenuOptionChooser(LOCALE_CA_INIT, (int *)&zapitCfg.cam_ci, OPTIONS_CA_INIT_OPTIONS, OPTIONS_CA_INIT_OPTION_COUNT, true, NULL);
ca_init->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_CA_INIT);
cammenu->addItem(ca_init);
cammenu->addItem(GenericMenuSeparator);
#endif
int CiSlots = ca ? ca->GetNumberCISlots() : 0;
if(CiSlots) {
cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_RESET_STANDBY, &g_settings.ci_standby_reset, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_CLOCK, &g_settings.ci_clock, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
#else
cammenu->addItem( new CMenuOptionNumberChooser(LOCALE_CI_CLOCK, &g_settings.ci_clock, true, 6, 12, this));
#endif
}
cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_IGNORE_MSG, &g_settings.ci_ignore_messages, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_SAVE_PINCODE, &g_settings.ci_save_pincode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
#if 0
cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_REC_ZAPTO, &g_settings.ci_rec_zapto, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
CMenuOptionChooser *ci_mode = new CMenuOptionChooser(LOCALE_CI_MODE, &g_settings.ci_mode, OPTIONS_CI_MODE_OPTIONS, OPTIONS_CI_MODE_OPTION_COUNT, true, NULL);
ci_mode->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_CI_MODE);
cammenu->addItem(ci_mode);
#endif
#ifdef BOXMODEL_CS_HD2
int fecount = CFEManager::getInstance()->getFrontendCount();
char fename[fecount+1][255];
@@ -201,6 +242,10 @@ int CCAMMenuHandler::doMainMenu()
ret = cammenu->exec(NULL, "");
delete cammenu;
in_menu = false;
#if 0 //CA init
CZapit::getInstance()->SetConfig(&zapitCfg);
#endif
return ret;
}

6
src/gui/cec_setup.cpp
View File

@@ -97,7 +97,7 @@ int CCECSetup::showMenu()
cec1->setHint("", LOCALE_MENU_HINT_CEC_VIEW_ON);
cec2 = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_CEC_STANDBY, &g_settings.hdmi_cec_standby, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF, this);
cec2->setHint("", LOCALE_MENU_HINT_CEC_STANDBY);
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
cec3 = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_CEC_VOLUME, &g_settings.hdmi_cec_volume, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF, this);
cec3->setHint("", LOCALE_MENU_HINT_CEC_VOLUME);
#endif
@@ -107,7 +107,7 @@ int CCECSetup::showMenu()
//-------------------------------------------------------
cec->addItem(cec1);
cec->addItem(cec2);
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
cec->addItem(cec3);
#endif
@@ -133,7 +133,7 @@ bool CCECSetup::changeNotify(const neutrino_locale_t OptionName, void * /*data*/
printf("[neutrino CEC Settings] %s set CEC settings...\n", __FUNCTION__);
cec1->setActive(g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF);
cec2->setActive(g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF);
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
cec3->setActive(g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF);
#endif
videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode);

2
src/gui/hdd_menu.cpp
View File

@@ -213,7 +213,7 @@ void CHDDMenuHandler::getBlkIds()
hdd_s hdd;
hdd.devname = std::string(buff + 5);
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
if (strncmp(hdd.devname.c_str(), "mmcblk", 6) == 0)
continue;
#endif

2
src/gui/movieplayer.cpp
View File

@@ -85,7 +85,7 @@
#include <gui/infoicons.h>
#endif
#if HAVE_COOL_HARDWARE || HAVE_ARM_HARDWARE
#if HAVE_COOL_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
#define LCD_MODE CVFD::MODE_MENU_UTF8
#else
#define LCD_MODE CVFD::MODE_MOVIE

2
src/gui/record_setup.cpp
View File

@@ -249,7 +249,7 @@ int CRecordSetup::showRecordSetup()
cover->setHint("", LOCALE_MENU_HINT_RECORD_AUTO_COVER);
recordingSettings->addItem(cover);
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
CMenuOptionNumberChooser *ch;
ch = new CMenuOptionNumberChooser(LOCALE_EXTRA_RECORD_BUFSIZE, &g_settings.recording_bufsize, true, 1, 25, NULL);

11
src/gui/update.cpp
View File

@@ -78,7 +78,7 @@
#include <cs_api.h>
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
#include <hardware/video.h>
extern cVideo * videoDecoder;
#endif
@@ -94,7 +94,7 @@ extern int allow_flash;
#define LIST_OF_UPDATES_LOCAL_FILENAME "update.list"
// TODO: move this mess below to libstb-hal
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
#define FILEBROWSER_UPDATE_FILTER "tgz"
#define MTD_OF_WHOLE_IMAGE 999
#define MTD_DEVICE_OF_UPDATE_PART "/dev/mtd999"
@@ -361,7 +361,8 @@ bool CFlashUpdate::selectHttpImage(void)
}
}
#endif
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
if ((fileType <= '2') && (filename.substr(filename.find_last_of(".") + 1) == "tgz"))
{
// manipulate fileType for tgz-packages
@@ -631,8 +632,8 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey)
free(buffer);
}
}
#if HAVE_ARM_HARDWARE
else if (fileType == 'Z')
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
else if (fileType == 'Z') // flashing image with ofgwrite
{
showGlobalStatus(100);