fix generic build

This commit is contained in:
Jacek Jendrzej
2017-11-03 18:27:35 +01:00
parent 056db018ab
commit a47c399a19
9 changed files with 28 additions and 1 deletions

View File

@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
lib_LTLIBRARIES = libstb-hal.la
libstb_hal_la_SOURCES =
SUBDIRS = common tools
bin_PROGRAMS = libstb-hal-test
#bin_PROGRAMS = libstb-hal-test
libstb_hal_la_LIBADD = \
common/libcommon.la

View File

@@ -31,6 +31,8 @@ hw_caps_t *get_hwcaps(void)
caps.has_HDMI = 1;
caps.display_xres = 8;
caps.can_set_display_brightness = 0;
caps.display_can_deepstandby = 0;
caps.display_can_set_brightness = 0;
strcpy(caps.boxvendor, "AZBox");
const char *tmp;
char buf[64];

View File

@@ -28,6 +28,8 @@ hw_caps_t *get_hwcaps(void)
caps.display_type = HW_DISPLAY_LINE_TEXT;
caps.has_HDMI = 1;
caps.display_xres = 8;
caps.display_can_deepstandby = 0;
caps.display_can_set_brightness = 0;
caps.can_set_display_brightness = 0;
strcpy(caps.boxvendor, "Generic");
strcpy(caps.boxname, "PC");

View File

@@ -7,6 +7,10 @@
#include <stdint.h>
#include "cs_types.h"
#include <vector>
#include <set>
typedef std::set<int> ca_map_t;
typedef ca_map_t::iterator ca_map_iterator_t;
typedef std::vector<u16> CaIdVector;
typedef std::vector<u16>::iterator CaIdVectorIterator;
typedef std::vector<u16>::const_iterator CaIdVectorConstIterator;
@@ -92,6 +96,8 @@ public:
static cCA *GetInstance(void);
bool SendPMT(int Unit, unsigned char *Data, int Len, CA_SLOT_TYPE SlotType = CA_SLOT_TYPE_ALL);
bool SendCAPMT(u64 /*Source*/, u8 /*DemuxSource*/, u8 /*DemuxMask*/, const unsigned char * /*CAPMT*/, u32 /*CAPMTLen*/, const unsigned char * /*RawPMT*/, u32 /*RawPMTLen*/, enum CA_SLOT_TYPE SlotType = CA_SLOT_TYPE_ALL) { (void)SlotType; return true; };
bool SendCAPMT(u64 /*Source*/, u8 /*DemuxSource*/, u8 /*DemuxMask*/, const unsigned char * /*CAPMT*/, u32 /*CAPMTLen*/, const unsigned char * /*RawPMT*/, u32 /*RawPMTLen*/, enum CA_SLOT_TYPE SlotType = CA_SLOT_TYPE_ALL, unsigned char scrambled = 0, ca_map_t camap ={0}, int mode = 0, bool enable = false) { (void)SlotType;(void)scrambled;(void)camap;(void)mode;(void)enable; return true; };
bool SendMessage(const CA_MESSAGE *Msg);
void SetInitMask(enum CA_INIT_MASK InitMask);
int GetCAIDS(CaIdVector & /*Caids*/) { return 0; };

View File

@@ -36,6 +36,8 @@ typedef struct hw_caps
display_type_t display_type;
int display_xres; /* x resolution or chars per line */
int display_yres;
int display_can_deepstandby;
int display_can_set_brightness;
int can_set_display_brightness;
char boxvendor[64];
char boxname[64];

View File

@@ -49,6 +49,7 @@ public:
bool GetPosition(int &position, int &duration);
bool SetPosition(int position, bool absolute = false);
void FindAllPids(uint16_t *pids, unsigned short *aud_flags, uint16_t *num, std::string *language);
void FindAllPids(int *apids, unsigned int *ac3flags, uint32_t *numpida, std::string *language){FindAllPids((uint16_t*)apids, (unsigned short*)ac3flags, (uint16_t*) numpida, language);}
void FindAllSubs(uint16_t *pids, unsigned short *supported, uint16_t *num, std::string *language);
bool SelectSubtitles(int pid, std::string charset = "");
void GetChapters(std::vector<int> &positions, std::vector<std::string> &titles);
@@ -56,6 +57,14 @@ public:
void GetTitles(std::vector<int> &playlists, std::vector<std::string> &titles, int &current);
void SetTitle(int title);
uint64_t GetReadCount(void);
void FindAllTeletextsubtitlePids(int *, unsigned int *numpids, std::string *, int *, int *){*numpids = 0;}
void FindAllSubtitlePids(int * /*pids*/, unsigned int *numpids, std::string * /*language*/){*numpids = 0;}
int GetSubtitlePid(void){return 0;}
bool SetTeletextPid(int /*pid*/){return true;}
int GetAPid(){return 0;}
void GetMetadata(std::vector<std::string> /*&keys*/, std::vector<std::string> /*&values*/){}
void GetPts(uint64_t &/*pts*/){}
bool SetSubtitlePid(int /*pid*/){return false;}
//
cPlayback(int num = 0);
~cPlayback();

View File

@@ -38,6 +38,8 @@ hw_caps_t *get_hwcaps(void)
caps.has_SCART = 1;
caps.display_xres = 4;
caps.can_set_display_brightness = 0;
caps.display_can_deepstandby = 0;
caps.display_can_set_brightness = 0;
caps.force_tuner_2G = 1; /* I have patched the drivers to fix this, but not everyone has */
strcpy(caps.boxvendor, "SPARK");
const char *tmp;

View File

@@ -24,6 +24,8 @@ static hw_caps_t caps = {
.display_xres = 128,
.display_yres = 64,
.can_set_display_brightness = 0,
.display_can_deepstandby = 0;
.display_can_set_brightness = 0;
.boxvendor = "Armas",
.boxname = "TripleDragon",
.boxarch = "ppc405"

View File

@@ -30,6 +30,8 @@ hw_caps_t *get_hwcaps(void)
caps.has_HDMI = 1;
caps.display_xres = 8;
caps.can_set_display_brightness = 0;
caps.display_can_deepstandby = 0;
caps.display_can_set_brightness = 0;
strcpy(caps.boxvendor, "Raspberry");
strcpy(caps.boxname, "Pi");
if (! uname(&u))