zapit/src/capmt.cpp: fix to use all 4 demuxes

This commit is contained in:
[CST] Focus
2013-01-07 17:34:18 +04:00
parent 20c25334cd
commit ba81d3ba90
2 changed files with 4 additions and 4 deletions

View File

@@ -47,7 +47,7 @@ class CCam : public CBasicClient
private: private:
virtual unsigned char getVersion(void) const; virtual unsigned char getVersion(void) const;
virtual const char *getSocketName(void) const; virtual const char *getSocketName(void) const;
int camask, demuxes[3]; int camask, demuxes[4];
int source_demux; int source_demux;
uint8_t cabuf[2048]; uint8_t cabuf[2048];
int calen; int calen;

View File

@@ -37,7 +37,7 @@
CCam::CCam() CCam::CCam()
{ {
camask = 0; camask = 0;
demuxes[0] = demuxes[1] = demuxes[2] = 0; demuxes[0] = demuxes[1] = demuxes[2] = demuxes[3] = 0;
source_demux = -1; source_demux = -1;
calen = 0; calen = 0;
} }
@@ -147,11 +147,11 @@ int CCam::makeMask(int demux, bool add)
else if(demuxes[demux] > 0) else if(demuxes[demux] > 0)
demuxes[demux]--; demuxes[demux]--;
for(int i = 0; i < 3; i++) { for(int i = 0; i < 4; i++) {
if(demuxes[i] > 0) if(demuxes[i] > 0)
mask |= 1 << i; mask |= 1 << i;
} }
DBG("demuxes %d:%d:%d old mask %d new mask %d", demuxes[0], demuxes[1], demuxes[2], camask, mask); DBG("demuxes %d:%d:%d:%d old mask %d new mask %d", demuxes[0], demuxes[1], demuxes[2], demuxes[3], camask, mask);
return mask; return mask;
} }