eitd/dmx: remove unused pauselock; add default constructor

This commit is contained in:
[CST] Focus
2012-02-10 20:16:19 +04:00
parent 358cba5227
commit 5a0fce7700
2 changed files with 31 additions and 15 deletions

View File

@@ -43,16 +43,16 @@ class DMX
{
private:
int fd;
cDemux * dmx;
int dmx_num;
pthread_mutex_t pauselock;
int fd;
cDemux * dmx;
int dmx_num;
unsigned short pID;
unsigned short dmxBufferSizeInKB;
sections_id_t first_skipped;
sections_id_t first_skipped;
int current_service;
unsigned char eit_version;
bool cache; /* should read sections be cached? true for all but dmxCN */
int real_pauseCounter;
inline bool isOpen(void) {
return (fd != -1);
@@ -63,6 +63,8 @@ private:
bool check_complete(const unsigned char table_id, const unsigned short extension_id, const unsigned short onid, const unsigned short tsid, const unsigned char);
sections_id_t create_sections_id(const unsigned char table_id, const unsigned short extension_id, const unsigned char section_number, const unsigned short onid, const unsigned short tsid);
void init();
public:
struct s_filters
{
@@ -74,11 +76,11 @@ public:
int filter_index;
time_t lastChanged;
int real_pauseCounter;
pthread_cond_t change_cond;
pthread_mutex_t start_stop_mutex;
DMX();
DMX(const unsigned short p, const unsigned short bufferSizeInKB, const bool cache = true, int dmx_source = 0);
~DMX();