Skip to content

Commit

Permalink
dm7080 added
Browse files Browse the repository at this point in the history
  • Loading branch information
BPanther committed Jun 2, 2024
1 parent 35c7538 commit ab1d95f
Show file tree
Hide file tree
Showing 30 changed files with 70 additions and 67 deletions.
15 changes: 9 additions & 6 deletions acinclude.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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"
;;
Expand All @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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")
Expand All @@ -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])
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/driver/display.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <driver/vfd.h>
#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 <driver/lcdd.h>
#define CVFD CLCD
#else
Expand Down
2 changes: 1 addition & 1 deletion src/driver/lcdd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/driver/rcinput.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/gui/bookmarkmanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/gui/bouquetlist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/gui/channellist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/gui/filebrowser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/gui/miscsettings_menu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/gui/miscsettings_menu.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/gui/moviebrowser/mb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/gui/movieplayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/gui/pictureviewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions src/gui/scan.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/gui/timerlist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/gui/upnpbrowser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
10 changes: 5 additions & 5 deletions src/gui/vfd_setup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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;
Expand All @@ -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
{
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/gui/videosettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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] =
{
Expand Down Expand Up @@ -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"))
Expand Down
2 changes: 1 addition & 1 deletion src/gui/widget/keyboard_input.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/gui/widget/menue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/gui/widget/stringinput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading

0 comments on commit ab1d95f

Please sign in to comment.