mirror of
https://github.com/tuxbox-neutrino/libstb-hal.git
synced 2025-08-26 15:02:58 +02:00
correctly declare AVSYNC_TYPE
This commit is contained in:
@@ -3,6 +3,8 @@
|
||||
#ifndef _AUDIO_LIB_H_
|
||||
#define _AUDIO_LIB_H_
|
||||
|
||||
#include "../common/cs_types.h"
|
||||
|
||||
typedef enum
|
||||
{
|
||||
AUDIO_SYNC_WITH_PTS,
|
||||
@@ -76,7 +78,6 @@ class cAudio
|
||||
int Stop(void);
|
||||
bool Pause(bool Pcm = true);
|
||||
void SetStreamType(AUDIO_FORMAT type);
|
||||
#define AVSYNC_TYPE int
|
||||
void SetSyncMode(AVSYNC_TYPE Mode);
|
||||
|
||||
/* select channels */
|
||||
|
@@ -6,6 +6,7 @@
|
||||
#include <inttypes.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <linux/dvb/dmx.h>
|
||||
#include "../common/cs_types.h"
|
||||
|
||||
typedef enum
|
||||
{
|
||||
@@ -46,7 +47,6 @@ class cDemux
|
||||
int Read(unsigned char *buff, int len, int Timeout = 0);
|
||||
bool sectionFilter(unsigned short pid, const unsigned char * const filter, const unsigned char * const mask, int len, int Timeout = 0, const unsigned char * const negmask = NULL);
|
||||
bool pesFilter(const unsigned short pid);
|
||||
#define AVSYNC_TYPE int
|
||||
void SetSyncMode(AVSYNC_TYPE mode);
|
||||
void * getBuffer();
|
||||
void * getChannel();
|
||||
|
@@ -2,6 +2,7 @@
|
||||
#define _VIDEO_TD_H
|
||||
|
||||
#include <linux/dvb/video.h>
|
||||
#include "../common/cs_types.h"
|
||||
|
||||
typedef enum {
|
||||
ANALOG_SD_RGB_CINCH = 0x00,
|
||||
@@ -169,7 +170,6 @@ class cVideo
|
||||
/* set video_system */
|
||||
int SetVideoSystem(int video_system, bool remember = true);
|
||||
int SetStreamType(VIDEO_FORMAT type);
|
||||
#define AVSYNC_TYPE int
|
||||
void SetSyncMode(AVSYNC_TYPE mode);
|
||||
bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; };
|
||||
void SetCECAutoView(bool) { return; };
|
||||
|
23
common/cs_types.h
Normal file
23
common/cs_types.h
Normal file
@@ -0,0 +1,23 @@
|
||||
/* pretty useless, but we don't need to work around this if
|
||||
* we just copy it over... */
|
||||
|
||||
#ifndef __CS_TYPES_H_
|
||||
#define __CS_TYPES_H_
|
||||
|
||||
typedef enum
|
||||
{
|
||||
AVSYNC_DISABLED,
|
||||
AVSYNC_ENABLED,
|
||||
AVSYNC_AUDIO_IS_MASTER
|
||||
} AVSYNC_TYPE;
|
||||
|
||||
typedef unsigned long long u64;
|
||||
typedef unsigned int u32;
|
||||
typedef unsigned short u16;
|
||||
typedef unsigned char u8;
|
||||
typedef signed long long s64;
|
||||
typedef signed int s32;
|
||||
typedef signed short s16;
|
||||
typedef signed char s8;
|
||||
|
||||
#endif // __CS_TYPES_H_
|
@@ -2,6 +2,7 @@
|
||||
|
||||
#ifndef _AUDIO_TD_H_
|
||||
#define _AUDIO_TD_H_
|
||||
#include "../common/cs_types.h"
|
||||
|
||||
typedef enum
|
||||
{
|
||||
@@ -76,7 +77,6 @@ class cAudio
|
||||
int Stop(void);
|
||||
bool Pause(bool Pcm = true);
|
||||
void SetStreamType(AUDIO_FORMAT type);
|
||||
#define AVSYNC_TYPE int
|
||||
void SetSyncMode(AVSYNC_TYPE Mode);
|
||||
|
||||
/* select channels */
|
||||
|
@@ -6,6 +6,7 @@
|
||||
#include <inttypes.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <linux/dvb/dmx.h>
|
||||
#include "../common/cs_types.h"
|
||||
|
||||
typedef enum
|
||||
{
|
||||
@@ -46,7 +47,6 @@ class cDemux
|
||||
int Read(unsigned char *buff, int len, int Timeout = 0);
|
||||
bool sectionFilter(unsigned short pid, const unsigned char * const filter, const unsigned char * const mask, int len, int Timeout = 0, const unsigned char * const negmask = NULL);
|
||||
bool pesFilter(const unsigned short pid);
|
||||
#define AVSYNC_TYPE int
|
||||
void SetSyncMode(AVSYNC_TYPE mode);
|
||||
void * getBuffer();
|
||||
void * getChannel();
|
||||
|
@@ -2,6 +2,7 @@
|
||||
#define _VIDEO_TD_H
|
||||
|
||||
#include <linux/dvb/video.h>
|
||||
#include "../common/cs_types.h"
|
||||
|
||||
typedef enum {
|
||||
ANALOG_SD_RGB_CINCH = 0x00,
|
||||
@@ -169,7 +170,6 @@ class cVideo
|
||||
/* set video_system */
|
||||
int SetVideoSystem(int video_system, bool remember = true);
|
||||
int SetStreamType(VIDEO_FORMAT type);
|
||||
#define AVSYNC_TYPE int
|
||||
void SetSyncMode(AVSYNC_TYPE mode);
|
||||
bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; };
|
||||
void SetCECAutoView(bool) { return; };
|
||||
|
@@ -4,6 +4,7 @@
|
||||
#define _AUDIO_TD_H_
|
||||
|
||||
#include <hardware/aud/aud_inf.h>
|
||||
#include "../common/cs_types.h"
|
||||
|
||||
typedef enum
|
||||
{
|
||||
@@ -78,7 +79,6 @@ class cAudio
|
||||
int Stop(void);
|
||||
bool Pause(bool Pcm = true);
|
||||
void SetStreamType(AUDIO_FORMAT type);
|
||||
#define AVSYNC_TYPE int
|
||||
void SetSyncMode(AVSYNC_TYPE Mode);
|
||||
|
||||
/* select channels */
|
||||
|
@@ -8,6 +8,7 @@ extern "C" {
|
||||
#include <sys/ioctl.h>
|
||||
#include <hardware/xp/xp_osd_user.h>
|
||||
}
|
||||
#include "../common/cs_types.h"
|
||||
#if defined DMX_FILTER_SIZE
|
||||
#undef DMX_FILTER_SIZE
|
||||
#endif
|
||||
@@ -52,7 +53,6 @@ class cDemux
|
||||
int Read(unsigned char *buff, int len, int Timeout = 0);
|
||||
bool sectionFilter(unsigned short pid, const unsigned char * const filter, const unsigned char * const mask, int len, int Timeout = 0, const unsigned char * const negmask = NULL);
|
||||
bool pesFilter(const unsigned short pid);
|
||||
#define AVSYNC_TYPE int
|
||||
void SetSyncMode(AVSYNC_TYPE mode);
|
||||
void * getBuffer();
|
||||
void * getChannel();
|
||||
|
@@ -4,7 +4,7 @@
|
||||
#include <hardware/vid/vid_inf.h>
|
||||
#define video_format_t vidDispSize_t
|
||||
//#define video_displayformat_t vidDispMode_t
|
||||
|
||||
#include "../common/cs_types.h"
|
||||
|
||||
typedef enum {
|
||||
ANALOG_SD_RGB_SCART = 0x00,
|
||||
@@ -165,7 +165,6 @@ class cVideo
|
||||
/* set video_system */
|
||||
int SetVideoSystem(int video_system, bool remember = true);
|
||||
int SetStreamType(VIDEO_FORMAT type);
|
||||
#define AVSYNC_TYPE int
|
||||
void SetSyncMode(AVSYNC_TYPE mode);
|
||||
bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; };
|
||||
void SetCECAutoView(bool) { return; };
|
||||
|
Reference in New Issue
Block a user