mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-09-02 10:21:10 +02:00
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:
committed by
M. Liebmann
parent
aed22b3788
commit
e490f84ea8
@@ -23,8 +23,9 @@
|
||||
#ifndef __CCOLORGRADIENT__
|
||||
#define __CCOLORGRADIENT__
|
||||
|
||||
#include <driver/framebuffer.h>
|
||||
#include <inttypes.h>
|
||||
|
||||
class CFrameBuffer;
|
||||
class CColorGradient
|
||||
{
|
||||
private:
|
||||
|
@@ -26,6 +26,7 @@
|
||||
#include <global.h>
|
||||
#include <driver/rcinput.h>
|
||||
#include <driver/fade.h>
|
||||
#include <driver/framebuffer.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#if HAVE_COOL_HARDWARE
|
||||
|
@@ -22,8 +22,9 @@
|
||||
#ifndef __fade_f__
|
||||
#define __fade_f__
|
||||
|
||||
#include <driver/framebuffer.h>
|
||||
#include <inttypes.h>
|
||||
|
||||
class CFrameBuffer;
|
||||
class COSDFader
|
||||
{
|
||||
private:
|
||||
|
@@ -23,8 +23,8 @@
|
||||
#define __fb_window_h__
|
||||
|
||||
#include <driver/fontrenderer.h>
|
||||
#include <driver/framebuffer.h>
|
||||
|
||||
class CFrameBuffer;
|
||||
class CFBWindow
|
||||
{
|
||||
public:
|
||||
|
@@ -33,6 +33,7 @@
|
||||
#include <ft2build.h>
|
||||
#include FT_FREETYPE_H
|
||||
|
||||
#include <driver/framebuffer.h>
|
||||
#include <driver/fontrenderer.h>
|
||||
|
||||
#include <system/debug.h>
|
||||
|
@@ -28,6 +28,7 @@
|
||||
|
||||
#include <pthread.h>
|
||||
#include <string>
|
||||
#include <inttypes.h>
|
||||
|
||||
#include <ft2build.h>
|
||||
#include FT_FREETYPE_H
|
||||
@@ -36,9 +37,7 @@
|
||||
#include FT_CACHE_IMAGE_H
|
||||
#include FT_CACHE_SMALL_BITMAPS_H
|
||||
|
||||
#include "framebuffer.h"
|
||||
|
||||
|
||||
class CFrameBuffer;
|
||||
class FBFontRenderClass;
|
||||
class Font
|
||||
{
|
||||
|
@@ -22,8 +22,8 @@
|
||||
|
||||
#include <gui/movieinfo.h>
|
||||
#include <gui/components/cc.h>
|
||||
#include <driver/framebuffer.h>
|
||||
|
||||
class CFrameBuffer;
|
||||
class CMovieCut
|
||||
{
|
||||
private:
|
||||
|
@@ -1,3 +1,4 @@
|
||||
#include <config.h>
|
||||
#include "pv_config.h"
|
||||
#ifdef FBV_SUPPORT_BMP
|
||||
#include "pictureviewer.h"
|
||||
|
@@ -1,3 +1,4 @@
|
||||
#include <config.h>
|
||||
#include "pv_config.h"
|
||||
#include <cstring>
|
||||
#include <cstdlib>
|
||||
|
@@ -1,3 +1,4 @@
|
||||
#include <config.h>
|
||||
#include "pv_config.h"
|
||||
|
||||
#include <cstring>
|
||||
|
@@ -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);
|
||||
|
@@ -1,3 +1,4 @@
|
||||
#include <config.h>
|
||||
#include "pv_config.h"
|
||||
|
||||
#ifdef FBV_SUPPORT_PNG
|
||||
|
@@ -46,7 +46,6 @@
|
||||
#ifndef __RADIO_AUDIO_H
|
||||
#define __RADIO_AUDIO_H
|
||||
|
||||
#include <driver/framebuffer.h>
|
||||
#include <driver/fontrenderer.h>
|
||||
|
||||
#if 0
|
||||
|
@@ -26,9 +26,9 @@
|
||||
#ifndef __CVOLUME__
|
||||
#define __CVOLUME__
|
||||
|
||||
#include <driver/framebuffer.h>
|
||||
#include <gui/volumebar.h>
|
||||
|
||||
class CFramebuffer;
|
||||
class CVolume : public CChangeObserver
|
||||
{
|
||||
private:
|
||||
|
Reference in New Issue
Block a user