From ab1d95f8d29079789fa2d6ee5099d28da486f956 Mon Sep 17 00:00:00 2001 From: BPanther Date: Mon, 3 Jun 2024 01:40:19 +0200 Subject: [PATCH] dm7080 added --- acinclude.m4 | 15 +++++++++------ src/driver/display.h | 2 +- src/driver/lcdd.cpp | 2 +- src/driver/rcinput.h | 4 ++-- src/gui/bookmarkmanager.cpp | 2 +- src/gui/bouquetlist.cpp | 2 +- src/gui/channellist.cpp | 4 ++-- src/gui/filebrowser.cpp | 2 +- src/gui/miscsettings_menu.cpp | 8 ++++---- src/gui/miscsettings_menu.h | 2 +- src/gui/moviebrowser/mb.cpp | 4 ++-- src/gui/movieplayer.cpp | 4 ++-- src/gui/pictureviewer.cpp | 4 ++-- src/gui/scan.cpp | 4 ++-- src/gui/timerlist.cpp | 2 +- src/gui/upnpbrowser.cpp | 4 ++-- src/gui/vfd_setup.cpp | 10 +++++----- src/gui/videosettings.cpp | 4 ++-- src/gui/widget/keyboard_input.cpp | 2 +- src/gui/widget/menue.cpp | 4 ++-- src/gui/widget/stringinput.cpp | 2 +- src/gui/widget/stringinput_ext.cpp | 6 +++--- src/neutrino.cpp | 28 ++++++++++++++-------------- src/neutrino_menue.cpp | 2 +- src/nhttpd/tuxboxapi/controlapi.cpp | 2 +- src/system/setting_helpers.cpp | 4 ++-- src/system/setting_helpers.h | 2 +- src/system/settings.h | 2 +- src/zapit/src/frontend.cpp | 2 +- src/zapit/src/zapit.cpp | 2 +- 30 files changed, 70 insertions(+), 67 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 2a9ff6723..3272469bb 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -319,7 +319,7 @@ AC_ARG_WITH(boxtype, BOXTYPE="armbox" BOXMODEL="$withval" ;; - vuduo|vuduo2|vuuno|vuultimo|dm820|dm8000) + vuduo|vuduo2|vuuno|vuultimo|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]) -AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2, vuuno, vuultimo, dm820, dm8000]) +AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2, vuuno, vuultimo, 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|dm8000) + vuduo|vuduo2|vuuno|vuultimo|dm820|dm7080|dm8000) if test "$BOXTYPE" = "mipsbox"; then BOXMODEL="$withval" else @@ -425,6 +425,7 @@ AM_CONDITIONAL(BOXMODEL_VUDUO2, test "$BOXMODEL" = "vuduo2") AM_CONDITIONAL(BOXMODEL_VUUNO, test "$BOXMODEL" = "vuuno") AM_CONDITIONAL(BOXMODEL_VUULTIMO, test "$BOXMODEL" = "vuultimo") AM_CONDITIONAL(BOXMODEL_DM820, test "$BOXMODEL" = "dm820") +AM_CONDITIONAL(BOXMODEL_DM7080, test "$BOXMODEL" = "dm7080") AM_CONDITIONAL(BOXMODEL_DM900, test "$BOXMODEL" = "dm900") AM_CONDITIONAL(BOXMODEL_DM8000, test "$BOXMODEL" = "dm8000") AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7") @@ -437,7 +438,7 @@ 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" = "dm900") +AM_CONDITIONAL(BOXMODEL_DREAMBOX_ALL, test "$BOXMODEL" = "dm8000" -o "$BOXMODEL" = "dm820" -o "$BOXMODEL" = "dm7080" -o "$BOXMODEL" = "dm900") if test "$BOXTYPE" = "spark"; then AC_DEFINE(HAVE_SPARK_HARDWARE, 1, [building for a goldenmedia 990 or edision pingulux]) @@ -526,6 +527,8 @@ elif test "$BOXMODEL" = "vuultimo"; then AC_DEFINE(BOXMODEL_VUULTIMO, 1, [vuultimo]) elif test "$BOXMODEL" = "dm820"; then AC_DEFINE(BOXMODEL_DM820, 1, [dm820]) +elif test "$BOXMODEL" = "dm7080"; then + AC_DEFINE(BOXMODEL_DM7080, 1, [dm7080]) elif test "$BOXMODEL" = "dm900"; then AC_DEFINE(BOXMODEL_DM900, 1, [dm900]) elif test "$BOXMODEL" = "dm8000"; then @@ -542,7 +545,7 @@ fi # Support Boxmodel with OSD-Resolution case "$BOXMODEL" in - bre2ze4k|hd51|e4hdultra|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuzero4k|vuuno4kse|vuuno4k|h7|osmio4k|osmio4kplus|dm820|dm900) + bre2ze4k|hd51|e4hdultra|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuzero4k|vuuno4kse|vuuno4k|h7|osmio4k|osmio4kplus|dm820|dm7080|dm900) AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution]) ;; esac @@ -570,7 +573,7 @@ esac # all dreambox BOXMODELs case "$BOXMODEL" in - dm8000|dm820|dm900) + dm8000|dm820|dm7080|dm900) AC_DEFINE(BOXMODEL_DREAMBOX_ALL, 1, [dreambox_all]) ;; esac diff --git a/src/driver/display.h b/src/driver/display.h index f17d0757c..85c5f4957 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 +#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 #include #define CVFD CLCD #else diff --git a/src/driver/lcdd.cpp b/src/driver/lcdd.cpp index 36f70ad4a..5ca12e2ae 100644 --- a/src/driver/lcdd.cpp +++ b/src/driver/lcdd.cpp @@ -395,7 +395,7 @@ void CLCD::showTextScreen(const std::string &big, const std::string &small, /*co if (!has_lcd) return; -#if BOXMODEL_DM820 // lcd to small +#if BOXMODEL_DM820 || BOXMODEL_DM7080 // lcd to small showmode = 0x01; #endif diff --git a/src/driver/rcinput.h b/src/driver/rcinput.h index 0dbe75130..08fc158a1 100644 --- a/src/driver/rcinput.h +++ b/src/driver/rcinput.h @@ -245,7 +245,7 @@ class CRCInput RC_play = KEY_PLAY, RC_pause = KEY_PAUSE, RC_pvr = KEY_PVR, -#if BOXMODEL_DM820 || BOXMODEL_DM900 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM900 || BOXMODEL_DM8000 RC_forward = KEY_NEXTSONG, RC_rewind = KEY_PREVIOUSSONG, #else @@ -279,7 +279,7 @@ class CRCInput RC_prog4 = KEY_PROG4, RC_media = KEY_MEDIA, RC_search = KEY_SEARCH, -#if BOXMODEL_DM820 || BOXMODEL_DM900 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM900 || BOXMODEL_DM8000 RC_nextsong = KEY_FORWARD, RC_previoussong = KEY_REWIND, #else diff --git a/src/gui/bookmarkmanager.cpp b/src/gui/bookmarkmanager.cpp index 0ee829792..608f5ee92 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 5c8f3f95a..fce29a104 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 203924a6c..d81d05a95 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, nameAndDescription); #else CVFD::getInstance()->showMenuText(0, nameAndDescription, -1, true); // UTF-8 #endif } else -#if BOXMODEL_DM820 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 c1d213b6d..79313d964 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index b605b4745..74069fef1 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_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO fanNotifier = NULL; #endif sectionsdConfigNotifier = NULL; @@ -279,7 +279,7 @@ int CMiscMenue::showMiscSettingsMenu() int res = misc_menue.exec(NULL, ""); -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO delete fanNotifier; fanNotifier = NULL; #endif @@ -310,11 +310,11 @@ void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general) mc->setHint("", LOCALE_MENU_HINT_CACHE_TXT); ms_general->addItem(mc); -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO //fan speed if (fanNotifier == NULL) fanNotifier = new CFanControlNotifier(); -#if defined (BOXMODEL_IPBOX9900) || defined (BOXMODEL_IPBOX99) || defined (BOXMODEL_DM8000) || defined (BOXMODEL_DM820) +#if defined (BOXMODEL_IPBOX9900) || defined (BOXMODEL_IPBOX99) || defined (BOXMODEL_DM8000) || defined (BOXMODEL_DM820) || defined (BOXMODEL_DM7080) 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 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO CMenuOptionNumberChooser * mn = new CMenuOptionNumberChooser(LOCALE_FAN_SPEED, &g_settings.fan_speed, true, 1, 10, 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 6684ecc70..7263333a2 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_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO CFanControlNotifier *fanNotifier; #endif CSectionsdConfigNotifier* sectionsdConfigNotifier; diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index fa298d744..d9dfe68f7 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 693637bd8..33ff93eca 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 b0f1ec5e3..394362712 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 f7bfaeadc..0efe78858 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 0f14c5723..61c0c3d5f 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -1392,7 +1392,7 @@ void CTimerList::paintItem(int pos) default: ; } -#if BOXMODEL_DM820 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 2ce6ce731..8ae1fe183 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 14a30da1b..d0471d36b 100644 --- a/src/gui/vfd_setup.cpp +++ b/src/gui/vfd_setup.cpp @@ -150,7 +150,7 @@ int CVfdSetup::showSetup() 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); #endif -#if BOXMODEL_DM820 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 g_settings.lcd_setting[SNeutrinoSettings::LCD_INVERSE] = 0; #else //option invert @@ -167,7 +167,7 @@ int CVfdSetup::showSetup() vfds->addItem(oj); } -#if BOXMODEL_DM820 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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_DM900 && !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_DM820 && !defined BOXMODEL_DM7080 && !defined BOXMODEL_DM900 && !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_DM900 && !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_DM820 && !defined BOXMODEL_DM7080 && !defined BOXMODEL_DM900 && !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_DM900 && !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_DM820 && !defined BOXMODEL_DM7080 && !defined BOXMODEL_DM900 && !defined BOXMODEL_DM8000 && !defined BOXMODEL_E4HDULTRA && !defined BOXMODEL_VUDUO2 if (g_settings.lcd4l_support == 0) #endif #endif diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index be1e7d793..c7392e642 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -220,7 +220,7 @@ CMenuOptionChooser::keyval VIDEOMENU_ZAPPINGMODE_OPTIONS[VIDEOMENU_ZAPPINGMODE_O { 3, LOCALE_VIDEOMENU_ZAPPINGMODE_HOLDTILLLOCK } }; -#if BOXMODEL_VUPLUS_ARM || BOXMODEL_DM820 || BOXMODEL_DM900 +#if BOXMODEL_VUPLUS_ARM || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM900 #define VIDEOMENU_HDMI_COLORIMETRY_OPTION_COUNT 3 const CMenuOptionChooser::keyval VIDEOMENU_HDMI_COLORIMETRY_OPTIONS[VIDEOMENU_HDMI_COLORIMETRY_OPTION_COUNT] = { @@ -384,7 +384,7 @@ int CVideoSettings::showVideoSetup() videosetup->addItem(zm); } -#if BOXMODEL_VUPLUS_ARM || BOXMODEL_DM820 || BOXMODEL_DM900 +#if BOXMODEL_VUPLUS_ARM || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM900 if (file_exists("/proc/stb/video/hdmi_colorspace")) #else if (file_exists("/proc/stb/video/hdmi_colorimetry_choices")) diff --git a/src/gui/widget/keyboard_input.cpp b/src/gui/widget/keyboard_input.cpp index 6b131d1ec..5e5a18995 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 d7d3d3cc7..06f0dc03b 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 9deed2c4b..d5e659ed3 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 19750b49e..07a7431a4 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 cef0f4c1f..d8cd4fc89 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -269,7 +269,7 @@ CNeutrinoApp::CNeutrinoApp() frameBuffer = CFrameBuffer::getInstance(); frameBuffer->setIconBasePath(ICONSDIR); SetupFrameBuffer(); -#if BOXMODEL_DM820 || BOXMODEL_DM900 // needs setup twice +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM900 // needs setup twice SetupFrameBuffer(); #endif @@ -463,7 +463,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_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO g_settings.fan_speed = configfile.getInt32( "fan_speed", 1); if (g_settings.fan_speed < 1) g_settings.fan_speed = 1; #endif @@ -1301,7 +1301,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_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO configfile.setInt32( "fan_speed", g_settings.fan_speed); #endif @@ -2582,7 +2582,7 @@ TIMER_START(); powerManager = new cPowerManager; powerManager->Open(); -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO //fan speed CFanControlNotifier::setSpeed(g_settings.fan_speed); #endif @@ -4306,7 +4306,7 @@ void CNeutrinoApp::ExitRun(int exit_code) delete g_RCInput; g_RCInput = NULL; -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO CFanControlNotifier::setSpeed(0); #endif @@ -4350,7 +4350,7 @@ void CNeutrinoApp::saveEpg(int _mode) } CVFD::getInstance()->Clear(); CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); -#if BOXMODEL_DM820 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, "standby..."); #else CVFD::getInstance()->ShowText("standby..."); @@ -4564,7 +4564,7 @@ void CNeutrinoApp::standbyMode(bool bOnOff, bool fromDeepStandby) bool alive = recordingstatus || CEpgScan::getInstance()->Running() || CStreamManager::getInstance()->StreamStatus(); #endif -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO //fan speed CFanControlNotifier::setSpeed(1); #endif @@ -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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, "resume"); #else CVFD::getInstance()->ShowText("resume"); @@ -4617,7 +4617,7 @@ void CNeutrinoApp::standbyMode(bool bOnOff, bool fromDeepStandby) } #endif frameBuffer->setActive(true); -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO //fan speed CFanControlNotifier::setSpeed(g_settings.fan_speed); #endif @@ -4811,7 +4811,7 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey) if (actionKey == "help_recording") { ShowMsg(LOCALE_SETTINGS_HELP, LOCALE_RECORDINGMENU_HELP, CMsgBox::mbrBack, CMsgBox::mbBack); } -#if BOXMODEL_DM820 || BOXMODEL_DM900 // rescue mode +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM900 // rescue mode else if (actionKey=="rescue_mode") { FILE *f = fopen("/tmp/.reboot", "w"); @@ -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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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_DM900 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM900 || BOXMODEL_DM8000 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 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 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/neutrino_menue.cpp b/src/neutrino_menue.cpp index f92cdc287..b4511733f 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -255,7 +255,7 @@ void CNeutrinoApp::InitMenuMain() mf->setHint(NEUTRINO_ICON_HINT_REBOOT, LOCALE_MENU_HINT_REBOOT); personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_REBOOT]); -#if BOXMODEL_DM820 || BOXMODEL_DM900 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM900 //rescue mode mf = new CMenuForwarder(LOCALE_MAINMENU_RESCUEMODE, true, NULL, this, "rescue_mode", CRCInput::RC_nokey); mf->setHint(NEUTRINO_ICON_HINT_RESCUEMODE, LOCALE_MENU_HINT_RESCUEMODE); diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index e4cbc57df..f5fc3bd03 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_DM820 +#elif BOXMODEL_DM820 || BOXMODEL_DM7080 #define RC_DEVICE "/dev/input/event3" #define RC_DEVICE_FALLBACK "/dev/input/event0" diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 9657187e0..b382b193b 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -643,7 +643,7 @@ int CDataResetNotifier::exec(CMenuTarget * /*parent*/, const std::string &action return ret; } -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO #if HAVE_DUCKBOX_HARDWARE void CFanControlNotifier::setSpeed(unsigned int speed) { @@ -698,7 +698,7 @@ void CFanControlNotifier::setSpeed(unsigned int speed) #else void CFanControlNotifier::setSpeed(unsigned int __attribute__((unused)) speed) { -#if defined (BOXMODEL_DM8000) || defined (BOXMODEL_DM820) +#if defined (BOXMODEL_DM8000) || defined (BOXMODEL_DM820) || defined (BOXMODEL_DM7080) int cfd; cfd = open("/proc/stb/fp/fan_vlt", O_WRONLY); if (cfd < 0) diff --git a/src/system/setting_helpers.h b/src/system/setting_helpers.h index eecc56b86..f8b6ce95e 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_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO class CFanControlNotifier : public CChangeObserver { public: diff --git a/src/system/settings.h b/src/system/settings.h index 4a2bab11b..f9d916469 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_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO int fan_speed; #endif int infobar_show; diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp index 639dc0a5f..ea88f966e 100644 --- a/src/zapit/src/frontend.cpp +++ b/src/zapit/src/frontend.cpp @@ -746,7 +746,7 @@ uint32_t CFrontend::getBitErrorRate(void) const return ber; } -#if BOXMODEL_DM820 || BOXMODEL_DM900 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM900 #define M_STRENGTH 350 #define M_SNR 35 #else diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index aa6a37d0a..eaebc6632 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -2149,7 +2149,7 @@ bool CZapit::StopPlayBack(bool send_pmt, bool __attribute__ ((unused)) blank) if (playbackStopForced) return false; -#if BOXMODEL_DM820 || BOXMODEL_DM900 +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM900 videoDecoder->Stop(standby ? false : blank); #else videoDecoder->Stop(false);