mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 23:13:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

- configure: simplify --enable-lcd code; remove obsolete ENABLE_LCDAPI

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2022-11-07 21:22:46 +01:00
committed by Thilo Graf
parent 235e2a82fe
commit 459456723e
2 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
configure.ac
View File

@@ -181,27 +181,15 @@ AM_CONDITIONAL(ENABLE_LCD4LINUX, test "$enable_lcd4linux" = "yes")
# lcd # lcd
AC_ARG_ENABLE(lcd, AC_ARG_ENABLE(lcd,
AS_HELP_STRING(--enable-lcd,include lcd support), AS_HELP_STRING([--enable-lcd], [enable internal lcd support @<:@default=no@:>@]),
,[enable_lcd=no]) AC_DEFINE(ENABLE_LCD, 1, [enable internal lcd support]))
AM_CONDITIONAL(ENABLE_LCD,test "$enable_lcd" = "yes") AM_CONDITIONAL(ENABLE_LCD, test "$enable_lcd" = "yes")
if test "$enable_lcd" = "yes"; then
AC_DEFINE(ENABLE_LCD,1,[include lcd support])
fi
# lcd update # lcd update
AM_CONDITIONAL(LCD_UPDATE,test "$enable_lcd_update" = "yes")
if test "$enable_lcd" = "yes"; then if test "$enable_lcd" = "yes"; then
AC_DEFINE(LCD_UPDATE,1,[include lcd update support]) AC_DEFINE(LCD_UPDATE, 1, [include internal lcd update support])
fi
# lcdapi
AM_CONDITIONAL(ENABLE_LCDAPI,test "$enable_lcd" = "yes")
if test "$enable_lcd" = "yes"; then
AC_DEFINE(ENABLE_LCDAPI,1,[include lcd api support])
fi fi
AM_CONDITIONAL(LCD_UPDATE, test "$enable_lcd" = "yes")
AC_ARG_ENABLE(graphlcd, AC_ARG_ENABLE(graphlcd,
AS_HELP_STRING([--enable-graphlcd], [enable GraphLCD support @<:@default=no@:>@]), AS_HELP_STRING([--enable-graphlcd], [enable GraphLCD support @<:@default=no@:>@]),

8
src/driver/vfd.h
View File

@@ -38,7 +38,7 @@
#define __USE_FILE_OFFSET64 1 #define __USE_FILE_OFFSET64 1
#endif #endif
#include "driver/file.h" #include "driver/file.h"
#endif // LCD_UPDATE #endif // VFD_UPDATE
#include <pthread.h> #include <pthread.h>
#include <string> #include <string>
@@ -62,7 +62,7 @@ class CVFD
MODE_PROGRESSBAR, MODE_PROGRESSBAR,
MODE_PROGRESSBAR2, MODE_PROGRESSBAR2,
MODE_INFOBOX MODE_INFOBOX
#endif // LCD_UPDATE #endif // VFD_UPDATE
}; };
enum AUDIOMODES enum AUDIOMODES
@@ -163,7 +163,7 @@ class CVFD
void wake_up(); void wake_up();
MODES getMode(void) { return mode; }; MODES getMode(void) { return mode; };
std::string getServicename(void) { return servicename; } std::string getServicename(void) { return servicename; }
#ifdef LCD_UPDATE #ifdef VFD_UPDATE
private: private:
CFileList* m_fileList; CFileList* m_fileList;
int m_fileListPos; int m_fileListPos;
@@ -185,7 +185,7 @@ class CVFD
void showInfoBox(const char * const title = NULL,const char * const text = NULL,int autoNewline = -1,int timer = -1); void showInfoBox(const char * const title = NULL,const char * const text = NULL,int autoNewline = -1,int timer = -1);
void showProgressBar(int global = -1,const char * const text = NULL,int show_escape = -1,int timer = -1); void showProgressBar(int global = -1,const char * const text = NULL,int show_escape = -1,int timer = -1);
void showProgressBar2(int local = -1,const char * const text_local = NULL,int global = -1,const char * const text_global = NULL,int show_escape = -1); void showProgressBar2(int local = -1,const char * const text_local = NULL,int global = -1,const char * const text_global = NULL,int show_escape = -1);
#endif // LCD_UPDATE #endif // VFD_UPDATE
}; };