projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add possibility to set per service ac3/pcm delay (not yet via gui)
[vuplus_dvbapp]
/
lib
/
dvb
/
idvb.h
diff --git
a/lib/dvb/idvb.h
b/lib/dvb/idvb.h
index
8b86866
..
6934271
100644
(file)
--- a/
lib/dvb/idvb.h
+++ b/
lib/dvb/idvb.h
@@
-18,6
+18,14
@@
#include <libsig_comp.h>
#include <connection.h>
#include <libsig_comp.h>
#include <connection.h>
+#if defined(__GNUC__) && ((__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ == 4 ) // check if gcc version >= 3.1
+#include <ext/slist>
+#define CAID_LIST __gnu_cxx::slist<uint16_t>
+#else
+#include <slist>
+#define CAID_LIST std::slist<uint16_t>
+#endif
+
struct eBouquet
{
std::string m_bouquet_name;
struct eBouquet
{
std::string m_bouquet_name;
@@
-220,10
+228,14
@@
class eDVBChannelQuery;
class eDVBService: public iStaticServiceInformation
{
DECLARE_REF(eDVBService);
class eDVBService: public iStaticServiceInformation
{
DECLARE_REF(eDVBService);
+ int *m_cache;
+ void initCache();
+ void copyCache(int *source);
public:
enum cacheID
{
public:
enum cacheID
{
- cVPID, cAPID, cTPID, cPCRPID, cAC3PID, cVTYPE, cACHANNEL, cacheMax
+ cVPID, cAPID, cTPID, cPCRPID, cAC3PID,
+ cVTYPE, cACHANNEL, cAC3DELAY, cPCMDELAY, cacheMax
};
int getCacheEntry(cacheID);
};
int getCacheEntry(cacheID);
@@
-250,9
+262,8
@@
public:
bool usePMT() const { return !(m_flags & dxNoDVB); }
bool usePMT() const { return !(m_flags & dxNoDVB); }
-
// std::set<int>
m_ca;
+
CAID_LIST
m_ca;
- int m_cache[cacheMax];
virtual ~eDVBService();
eDVBService &operator=(const eDVBService &);
virtual ~eDVBService();
eDVBService &operator=(const eDVBService &);
@@
-584,6
+595,12
@@
public:
enum { ac_left, ac_stereo, ac_right };
/** Set Displayed Audio Channel */
virtual RESULT setAudioChannel(int channel)=0;
enum { ac_left, ac_stereo, ac_right };
/** Set Displayed Audio Channel */
virtual RESULT setAudioChannel(int channel)=0;
+ virtual int getAudioChannel()=0;
+
+ virtual RESULT setPCMDelay(int delay)=0;
+ virtual int getPCMDelay()=0;
+ virtual RESULT setAC3Delay(int delay)=0;
+ virtual int getAC3Delay()=0;
/** Set Displayed Videotext PID */
virtual RESULT setTextPID(int vpid)=0;
/** Set Displayed Videotext PID */
virtual RESULT setTextPID(int vpid)=0;