mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

eitd/dmx: remove unused pauselock; add default constructor

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

32
src/eitd/dmx.cpp
View File

@@ -54,17 +54,36 @@ extern void showProfiling(std::string text);
DMX::DMX(const unsigned short p, const unsigned short bufferSizeInKB, const bool c, int dmx_source) DMX::DMX(const unsigned short p, const unsigned short bufferSizeInKB, const bool c, int dmx_source)
{ {
dmx_num = dmx_source; dmx_num = dmx_source;
dmxBufferSizeInKB = bufferSizeInKB;
pID = p;
cache = c;
init();
}
DMX::DMX()
{
pID = 0;
cache = true;
dmx_num = 0;
dmxBufferSizeInKB = 512;
init();
}
void DMX::init()
{
fd = -1; fd = -1;
lastChanged = time_monotonic(); lastChanged = time_monotonic();
filter_index = 0; filter_index = 0;
pID = p; real_pauseCounter = 0;
dmxBufferSizeInKB = bufferSizeInKB; current_service = 0;
first_skipped = 0;
#if HAVE_TRIPLEDRAGON #if HAVE_TRIPLEDRAGON
/* hack, to keep the TD changes in one place. */ /* hack, to keep the TD changes in one place. */
dmxBufferSizeInKB = 128; /* 128kB is enough on TD */ dmxBufferSizeInKB = 128; /* 128kB is enough on TD */
dmx_num = 0; /* always use demux 0 */ dmx_num = 0; /* always use demux 0 */
#endif #endif
pthread_mutex_init(&pauselock, NULL); // default = fast mutex
#ifdef DEBUG_MUTEX #ifdef DEBUG_MUTEX
pthread_mutexattr_t start_stop_mutex_attr; pthread_mutexattr_t start_stop_mutex_attr;
pthread_mutexattr_init(&start_stop_mutex_attr); pthread_mutexattr_init(&start_stop_mutex_attr);
@@ -74,20 +93,15 @@ DMX::DMX(const unsigned short p, const unsigned short bufferSizeInKB, const bool
pthread_mutex_init(&start_stop_mutex, NULL); // default = fast mutex pthread_mutex_init(&start_stop_mutex, NULL); // default = fast mutex
#endif #endif
pthread_cond_init (&change_cond, NULL); pthread_cond_init (&change_cond, NULL);
real_pauseCounter = 0;
current_service = 0;
first_skipped = 0;
cache = c;
} }
DMX::~DMX() DMX::~DMX()
{ {
first_skipped = 0; first_skipped = 0;
myDMXOrderUniqueKey.clear(); myDMXOrderUniqueKey.clear();
pthread_mutex_destroy(&pauselock);
pthread_mutex_destroy(&start_stop_mutex); pthread_mutex_destroy(&start_stop_mutex);
pthread_cond_destroy (&change_cond); pthread_cond_destroy (&change_cond);
// FIXME
closefd(); closefd();
} }

14
src/eitd/dmx.h
View File

@@ -43,16 +43,16 @@ class DMX
{ {
private: private:
int fd; int fd;
cDemux * dmx; cDemux * dmx;
int dmx_num; int dmx_num;
pthread_mutex_t pauselock;
unsigned short pID; unsigned short pID;
unsigned short dmxBufferSizeInKB; unsigned short dmxBufferSizeInKB;
sections_id_t first_skipped; sections_id_t first_skipped;
int current_service; int current_service;
unsigned char eit_version; unsigned char eit_version;
bool cache; /* should read sections be cached? true for all but dmxCN */ bool cache; /* should read sections be cached? true for all but dmxCN */
int real_pauseCounter;
inline bool isOpen(void) { inline bool isOpen(void) {
return (fd != -1); 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); 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); 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: public:
struct s_filters struct s_filters
{ {
@@ -74,11 +76,11 @@ public:
int filter_index; int filter_index;
time_t lastChanged; time_t lastChanged;
int real_pauseCounter;
pthread_cond_t change_cond; pthread_cond_t change_cond;
pthread_mutex_t start_stop_mutex; 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(const unsigned short p, const unsigned short bufferSizeInKB, const bool cache = true, int dmx_source = 0);
~DMX(); ~DMX();