Skip to content

Commit

Permalink
DM7020HD added
Browse files Browse the repository at this point in the history
  • Loading branch information
BPanther committed Jul 10, 2024
1 parent e77f46b commit bccc651
Show file tree
Hide file tree
Showing 24 changed files with 64 additions and 61 deletions.
17 changes: 10 additions & 7 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|dm7080|dm8000)
vuduo|vuduo2|vuuno|vuultimo|dm7020hd|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, 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)
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|dm7080|dm8000)
vuduo|vuduo2|vuuno|vuultimo|dm7020hd|dm820|dm7080|dm8000)
if test "$BOXTYPE" = "mipsbox"; then
BOXMODEL="$withval"
else
Expand Down Expand Up @@ -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")
Expand All @@ -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])
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions lib/liblcddisplay/lcddisplay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include <byteswap.h>
#include <string.h>

#if BOXMODEL_DM8000 || BOXMODEL_DM7080
#if BOXMODEL_DM8000 || BOXMODEL_DM7080 || BOXMODEL_DM7020HD
#include <system/helpers.h>
#endif

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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);
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 || BOXMODEL_DM7080
#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM7020HD
#include <driver/lcdd.h>
#define CVFD CLCD
#else
Expand Down
2 changes: 1 addition & 1 deletion src/driver/simple_display.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions src/gui/audio_select.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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] =
{
Expand Down Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions src/gui/audio_setup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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] =
{
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
//---------------------------------------------------------
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 || 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
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 || 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);
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 || 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
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 || 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
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 || 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
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 || 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
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 || 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);
Expand Down Expand Up @@ -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);
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 || 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());
Expand Down Expand Up @@ -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());
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 || 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);
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 || 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);
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 || 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);
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 || 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);
Expand Down Expand Up @@ -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);
Expand Down
Loading

0 comments on commit bccc651

Please sign in to comment.