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

display: add class CDisplay

Browse Source 
This should fix broken build with --enable-lcd (BOXMODEL_OSMIO4KPLUS)

FIXME: CLCD::setVolume() needs fix because it contains no code.

The concept to overwrite CVFD with CLCD should be thought over, see:

display.h:

#if BOXMODEL_OSMIO4KPLUS
#include <driver/lcdd.h>
#define CVFD CLCD
#else
#include <driver/simple_display.h>
#endif

A plan with base- and subclasses and overwritable members should be
more sustainable. It will be coming to a mess, and if not yet, it will
be at some point, especially since nothing was documented.
This commit is contained in:
Thilo Graf
2022-11-24 21:08:00 +01:00
parent 8f2de59f0f
commit ca02407d76
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/driver/display.h
View File

@@ -13,3 +13,19 @@
#ifdef ENABLE_GRAPHLCD #ifdef ENABLE_GRAPHLCD
#include <driver/glcd/glcd.h> #include <driver/glcd/glcd.h>
#endif #endif
#ifndef __DISPLAY_H__
#define __DISPLAY_H__
class CDisplay
{
public:
CDisplay(){};
virtual ~CDisplay(){};
virtual void showServicename(const std::string, const bool ){}; // UTF-8
virtual void showServicename(const std::string, int){}; // UTF-8
};
#endif

5
src/driver/lcdd.h
View File

@@ -39,7 +39,7 @@
#endif #endif
#include <driver/file.h> #include <driver/file.h>
#endif // LCD_UPDATE #endif // LCD_UPDATE
#include "display.h"
#include <configfile.h> #include <configfile.h>
#include <pthread.h> #include <pthread.h>
@@ -132,7 +132,7 @@ typedef enum
class CLCDPainter; class CLCDPainter;
class LcdFontRenderClass; class LcdFontRenderClass;
class CLCD class CLCD : public CDisplay
{ {
public: public:
@@ -244,6 +244,7 @@ class CLCD
/** blocks for duration seconds */ /** blocks for duration seconds */
void showRCLock(int duration = 2); void showRCLock(int duration = 2);
void showVolume(const char vol, const bool perform_update = true); void showVolume(const char vol, const bool perform_update = true);
void setVolume(const char /*vol*/){printf("#### FIXME: __function__, at __FILE__ ###\n");}; // FIXME: fake member to fix build with --enable-lcd
void showPercentOver(const unsigned char perc, const bool perform_update = true, const MODES m = MODE_TVRADIO); void showPercentOver(const unsigned char perc, const bool perform_update = true, const MODES m = MODE_TVRADIO);
void showMenuText(const int position, const char *text, const int highlight = -1, const bool utf_encoded = false); void showMenuText(const int position, const char *text, const int highlight = -1, const bool utf_encoded = false);
void showAudioTrack(const std::string &artist, const std::string &title, const std::string &album); void showAudioTrack(const std::string &artist, const std::string &title, const std::string &album);

4
src/driver/vfd.h
View File

@@ -39,13 +39,13 @@
#endif #endif
#include "driver/file.h" #include "driver/file.h"
#endif // VFD_UPDATE #endif // VFD_UPDATE
#include "display.h"
#include <pthread.h> #include <pthread.h>
#include <string> #include <string>
#include <cs_frontpanel.h> #include <cs_frontpanel.h>
class CVFD class CVFD : public CDisplay
{ {
public: public: