diff --git a/Makefile.am b/Makefile.am index b7c41d7..7798a2c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/azbox/hardware_caps.c b/azbox/hardware_caps.c index da34ce1..0f4897e 100644 --- a/azbox/hardware_caps.c +++ b/azbox/hardware_caps.c @@ -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]; diff --git a/generic-pc/hardware_caps.c b/generic-pc/hardware_caps.c index f0b9b8b..f695775 100644 --- a/generic-pc/hardware_caps.c +++ b/generic-pc/hardware_caps.c @@ -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"); diff --git a/include/ca.h b/include/ca.h index 0fdda6f..1c468c7 100644 --- a/include/ca.h +++ b/include/ca.h @@ -7,6 +7,10 @@ #include #include "cs_types.h" #include +#include +typedef std::set ca_map_t; +typedef ca_map_t::iterator ca_map_iterator_t; + typedef std::vector CaIdVector; typedef std::vector::iterator CaIdVectorIterator; typedef std::vector::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; }; diff --git a/include/hardware_caps.h b/include/hardware_caps.h index b6ec28f..f2809da 100644 --- a/include/hardware_caps.h +++ b/include/hardware_caps.h @@ -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]; diff --git a/include/playback_hal.h b/include/playback_hal.h index 6aec52a..7b23057 100644 --- a/include/playback_hal.h +++ b/include/playback_hal.h @@ -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 &positions, std::vector &titles); @@ -56,6 +57,14 @@ public: void GetTitles(std::vector &playlists, std::vector &titles, int ¤t); 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 /*&keys*/, std::vector /*&values*/){} + void GetPts(uint64_t &/*pts*/){} + bool SetSubtitlePid(int /*pid*/){return false;} // cPlayback(int num = 0); ~cPlayback(); diff --git a/libspark/hardware_caps.c b/libspark/hardware_caps.c index 8be0b29..192d996 100644 --- a/libspark/hardware_caps.c +++ b/libspark/hardware_caps.c @@ -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; diff --git a/libtriple/hardware_caps.c b/libtriple/hardware_caps.c index 79c7977..9bb24d0 100644 --- a/libtriple/hardware_caps.c +++ b/libtriple/hardware_caps.c @@ -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" diff --git a/raspi/hardware_caps.c b/raspi/hardware_caps.c index 34a15f7..68b4524 100644 --- a/raspi/hardware_caps.c +++ b/raspi/hardware_caps.c @@ -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))