diff --git a/src/driver/simple_display.cpp b/src/driver/simple_display.cpp index 107369af0..b88114667 100644 --- a/src/driver/simple_display.cpp +++ b/src/driver/simple_display.cpp @@ -150,7 +150,7 @@ static void setlcdparam(void) static void replace_umlauts(std::string __attribute__((unused)) &s) { -#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4KSE || BOXMODEL_VUDUO4K || BOXMODEL_VUDUO4KSE || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_E4HDULTRA || BOXMODEL_VUDUO2 +#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4KSE || BOXMODEL_VUDUO4K || BOXMODEL_VUDUO4KSE || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_E4HDULTRA || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO return; #else /* this is crude, it just replaces ÄÖÜ with AOU since the display can't show them anyway */ diff --git a/src/gui/audio_select.cpp b/src/gui/audio_select.cpp index 878efccf0..d32961e4a 100644 --- a/src/gui/audio_select.cpp +++ b/src/gui/audio_select.cpp @@ -70,7 +70,7 @@ CAudioSelectMenuHandler::~CAudioSelectMenuHandler() } -#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 #define AUDIOMENU_ANALOGOUT_OPTION_COUNT 3 const CMenuOptionChooser::keyval AUDIOMENU_ANALOGOUT_OPTIONS[AUDIOMENU_ANALOGOUT_OPTION_COUNT] = { @@ -189,7 +189,7 @@ int CAudioSelectMenuHandler::doMenu () AudioSelector->addItem(fw, sel_apid == i); } unsigned int shortcut_num = p_count; -#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 if (p_count) AudioSelector->addItem(GenericMenuSeparatorLine); diff --git a/src/gui/audio_setup.cpp b/src/gui/audio_setup.cpp index 0403c0693..4c6c8dfaa 100644 --- a/src/gui/audio_setup.cpp +++ b/src/gui/audio_setup.cpp @@ -87,7 +87,7 @@ int CAudioSetup::exec(CMenuTarget *parent, const std::string &actionKey) return res; } -#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 #define AUDIOMENU_ANALOGOUT_OPTION_COUNT 3 const CMenuOptionChooser::keyval AUDIOMENU_ANALOGOUT_OPTIONS[AUDIOMENU_ANALOGOUT_OPTION_COUNT] = { @@ -122,7 +122,7 @@ int CAudioSetup::showAudioSetup() CMenuWidget *audioSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width); audioSettings->setSelected(selected); audioSettings->setWizardMode(is_wizard); -#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 //analog modes (stereo, mono l/r...) CMenuOptionChooser *as_oj_analogmode = new CMenuOptionChooser(LOCALE_AUDIOMENU_ANALOG_MODE, &g_settings.audio_AnalogMode, AUDIOMENU_ANALOGOUT_OPTIONS, AUDIOMENU_ANALOGOUT_OPTION_COUNT, true, audioSetupNotifier); as_oj_analogmode->setHint("", LOCALE_MENU_HINT_AUDIO_ANALOG_MODE); @@ -187,7 +187,7 @@ int CAudioSetup::showAudioSetup() //paint items audioSettings->addIntroItems(LOCALE_MAINSETTINGS_AUDIO); //--------------------------------------------------------- -#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 audioSettings->addItem(as_oj_analogmode); audioSettings->addItem(GenericMenuSeparatorLine); //--------------------------------------------------------- diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index fa96d4dba..95dff7499 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -69,7 +69,7 @@ CMiscMenue::CMiscMenue() { width = 40; -#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 +#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO fanNotifier = NULL; #endif sectionsdConfigNotifier = NULL; @@ -279,7 +279,7 @@ int CMiscMenue::showMiscSettingsMenu() int res = misc_menue.exec(NULL, ""); -#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 +#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO delete fanNotifier; fanNotifier = NULL; #endif @@ -310,13 +310,13 @@ void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general) mc->setHint("", LOCALE_MENU_HINT_CACHE_TXT); ms_general->addItem(mc); -#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 +#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO //fan speed if (fanNotifier == NULL) fanNotifier = new CFanControlNotifier(); #if defined (BOXMODEL_IPBOX9900) || defined (BOXMODEL_IPBOX99) || defined (BOXMODEL_DM8000) CMenuOptionNumberChooser * mn = new CMenuOptionNumberChooser(LOCALE_FAN_SPEED, &g_settings.fan_speed, true, 0, 1, fanNotifier, CRCInput::RC_nokey, NULL, 0, 0, LOCALE_OPTIONS_OFF); -#elif BOXMODEL_VUDUO2 +#elif BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO CMenuOptionNumberChooser * mn = new CMenuOptionNumberChooser(LOCALE_FAN_SPEED, &g_settings.fan_speed, true, 1, 10, fanNotifier, CRCInput::RC_nokey, NULL, 0, 0, LOCALE_OPTIONS_OFF); #else CMenuOptionNumberChooser * mn = new CMenuOptionNumberChooser(LOCALE_FAN_SPEED, &g_settings.fan_speed, true, 1, 14, fanNotifier, CRCInput::RC_nokey, NULL, 0, 0, LOCALE_OPTIONS_OFF); diff --git a/src/gui/miscsettings_menu.h b/src/gui/miscsettings_menu.h index 7c6f765cf..0ebc97df1 100644 --- a/src/gui/miscsettings_menu.h +++ b/src/gui/miscsettings_menu.h @@ -36,7 +36,7 @@ class CMiscMenue : public CMenuTarget, CChangeObserver { private: -#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 +#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO CFanControlNotifier *fanNotifier; #endif CSectionsdConfigNotifier* sectionsdConfigNotifier; diff --git a/src/gui/update.cpp b/src/gui/update.cpp index 2b396a622..4be7b067c 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -602,7 +602,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey) bool flashing = false; showGlobalStatus(100); -#if !BOXMODEL_VUDUO && !BOXMODEL_VUDUO2 +#if !BOXMODEL_VUDUO && !BOXMODEL_VUDUO2 && !BOXMODEL_VUULTIMO // create settings package int copy_settings = ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_FLASHUPDATE_COPY_SETTINGS, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_UPDATE); if (copy_settings == CMsgBox::mbrYes) @@ -742,7 +742,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey) } #endif -#if !BOXMODEL_VUDUO && !BOXMODEL_VUDUO2 +#if !BOXMODEL_VUDUO && !BOXMODEL_VUDUO2 && !BOXMODEL_VUULTIMO // select partition int selected = 0; CMenuSelectorTarget *selector = new CMenuSelectorTarget(&selected); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index b84540a05..76c10c6b9 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -460,7 +460,7 @@ int CNeutrinoApp::loadSetup(const char * fname) if (g_settings.channel_mode_initial_radio > -1) g_settings.channel_mode_radio = g_settings.channel_mode_initial_radio; -#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 +#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO g_settings.fan_speed = configfile.getInt32( "fan_speed", 1); if (g_settings.fan_speed < 1) g_settings.fan_speed = 1; #endif @@ -472,7 +472,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.hdmi_dd = configfile.getInt32( "hdmi_dd", 0); g_settings.spdif_dd = configfile.getInt32( "spdif_dd", 1); #endif // HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE -#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 g_settings.analog_out = configfile.getInt32( "analog_out", 1); #endif g_settings.avsync = configfile.getInt32( "avsync", 1); @@ -596,7 +596,7 @@ if (g_info.hw_caps->can_shutdown) g_settings.infobar_show_tuner = configfile.getInt32("infobar_show_tuner", 1 ); g_settings.radiotext_enable = configfile.getBool("radiotext_enable" , false); //audio -#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 g_settings.audio_AnalogMode = configfile.getInt32( "audio_AnalogMode", 0 ); #endif g_settings.audio_DolbyDigital = configfile.getBool("audio_DolbyDigital" , false); @@ -661,7 +661,7 @@ if (g_info.hw_caps->can_shutdown) g_settings.widget_fade = configfile.getBool("widget_fade" , false ); #ifdef ENABLE_GRAPHLCD -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUDUO4KSE || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_E4HDULTRA || BOXMODEL_VUDUO2 +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUDUO4KSE || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_E4HDULTRA || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO g_settings.glcd_enable = configfile.getInt32("glcd_enable", 1); #else g_settings.glcd_enable = configfile.getInt32("glcd_enable", 0); @@ -669,7 +669,7 @@ if (g_info.hw_caps->can_shutdown) g_settings.glcd_color_fg = configfile.getInt32("glcd_color_fg", GLCD::cColor::White); g_settings.glcd_color_bg = configfile.getInt32("glcd_color_bg", GLCD::cColor::Black); g_settings.glcd_color_bar = configfile.getInt32("glcd_color_bar", GLCD::cColor::Blue); -#if BOXMODEL_VUDUO2 +#if BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO g_settings.glcd_percent_channel = configfile.getInt32("glcd_percent_channel", 55); g_settings.glcd_percent_epg = configfile.getInt32("glcd_percent_epg", 45); g_settings.glcd_percent_bar = configfile.getInt32("glcd_percent_bar", 0); @@ -695,7 +695,7 @@ if (g_info.hw_caps->can_shutdown) g_settings.glcd_brightness = configfile.getInt32("glcd_brightness", 75); g_settings.glcd_brightness_standby = configfile.getInt32("glcd_brightness_standby", 45); #endif -#if BOXMODEL_VUUNO4KSE || BOXMODEL_VUDUO2 +#if BOXMODEL_VUUNO4KSE || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO g_settings.glcd_scroll_speed = configfile.getInt32("glcd_scroll_speed", 1); #elif BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUDUO4KSE || BOXMODEL_VUULTIMO4K g_settings.glcd_scroll_speed = configfile.getInt32("glcd_scroll_speed", 2); @@ -1297,7 +1297,7 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32( "channel_mode_initial", g_settings.channel_mode_initial ); configfile.setInt32( "channel_mode_initial_radio", g_settings.channel_mode_initial_radio ); -#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 +#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO configfile.setInt32( "fan_speed", g_settings.fan_speed); #endif @@ -1308,7 +1308,7 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32( "hdmi_dd", g_settings.hdmi_dd); configfile.setInt32( "spdif_dd", g_settings.spdif_dd); #endif -#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 configfile.setInt32( "analog_out", g_settings.analog_out); #endif configfile.setInt32( "avsync", g_settings.avsync); @@ -1407,7 +1407,7 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32("infobar_show_tuner" , g_settings.infobar_show_tuner ); configfile.setBool("radiotext_enable" , g_settings.radiotext_enable); //audio -#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 configfile.setInt32( "audio_AnalogMode", g_settings.audio_AnalogMode ); #endif configfile.setBool("audio_DolbyDigital" , g_settings.audio_DolbyDigital ); @@ -2525,7 +2525,7 @@ TIMER_START(); audioDecoder->SetHdmiDD((HDMI_ENCODED_MODE)g_settings.hdmi_dd); audioDecoder->SetSpdifDD(g_settings.spdif_dd ? true : false); #endif -#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 audioDecoder->EnableAnalogOut(g_settings.analog_out ? true : false); #endif audioSetupNotifier = new CAudioSetupNotifier; @@ -2577,7 +2577,7 @@ TIMER_START(); powerManager = new cPowerManager; powerManager->Open(); -#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 +#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO //fan speed CFanControlNotifier::setSpeed(g_settings.fan_speed); #endif @@ -3470,7 +3470,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) return messages_return::handled; } if(msg == NeutrinoMessages::EVT_ZAP_COMPLETE) { -#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 CZapit::getInstance()->GetAudioMode(g_settings.audio_AnalogMode); if(g_settings.audio_AnalogMode < 0 || g_settings.audio_AnalogMode > 2) g_settings.audio_AnalogMode = 0; @@ -3684,7 +3684,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) g_audioMute->AudioMute(false, true); return messages_return::handled; } -#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 else if( msg == CRCInput::RC_analog_on ) { g_settings.analog_out = 1; audioDecoder->EnableAnalogOut(true); @@ -4290,7 +4290,7 @@ void CNeutrinoApp::ExitRun(int exit_code) delete g_RCInput; g_RCInput = NULL; -#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 +#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO CFanControlNotifier::setSpeed(0); #endif @@ -4542,7 +4542,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby ) bool alive = recordingstatus || CEpgScan::getInstance()->Running() || CStreamManager::getInstance()->StreamStatus(); #endif -#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 +#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO //fan speed CFanControlNotifier::setSpeed(1); #endif @@ -4591,7 +4591,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby ) } #endif frameBuffer->setActive(true); -#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 +#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO //fan speed CFanControlNotifier::setSpeed(g_settings.fan_speed); #endif diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index d38ce0f44..4992a75d8 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -309,7 +309,7 @@ bool CAudioSetupNotifier::changeNotify(const neutrino_locale_t OptionName, void #endif { //printf("notify: %d\n", OptionName); -#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM8000 || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_ANALOG_MODE)) { g_Zapit->setAudioMode(g_settings.audio_AnalogMode); @@ -642,7 +642,7 @@ int CDataResetNotifier::exec(CMenuTarget * /*parent*/, const std::string &action return ret; } -#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 +#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO #if HAVE_DUCKBOX_HARDWARE void CFanControlNotifier::setSpeed(unsigned int speed) { @@ -716,7 +716,7 @@ void CFanControlNotifier::setSpeed(unsigned int __attribute__((unused)) speed) } close(cfd); #endif -#if defined (BOXMODEL_VUDUO2) +#if defined (BOXMODEL_VUDUO2) || defined (BOXMODEL_VUULTIMO) int cfd; cfd = open("/proc/stb/fp/fan_pwm", O_WRONLY); if (cfd < 0) diff --git a/src/system/setting_helpers.h b/src/system/setting_helpers.h index 02d29d70e..c141a0245 100644 --- a/src/system/setting_helpers.h +++ b/src/system/setting_helpers.h @@ -148,7 +148,7 @@ class CDataResetNotifier : public CMenuTarget int exec(CMenuTarget *parent, const std::string &actionKey); }; -#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 +#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO class CFanControlNotifier : public CChangeObserver { public: diff --git a/src/system/settings.h b/src/system/settings.h index c0a15c5f2..fe94ca4cb 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -229,7 +229,7 @@ struct SNeutrinoSettings int infobar_subchan_disp_pos; int infobar_buttons_usertitle; int infobar_analogclock; -#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 +#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO int fan_speed; #endif int infobar_show;