mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 23:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

correctly declare AVSYNC_TYPE

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 84ee47fd7f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-28 (Sat, 28 Jul 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-07-28 22:51:29 +02:00
parent 6a5ad2af23
commit 823c006356
10 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
azbox/audio_lib.h
View File

@@ -3,6 +3,8 @@
#ifndef _AUDIO_LIB_H_ #ifndef _AUDIO_LIB_H_
#define _AUDIO_LIB_H_ #define _AUDIO_LIB_H_
#include "../common/cs_types.h"
typedef enum typedef enum
{ {
AUDIO_SYNC_WITH_PTS, AUDIO_SYNC_WITH_PTS,
@@ -76,7 +78,6 @@ class cAudio
int Stop(void); int Stop(void);
bool Pause(bool Pcm = true); bool Pause(bool Pcm = true);
void SetStreamType(AUDIO_FORMAT type); void SetStreamType(AUDIO_FORMAT type);
#define AVSYNC_TYPE int
void SetSyncMode(AVSYNC_TYPE Mode); void SetSyncMode(AVSYNC_TYPE Mode);
/* select channels */ /* select channels */

2
azbox/dmx_lib.h
View File

@@ -6,6 +6,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <linux/dvb/dmx.h> #include <linux/dvb/dmx.h>
#include "../common/cs_types.h"
typedef enum typedef enum
{ {
@@ -46,7 +47,6 @@ class cDemux
int Read(unsigned char *buff, int len, int Timeout = 0); 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 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); bool pesFilter(const unsigned short pid);
#define AVSYNC_TYPE int
void SetSyncMode(AVSYNC_TYPE mode); void SetSyncMode(AVSYNC_TYPE mode);
void * getBuffer(); void * getBuffer();
void * getChannel(); void * getChannel();

2
azbox/video_lib.h
View File

@@ -2,6 +2,7 @@
#define _VIDEO_TD_H #define _VIDEO_TD_H
#include <linux/dvb/video.h> #include <linux/dvb/video.h>
#include "../common/cs_types.h"
typedef enum { typedef enum {
ANALOG_SD_RGB_CINCH = 0x00, ANALOG_SD_RGB_CINCH = 0x00,
@@ -169,7 +170,6 @@ class cVideo
/* set video_system */ /* set video_system */
int SetVideoSystem(int video_system, bool remember = true); int SetVideoSystem(int video_system, bool remember = true);
int SetStreamType(VIDEO_FORMAT type); int SetStreamType(VIDEO_FORMAT type);
#define AVSYNC_TYPE int
void SetSyncMode(AVSYNC_TYPE mode); void SetSyncMode(AVSYNC_TYPE mode);
bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; }; bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; };
void SetCECAutoView(bool) { return; }; void SetCECAutoView(bool) { return; };

23
common/cs_types.h Normal file
View 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
libspark/audio_lib.h
View File

@@ -2,6 +2,7 @@
#ifndef _AUDIO_TD_H_ #ifndef _AUDIO_TD_H_
#define _AUDIO_TD_H_ #define _AUDIO_TD_H_
#include "../common/cs_types.h"
typedef enum typedef enum
{ {
@@ -76,7 +77,6 @@ class cAudio
int Stop(void); int Stop(void);
bool Pause(bool Pcm = true); bool Pause(bool Pcm = true);
void SetStreamType(AUDIO_FORMAT type); void SetStreamType(AUDIO_FORMAT type);
#define AVSYNC_TYPE int
void SetSyncMode(AVSYNC_TYPE Mode); void SetSyncMode(AVSYNC_TYPE Mode);
/* select channels */ /* select channels */

2
libspark/dmx_lib.h
View File

@@ -6,6 +6,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <linux/dvb/dmx.h> #include <linux/dvb/dmx.h>
#include "../common/cs_types.h"
typedef enum typedef enum
{ {
@@ -46,7 +47,6 @@ class cDemux
int Read(unsigned char *buff, int len, int Timeout = 0); 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 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); bool pesFilter(const unsigned short pid);
#define AVSYNC_TYPE int
void SetSyncMode(AVSYNC_TYPE mode); void SetSyncMode(AVSYNC_TYPE mode);
void * getBuffer(); void * getBuffer();
void * getChannel(); void * getChannel();

2
libspark/video_lib.h
View File

@@ -2,6 +2,7 @@
#define _VIDEO_TD_H #define _VIDEO_TD_H
#include <linux/dvb/video.h> #include <linux/dvb/video.h>
#include "../common/cs_types.h"
typedef enum { typedef enum {
ANALOG_SD_RGB_CINCH = 0x00, ANALOG_SD_RGB_CINCH = 0x00,
@@ -169,7 +170,6 @@ class cVideo
/* set video_system */ /* set video_system */
int SetVideoSystem(int video_system, bool remember = true); int SetVideoSystem(int video_system, bool remember = true);
int SetStreamType(VIDEO_FORMAT type); int SetStreamType(VIDEO_FORMAT type);
#define AVSYNC_TYPE int
void SetSyncMode(AVSYNC_TYPE mode); void SetSyncMode(AVSYNC_TYPE mode);
bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; }; bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; };
void SetCECAutoView(bool) { return; }; void SetCECAutoView(bool) { return; };

2
libtriple/audio_td.h
View File

@@ -4,6 +4,7 @@
#define _AUDIO_TD_H_ #define _AUDIO_TD_H_
#include <hardware/aud/aud_inf.h> #include <hardware/aud/aud_inf.h>
#include "../common/cs_types.h"
typedef enum typedef enum
{ {
@@ -78,7 +79,6 @@ class cAudio
int Stop(void); int Stop(void);
bool Pause(bool Pcm = true); bool Pause(bool Pcm = true);
void SetStreamType(AUDIO_FORMAT type); void SetStreamType(AUDIO_FORMAT type);
#define AVSYNC_TYPE int
void SetSyncMode(AVSYNC_TYPE Mode); void SetSyncMode(AVSYNC_TYPE Mode);
/* select channels */ /* select channels */

2
libtriple/dmx_td.h
View File

@@ -8,6 +8,7 @@ extern "C" {
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <hardware/xp/xp_osd_user.h> #include <hardware/xp/xp_osd_user.h>
} }
#include "../common/cs_types.h"
#if defined DMX_FILTER_SIZE #if defined DMX_FILTER_SIZE
#undef DMX_FILTER_SIZE #undef DMX_FILTER_SIZE
#endif #endif
@@ -52,7 +53,6 @@ class cDemux
int Read(unsigned char *buff, int len, int Timeout = 0); 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 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); bool pesFilter(const unsigned short pid);
#define AVSYNC_TYPE int
void SetSyncMode(AVSYNC_TYPE mode); void SetSyncMode(AVSYNC_TYPE mode);
void * getBuffer(); void * getBuffer();
void * getChannel(); void * getChannel();

3
libtriple/video_td.h
View File

@@ -4,7 +4,7 @@
#include <hardware/vid/vid_inf.h> #include <hardware/vid/vid_inf.h>
#define video_format_t vidDispSize_t #define video_format_t vidDispSize_t
//#define video_displayformat_t vidDispMode_t //#define video_displayformat_t vidDispMode_t
#include "../common/cs_types.h"
typedef enum { typedef enum {
ANALOG_SD_RGB_SCART = 0x00, ANALOG_SD_RGB_SCART = 0x00,
@@ -165,7 +165,6 @@ class cVideo
/* set video_system */ /* set video_system */
int SetVideoSystem(int video_system, bool remember = true); int SetVideoSystem(int video_system, bool remember = true);
int SetStreamType(VIDEO_FORMAT type); int SetStreamType(VIDEO_FORMAT type);
#define AVSYNC_TYPE int
void SetSyncMode(AVSYNC_TYPE mode); void SetSyncMode(AVSYNC_TYPE mode);
bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; }; bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; };
void SetCECAutoView(bool) { return; }; void SetCECAutoView(bool) { return; };