mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

eitd: little cleanup

Browse Source
This commit is contained in:
[CST] Focus
2012-03-07 16:44:35 +04:00
parent 02d748eca9
commit f4ba558155
3 changed files with 39 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/eitd/dmx.cpp
View File

@@ -1,15 +1,16 @@
/*
* $Header: /cvs/tuxbox/apps/tuxbox/neutrino/daemons/sectionsd/dmx.cpp,v 1.51 2009/06/14 21:46:03 rhabarber1848 Exp $
*
* DMX class (sectionsd) - d-box2 linux project
*
* (C) 2001 by fnbrd,
* (C) 2001 by fnbrd (fnbrd@gmx.de),
* 2003 by thegoodguy <thegoodguy@berlios.de>
*
* Copyright (C) 2011-2012 CoolStream International Ltd
*
* License: GPLv2
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
* the Free Software Foundation;
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,7 +23,6 @@
*
*/
#include <dmx.h>
#include <dmxapi.h>
#include <debug.h>
@@ -44,7 +44,7 @@
#include "debug.h"
//#define DEBUG_MUTEX 1
//#define DEBUG_DEMUX 1 // debug start/close/change
#define DEBUG_DEMUX 1 // debug start/close/change
//#define DEBUG_CACHED_SECTIONS 1
//#define DEBUG_COMPLETE_SECTIONS 1
#define DEBUG_COMPLETE 1
@@ -203,11 +203,10 @@ inline sections_id_t create_sections_id(const uint8_t table_id, const uint16_t e
bool DMX::check_complete(sections_id_t s_id, uint8_t number, uint8_t last, uint8_t segment_last)
{
bool ret = false;
//lock();
section_map_t::iterator it = seenSections.find(s_id);
if (it == seenSections.end())
{
if (it == seenSections.end()) {
seenSections.insert(s_id);
calcedSections.insert(s_id);
uint64_t tmpval = s_id & 0xFFFFFFFFFFFFFF00ULL;
@@ -253,7 +252,6 @@ printf(" [%s cache] old section for table 0x%02x sid 0x%04x section 0x%02x last
if(seenSections.size() > 10)
ret = true;
}
//unlock();
return ret;
}
@@ -448,11 +446,9 @@ int DMX::getSection(uint8_t *buf, const unsigned timeoutInMSeconds, int &timeout
}
if(complete) {
//lock();
seenSections.clear();
calcedSections.clear();
timeouts = -2;
//unlock();
}
if(rc > 0)
first_skipped = 0;