replace framebuffer.h include with forward declaration

instead of including framebuffer.h almost everywhere, replace it with
class CFrameBuffer forward declarations and/or generic system includes.
Add a hack to define fb_pixel_t to config.h (one reason for
framebuffer.h includes was the fb_pixel_t define)
This commit is contained in:
Stefan Seyfried
2017-02-05 13:05:07 +01:00
parent dcd9b982ad
commit 63b6efd1f5
60 changed files with 59 additions and 64 deletions

View File

@@ -1,3 +1,4 @@
#include <config.h>
#include "pv_config.h"
#ifdef FBV_SUPPORT_BMP
#include "pictureviewer.h"

View File

@@ -1,3 +1,4 @@
#include <config.h>
#include "pv_config.h"
#include <cstring>
#include <cstdlib>

View File

@@ -1,3 +1,4 @@
#include <config.h>
#include "pv_config.h"
#include <cstring>

View File

@@ -30,7 +30,7 @@
#include <vector>
#include <stdio.h> /* printf */
#include <sys/time.h> /* gettimeofday */
#include <driver/framebuffer.h>
#include <inttypes.h>
class CPictureViewer
{
struct cformathandler
@@ -64,7 +64,7 @@ class CPictureViewer
void Cleanup();
void SetVisible(int startx, int endx, int starty, int endy);
static double m_aspect_ratio_correction;
bool DisplayImage (const std::string & name, int posx, int posy, int width, int height, int transp=CFrameBuffer::TM_EMPTY);
bool DisplayImage (const std::string & name, int posx, int posy, int width, int height, int transp=0 /*CFrameBuffer::TM_EMPTY*/);
// bool DisplayLogo (uint64_t channel_id, int posx, int posy, int width, int height);
bool GetLogoName(const uint64_t& channel_id, const std::string& ChanName, std::string & name, int *width = NULL, int *height = NULL);
fb_pixel_t * getImage (const std::string & name, int width, int height);

View File

@@ -1,3 +1,4 @@
#include <config.h>
#include "pv_config.h"
#ifdef FBV_SUPPORT_PNG