diff --git a/acinclude.m4 b/acinclude.m4 index e455c1071..7250a9a7b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -319,7 +319,7 @@ AC_ARG_WITH(boxtype, BOXTYPE="armbox" BOXMODEL="$withval" ;; - vuduo|vuduo2|vuuno|vuultimo|dm820|dm7080|dm8000) + vuduo|vuduo2|vuuno|vuultimo|dm7020hd|dm820|dm7080|dm8000) BOXTYPE="mipsbox" BOXMODEL="$withval" ;; @@ -333,7 +333,7 @@ AC_ARG_WITH(boxmodel, AS_HELP_STRING([--with-boxmodel], [valid for duckbox: ufs910, ufs912, ufs913, ufs922, atevio7500, fortis_hdbox, octagon1008, cuberevo, cuberevo_mini, cuberevo_mini2, cuberevo_250hd, cuberevo_2000hd, cuberevo_3000hd, ipbox9900, ipbox99, ipbox55, tf7700]) AS_HELP_STRING([], [valid for spark: spark, spark7162]) AS_HELP_STRING([], [valid for armbox: bre2ze4k, hd51, e4hdultra, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuzero4k, vuuno4kse, vuuno4k, h7, dm900, dm920]) -AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2, vuuno, vuultimo, dm820, dm7080, dm8000]) +AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2, vuuno, vuultimo, dm7020hd, dm820, dm7080, dm8000]) AS_HELP_STRING([], [valid for generic: raspi]), [case "${withval}" in ufs910|ufs912|ufs913|ufs922|atevio7500|fortis_hdbox|octagon1008|cuberevo|cuberevo_mini|cuberevo_mini2|cuberevo_250hd|cuberevo_2000hd|cuberevo_3000hd|ipbox9900|ipbox99|ipbox55|tf7700) @@ -357,7 +357,7 @@ AS_HELP_STRING([], [valid for generic: raspi]), AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; - vuduo|vuduo2|vuuno|vuultimo|dm820|dm7080|dm8000) + vuduo|vuduo2|vuuno|vuultimo|dm7020hd|dm820|dm7080|dm8000) if test "$BOXTYPE" = "mipsbox"; then BOXMODEL="$withval" else @@ -424,6 +424,7 @@ AM_CONDITIONAL(BOXMODEL_VUDUO, test "$BOXMODEL" = "vuduo") AM_CONDITIONAL(BOXMODEL_VUDUO2, test "$BOXMODEL" = "vuduo2") AM_CONDITIONAL(BOXMODEL_VUUNO, test "$BOXMODEL" = "vuuno") AM_CONDITIONAL(BOXMODEL_VUULTIMO, test "$BOXMODEL" = "vuultimo") +AM_CONDITIONAL(BOXMODEL_DM7020HD, test "$BOXMODEL" = "dm7020hd") AM_CONDITIONAL(BOXMODEL_DM820, test "$BOXMODEL" = "dm820") AM_CONDITIONAL(BOXMODEL_DM7080, test "$BOXMODEL" = "dm7080") AM_CONDITIONAL(BOXMODEL_DM900, test "$BOXMODEL" = "dm900") @@ -439,9 +440,9 @@ AM_CONDITIONAL(BOXMODEL_VUPLUS_ALL, test "$BOXMODEL" = "vusolo4k" -o "$BOXMODEL" AM_CONDITIONAL(BOXMODEL_VUPLUS_ARM, test "$BOXMODEL" = "vusolo4k" -o "$BOXMODEL" = "vuduo4k" -o "$BOXMODEL" = "vuduo4kse" -o "$BOXMODEL" = "vuultimo4k" -o "$BOXMODEL" = "vuzero4k" -o "$BOXMODEL" = "vuuno4kse" -o "$BOXMODEL" = "vuuno4k") AM_CONDITIONAL(BOXMODEL_VUPLUS_MIPS, test "$BOXMODEL" = "vuduo" -o "$BOXMODEL" = "vuduo2" -o "$BOXMODEL" = "vuuno" -o "$BOXMODEL" = "vuultimo") -AM_CONDITIONAL(BOXMODEL_DREAMBOX_ALL, test "$BOXMODEL" = "dm8000" -o "$BOXMODEL" = "dm820" -o "$BOXMODEL" = "dm7080" -o "$BOXMODEL" = "dm900" -o "$BOXMODEL" = "dm920") +AM_CONDITIONAL(BOXMODEL_DREAMBOX_ALL, test "$BOXMODEL" = "dm7020hd" -o "$BOXMODEL" = "dm8000" -o "$BOXMODEL" = "dm820" -o "$BOXMODEL" = "dm7080" -o "$BOXMODEL" = "dm900" -o "$BOXMODEL" = "dm920") AM_CONDITIONAL(BOXMODEL_DREAMBOX_ARM, test "$BOXMODEL" = "dm900" -o "$BOXMODEL" = "dm920") -AM_CONDITIONAL(BOXMODEL_DREAMBOX_MIPS, test "$BOXMODEL" = "dm8000" -o "$BOXMODEL" = "dm820" -o "$BOXMODEL" = "dm7080") +AM_CONDITIONAL(BOXMODEL_DREAMBOX_MIPS, test "$BOXMODEL" = "dm7020hd" -o "$BOXMODEL" = "dm8000" -o "$BOXMODEL" = "dm820" -o "$BOXMODEL" = "dm7080") if test "$BOXTYPE" = "spark"; then AC_DEFINE(HAVE_SPARK_HARDWARE, 1, [building for a goldenmedia 990 or edision pingulux]) @@ -528,6 +529,8 @@ elif test "$BOXMODEL" = "vuuno"; then AC_DEFINE(BOXMODEL_VUUNO, 1, [vuuno]) elif test "$BOXMODEL" = "vuultimo"; then AC_DEFINE(BOXMODEL_VUULTIMO, 1, [vuultimo]) +elif test "$BOXMODEL" = "dm7020hd"; then + AC_DEFINE(BOXMODEL_DM7020HD, 1, [dm7020hd]) elif test "$BOXMODEL" = "dm820"; then AC_DEFINE(BOXMODEL_DM820, 1, [dm820]) elif test "$BOXMODEL" = "dm7080"; then @@ -578,7 +581,7 @@ esac # all dreambox BOXMODELs case "$BOXMODEL" in - dm8000|dm820|dm7080|dm900|dm920) + dm7020hd|dm8000|dm820|dm7080|dm900|dm920) AC_DEFINE(BOXMODEL_DREAMBOX_ALL, 1, [dreambox_all]) ;; esac @@ -592,7 +595,7 @@ esac # all dreambox mips BOXMODELs case "$BOXMODEL" in - dm8000|dm820|dm7080) + dm7020hd|dm8000|dm820|dm7080) AC_DEFINE(BOXMODEL_DREAMBOX_MIPS, 1, [dreambox_mips]) ;; esac diff --git a/lib/liblcddisplay/lcddisplay.cpp b/lib/liblcddisplay/lcddisplay.cpp index 5c16182f8..f264889f3 100644 --- a/lib/liblcddisplay/lcddisplay.cpp +++ b/lib/liblcddisplay/lcddisplay.cpp @@ -40,7 +40,7 @@ #include #include -#if BOXMODEL_DM8000 || BOXMODEL_DM7080 +#if BOXMODEL_DM8000 || BOXMODEL_DM7080 || BOXMODEL_DM7020HD #include #endif @@ -214,7 +214,7 @@ int CLCDDisplay::setLCDContrast(int contrast) int CLCDDisplay::setLCDBrightness(int brightness) { -#if BOXMODEL_DM8000 || BOXMODEL_DM7080 +#if BOXMODEL_DM8000 || BOXMODEL_DM7080 || BOXMODEL_DM7020HD if (!file_exists("/tmp/usbtft")) { #endif @@ -250,7 +250,7 @@ int CLCDDisplay::setLCDBrightness(int brightness) } last_brightness = brightness; -#if BOXMODEL_DM8000 || BOXMODEL_DM7080 +#if BOXMODEL_DM8000 || BOXMODEL_DM7080 || BOXMODEL_DM7020HD } #endif return (0); diff --git a/src/driver/display.h b/src/driver/display.h index 85c5f4957..1f0d199b9 100644 --- a/src/driver/display.h +++ b/src/driver/display.h @@ -3,7 +3,7 @@ #include #endif #if HAVE_SPARK_HARDWARE || HAVE_GENERIC_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 +#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM7020HD #include #define CVFD CLCD #else diff --git a/src/driver/simple_display.cpp b/src/driver/simple_display.cpp index bce4f24d0..bc2517ff1 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_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_E4HDULTRA || BOXMODEL_VUUNO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM900 || BOXMODEL_DM920 || BOXMODEL_DM8000 +#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4KSE || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_E4HDULTRA || BOXMODEL_VUUNO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM900 || BOXMODEL_DM920 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD 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 99452d66e..5721f9248 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_VUUNO || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM7020HD || BOXMODEL_DM8000 || BOXMODEL_VUUNO || 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_VUUNO || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM7020HD || BOXMODEL_DM8000 || BOXMODEL_VUUNO || 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 f431a07ae..075753cf6 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_VUUNO || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM7020HD || BOXMODEL_DM8000 || BOXMODEL_VUUNO || 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_VUUNO || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM7020HD || BOXMODEL_DM8000 || BOXMODEL_VUUNO || 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_VUUNO || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM7020HD || BOXMODEL_DM8000 || BOXMODEL_VUUNO || 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/bookmarkmanager.cpp b/src/gui/bookmarkmanager.cpp index 670744a34..18fffb0ea 100644 --- a/src/gui/bookmarkmanager.cpp +++ b/src/gui/bookmarkmanager.cpp @@ -202,7 +202,7 @@ void CBookmarkManager::paintItem(int pos) // LCD Display if (i_selected) { -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, theBookmark.getName()); #else CVFD::getInstance()->showMenuText(0, theBookmark.getName(), -1, true); // UTF-8 diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp index ab3a11b3d..c5274652b 100644 --- a/src/gui/bouquetlist.cpp +++ b/src/gui/bouquetlist.cpp @@ -621,7 +621,7 @@ void CBouquetList::paintItem(int pos) if (i_selected) { if (npos < (int) Bouquets.size()) -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, lname); #else CVFD::getInstance()->showMenuText(0, lname, -1, true); diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index b8ea73e30..b30f3ca94 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2280,13 +2280,13 @@ void CChannelList::updateVfd() char nameAndDescription[255]; snprintf(nameAndDescription, sizeof(nameAndDescription), "%s - %s", chan->getName().c_str(), p_event->description.c_str()); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, nameAndDescription); #else CVFD::getInstance()->showMenuText(0, nameAndDescription, -1, true); // UTF-8 #endif } else -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, chan->getName().c_str()); #else CVFD::getInstance()->showMenuText(0, chan->getName().c_str(), -1, true); // UTF-8 diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp index 2d52c9ed6..73338e725 100644 --- a/src/gui/filebrowser.cpp +++ b/src/gui/filebrowser.cpp @@ -1213,7 +1213,7 @@ void CFileBrowser::paintItem(unsigned int pos) actual_file->Name = fname_temp; if (currpos == selected) -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, FILESYSTEM_ENCODING_TO_UTF8_STRING(actual_file->getFileName()).c_str()); #else CVFD::getInstance()->showMenuText(0, FILESYSTEM_ENCODING_TO_UTF8_STRING(actual_file->getFileName()).c_str(), -1, true); // UTF-8 diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index ff5f1167a..5a3757ff5 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -1519,7 +1519,7 @@ void CMovieBrowser::refreshLCD(void) if (m_vMovieInfo.empty() || m_movieSelectionHandler == NULL) return; -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, m_movieSelectionHandler->epgTitle.c_str()); #else CVFD::getInstance()->showMenuText(0, m_movieSelectionHandler->epgTitle.c_str(), -1, true); // UTF-8 @@ -3928,7 +3928,7 @@ int CMenuSelector::paint(bool selected) g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(stringstartposName, y + height, dx - (stringstartposName - x), optionName, color); if (selected) -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, optionName); #else CVFD::getInstance()->showMenuText(0, optionName, -1, true); // UTF-8 diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 6287bd751..d2f756916 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -492,7 +492,7 @@ void CMoviePlayerGui::updateLcd(bool display_playtime) } // CVFD::getInstance()->setMode(LCD_MODE); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, lcd.c_str()); #else CVFD::getInstance()->showMenuText(0, lcd.c_str(), -1, true); @@ -564,7 +564,7 @@ void CMoviePlayerGui::updateLcd(bool display_playtime) break; } lcd += name; -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, lcd.c_str()); #else CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8); diff --git a/src/gui/pictureviewer.cpp b/src/gui/pictureviewer.cpp index 1b8727a08..b7638690b 100644 --- a/src/gui/pictureviewer.cpp +++ b/src/gui/pictureviewer.cpp @@ -792,7 +792,7 @@ void CPictureViewerGui::view(unsigned int index, bool unscaled) m_unscaled = unscaled; selected=index; -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, playlist[index].Name.c_str()); #else CVFD::getInstance()->showMenuText(0, playlist[index].Name.c_str()); @@ -847,7 +847,7 @@ void CPictureViewerGui::endView() void CPictureViewerGui::deletePicFile(unsigned int index, bool mode) { -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, playlist[index].Name.c_str()); #else CVFD::getInstance()->showMenuText(0, playlist[index].Name.c_str()); diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp index 486b24266..7c575c2c7 100644 --- a/src/gui/scan.cpp +++ b/src/gui/scan.cpp @@ -410,7 +410,7 @@ neutrino_msg_t CScanTs::handleMsg(neutrino_msg_t msg, neutrino_msg_data_t data) paintLine(xpos2, ypos_transponder, w - (8*fw), buffer); total = data; snprintf(str, sizeof(buffer), "scan: %d/%d", done, total); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, str); #else CVFD::getInstance()->showMenuText(0, str, -1, true); @@ -423,7 +423,7 @@ neutrino_msg_t CScanTs::handleMsg(neutrino_msg_t msg, neutrino_msg_data_t data) sprintf(buffer, "%d/%d", done, total); paintLine(xpos2, ypos_transponder, w - (8*fw), buffer); snprintf(str, sizeof(buffer), "scan %d/%d", done, total); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, str); #else CVFD::getInstance()->showMenuText(0, str, -1, true); diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index ef439f6c1..2f38f368b 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -1392,7 +1392,7 @@ void CTimerList::paintItem(int pos) default: ; } -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, line1.c_str()); #else CVFD::getInstance()->showMenuText(0, line1.c_str(), -1, true); diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp index 38887c006..d505f063f 100644 --- a/src/gui/upnpbrowser.cpp +++ b/src/gui/upnpbrowser.cpp @@ -953,7 +953,7 @@ bool CUpnpBrowserGui::selectItem(std::string id) void CUpnpBrowserGui::paintDeviceInfo() { -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, m_devices[m_selecteddevice].friendlyname.c_str()); #else CVFD::getInstance()->showMenuText(0, m_devices[m_selecteddevice].friendlyname.c_str(), -1, true); @@ -1127,7 +1127,7 @@ void CUpnpBrowserGui::paintItemInfo(UPnPEntry *entry) int preferred=entry->preferred; // LCD -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, entry->title.c_str()); #else CVFD::getInstance()->showMenuText(0, entry->title.c_str(), -1, true); diff --git a/src/gui/vfd_setup.cpp b/src/gui/vfd_setup.cpp index b61e201fb..b6f5cc292 100644 --- a/src/gui/vfd_setup.cpp +++ b/src/gui/vfd_setup.cpp @@ -145,7 +145,7 @@ int CVfdSetup::showSetup() CMenuOptionChooser* oj; #if ENABLE_LCD -#if BOXMODEL_DM8000 || BOXMODEL_DM7080 +#if BOXMODEL_DM8000 || BOXMODEL_DM7080 || BOXMODEL_DM7020HD //option power oj = new CMenuOptionChooser("Power LCD"/*LOCALE_LCDMENU_POWER*/, &g_settings.lcd_setting[SNeutrinoSettings::LCD_POWER], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, new CLCDNotifier(), CRCInput::RC_nokey); vfds->addItem(oj); @@ -167,7 +167,7 @@ int CVfdSetup::showSetup() vfds->addItem(oj); } -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD g_settings.lcd_info_line = 0; g_settings.lcd_scroll = 0; #else @@ -216,7 +216,7 @@ int CVfdSetup::showSetup() vfds->addItem(led_num); } -#if !defined BOXMODEL_VUSOLO4K && !defined BOXMODEL_VUDUO4K && !defined BOXMODEL_VUDUO4KSE && !defined BOXMODEL_VUULTIMO4K && !defined BOXMODEL_VUUNO4KSE && !defined BOXMODEL_DM820 && !defined BOXMODEL_DM7080 && !defined BOXMODEL_DM900 && !defined BOXMODEL_DM920 && !defined BOXMODEL_DM8000 && !defined BOXMODEL_E4HDULTRA && !defined BOXMODEL_VUDUO2 +#if !defined BOXMODEL_VUSOLO4K && !defined BOXMODEL_VUDUO4K && !defined BOXMODEL_VUDUO4KSE && !defined BOXMODEL_VUULTIMO4K && !defined BOXMODEL_VUUNO4KSE && !defined BOXMODEL_DM7020HD && !defined BOXMODEL_DM820 && !defined BOXMODEL_DM7080 && !defined BOXMODEL_DM900 && !defined BOXMODEL_DM920 && !defined BOXMODEL_DM8000 && !defined BOXMODEL_E4HDULTRA && !defined BOXMODEL_VUDUO2 #if ENABLE_LCD4LINUX && ENABLE_GRAPHLCD if (g_settings.glcd_enable != 0 && g_settings.lcd4l_support != 0) { g_settings.glcd_enable = 0; @@ -226,7 +226,7 @@ int CVfdSetup::showSetup() #endif #ifdef ENABLE_LCD4LINUX -#if !defined BOXMODEL_VUSOLO4K && !defined BOXMODEL_VUDUO4K && !defined BOXMODEL_VUDUO4KSE && !defined BOXMODEL_VUULTIMO4K && !defined BOXMODEL_VUUNO4KSE && !defined BOXMODEL_DM820 && !defined BOXMODEL_DM7080 && !defined BOXMODEL_DM900 && !defined BOXMODEL_DM920 && !defined BOXMODEL_DM8000 && !defined BOXMODEL_E4HDULTRA && !defined BOXMODEL_VUDUO2 && defined (ENABLE_GRAPHLCD) +#if !defined BOXMODEL_VUSOLO4K && !defined BOXMODEL_VUDUO4K && !defined BOXMODEL_VUDUO4KSE && !defined BOXMODEL_VUULTIMO4K && !defined BOXMODEL_VUUNO4KSE && !defined BOXMODEL_DM7020HD && !defined BOXMODEL_DM820 && !defined BOXMODEL_DM7080 && !defined BOXMODEL_DM900 && !defined BOXMODEL_DM920 && !defined BOXMODEL_DM8000 && !defined BOXMODEL_E4HDULTRA && !defined BOXMODEL_VUDUO2 && defined (ENABLE_GRAPHLCD) if (g_settings.glcd_enable == 0) #endif { @@ -238,7 +238,7 @@ int CVfdSetup::showSetup() #ifdef ENABLE_GRAPHLCD GLCD_Menu glcdMenu; #ifdef ENABLE_LCD4LINUX -#if !defined BOXMODEL_VUSOLO4K && !defined BOXMODEL_VUDUO4K && !defined BOXMODEL_VUDUO4KSE && !defined BOXMODEL_VUULTIMO4K && !defined BOXMODEL_VUUNO4KSE && !defined BOXMODEL_DM820 && !defined BOXMODEL_DM7080 && !defined BOXMODEL_DM900 && !defined BOXMODEL_DM920 && !defined BOXMODEL_DM8000 && !defined BOXMODEL_E4HDULTRA && !defined BOXMODEL_VUDUO2 +#if !defined BOXMODEL_VUSOLO4K && !defined BOXMODEL_VUDUO4K && !defined BOXMODEL_VUDUO4KSE && !defined BOXMODEL_VUULTIMO4K && !defined BOXMODEL_VUUNO4KSE && !defined BOXMODEL_DM7020HD && !defined BOXMODEL_DM820 && !defined BOXMODEL_DM7080 && !defined BOXMODEL_DM900 && !defined BOXMODEL_DM920 && !defined BOXMODEL_DM8000 && !defined BOXMODEL_E4HDULTRA && !defined BOXMODEL_VUDUO2 if (g_settings.lcd4l_support == 0) #endif #endif @@ -383,7 +383,7 @@ bool CLCDNotifier::changeNotify(const neutrino_locale_t, void * Data) int state = *(int *)Data; dprintf(DEBUG_NORMAL, "CLCDNotifier: state: %d\n", state); -#if BOXMODEL_DM8000 || BOXMODEL_DM7080 +#if BOXMODEL_DM8000 || BOXMODEL_DM7080 || BOXMODEL_DM7020HD CVFD::getInstance()->setPower(state); #else CVFD::getInstance()->setPower(1); diff --git a/src/gui/widget/keyboard_input.cpp b/src/gui/widget/keyboard_input.cpp index 457beac68..5ae191322 100644 --- a/src/gui/widget/keyboard_input.cpp +++ b/src/gui/widget/keyboard_input.cpp @@ -515,7 +515,7 @@ int CKeyboardInput::exec(CMenuTarget *parent, const std::string &) if (changed) { changed = false; -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, inputString->c_str()); #else CVFD::getInstance()->showMenuText(1, inputString->c_str(), selected + 1); diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 2926fe268..eafd38fd0 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -223,7 +223,7 @@ void CMenuItem::paintItemCaption(const bool select_mode, const char *right_text, ssize_t len = strlen(left_text) + strlen(right_text) + 2; char str[len]; snprintf(str, len, "%s %s", left_text, right_text); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, str); #else CVFD::getInstance()->showMenuText(0, str, -1, true); @@ -235,7 +235,7 @@ void CMenuItem::paintItemCaption(const bool select_mode, const char *right_text, } else { -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, left_text); #else CVFD::getInstance()->showMenuText(0, left_text, -1, true); diff --git a/src/gui/widget/stringinput.cpp b/src/gui/widget/stringinput.cpp index f34668e66..c94ec52d2 100644 --- a/src/gui/widget/stringinput.cpp +++ b/src/gui/widget/stringinput.cpp @@ -436,7 +436,7 @@ int CStringInput::exec(CMenuTarget *parent, const std::string &) frameBuffer->blit(); if (*valueString != dispval) { -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, valueString->c_str()); #else CVFD::getInstance()->showMenuText(1, valueString->c_str(), selected + 1); diff --git a/src/gui/widget/stringinput_ext.cpp b/src/gui/widget/stringinput_ext.cpp index e6c378e61..e35f1b236 100644 --- a/src/gui/widget/stringinput_ext.cpp +++ b/src/gui/widget/stringinput_ext.cpp @@ -196,7 +196,7 @@ int CExtendedInput::exec(CMenuTarget *parent, const std::string &) { if (*valueString != dispval) { -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, valueString->c_str()); #else CVFD::getInstance()->showMenuText(1, valueString->c_str(), selectedChar + 1); @@ -238,7 +238,7 @@ int CExtendedInput::exec(CMenuTarget *parent, const std::string &) { inputFields[oldSelectedChar]->paint(x + offset, y + hheight + offset, false); inputFields[selectedChar]->paint(x + offset, y + hheight + offset, true); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, valueString->c_str()); #else CVFD::getInstance()->showMenuText(1, valueString->c_str(), selectedChar + 1); @@ -278,7 +278,7 @@ int CExtendedInput::exec(CMenuTarget *parent, const std::string &) { inputFields[oldSelectedChar]->paint(x + offset, y + hheight + offset, false); inputFields[selectedChar]->paint(x + offset, y + hheight + offset, true); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, valueString->c_str()); #else CVFD::getInstance()->showMenuText(1, valueString->c_str(), selectedChar + 1); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 2460c827d..192cdcabc 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -475,7 +475,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_VUUNO || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM7020HD || BOXMODEL_DM8000 || BOXMODEL_VUUNO || 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); @@ -599,7 +599,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_VUUNO || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM7020HD || BOXMODEL_DM8000 || BOXMODEL_VUUNO || 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); @@ -1312,7 +1312,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_VUUNO || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM7020HD || BOXMODEL_DM8000 || BOXMODEL_VUUNO || 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); @@ -1411,7 +1411,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_VUUNO || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM7020HD || BOXMODEL_DM8000 || BOXMODEL_VUUNO || 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 ); @@ -2530,7 +2530,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_VUUNO || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM7020HD || BOXMODEL_DM8000 || BOXMODEL_VUUNO || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 audioDecoder->EnableAnalogOut(g_settings.analog_out ? true : false); #endif audioSetupNotifier = new CAudioSetupNotifier; @@ -3486,7 +3486,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_VUUNO || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM7020HD || BOXMODEL_DM8000 || BOXMODEL_VUUNO || 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; @@ -3700,7 +3700,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_VUUNO || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM7020HD || BOXMODEL_DM8000 || BOXMODEL_VUUNO || 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); @@ -4350,7 +4350,7 @@ void CNeutrinoApp::saveEpg(int _mode) } CVFD::getInstance()->Clear(); CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, g_Locale->getText(LOCALE_EPG_SAVING)); #else CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_EPG_SAVING)); @@ -4498,7 +4498,7 @@ void CNeutrinoApp::standbyMode(bool bOnOff, bool fromDeepStandby) #ifdef ENABLE_GRAPHLCD nGLCD::StandbyMode(true); #endif -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, "standby..."); #else CVFD::getInstance()->ShowText("standby..."); @@ -4580,7 +4580,7 @@ void CNeutrinoApp::standbyMode(bool bOnOff, bool fromDeepStandby) // Active standby off powerManager->SetStandby(false, false); CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, "resume"); #else CVFD::getInstance()->ShowText("resume"); @@ -5052,7 +5052,7 @@ void stop_daemons(bool stopall, bool for_flash) if (for_flash) { CVFD::getInstance()->Clear(); CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, "Stop daemons..."); #else CVFD::getInstance()->ShowText("Stop daemons..."); @@ -5250,7 +5250,7 @@ void CNeutrinoApp::loadKeys(const char * fname) g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_playpause ); #else g_settings.mpkey_play = tconfig->getInt32( "mpkey.play", CRCInput::RC_play ); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM900 || BOXMODEL_DM920 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM900 || BOXMODEL_DM920 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_play ); #else g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_pause ); @@ -5636,7 +5636,7 @@ void CNeutrinoApp::CheckFastScan(bool standby, bool reload) } if (standby || (new_fst != scansettings.fst_version)) { CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, g_Locale->getText(LOCALE_SATSETUP_FASTSCAN_HEAD)); #else CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_SATSETUP_FASTSCAN_HEAD)); diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index 14b102de4..5f993d549 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -70,7 +70,7 @@ extern CBouquetManager *g_bouquetManager; #define RC_DEVICE "/dev/input/event2" #define RC_DEVICE_FALLBACK "/dev/input/event1" -#elif BOXMODEL_DM8000 || BOXMODEL_DM7080 || BOXMODEL_DM820 || BOXMODEL_DM900 || BOXMODEL_DM920 +#elif BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM7080 || BOXMODEL_DM820 || BOXMODEL_DM900 || BOXMODEL_DM920 #define RC_DEVICE "/dev/input/event1" #define RC_DEVICE_FALLBACK "/dev/input/event4" diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index b382b193b..6b6567688 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_VUUNO || BOXMODEL_VUDUO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_HD51 +#if HAVE_SH4_HARDWARE || BOXMODEL_DM7020HD || BOXMODEL_DM8000 || BOXMODEL_VUUNO || 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);