Many bug fixes and changes

Author: Barracuda09

doxygen

@@ -260,7 +260,7 @@ EXPAND_ONLY_PREDEF     = NO
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           =
 INCLUDE_FILE_PATTERNS  =
-PREDEFINED             =
+PREDEFINED             = LIBDVBCSA
 EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------

src/ChannelData.cpp

@@ -19,10 +19,17 @@
 */
 #include "ChannelData.h"
 #include "StringConverter.h"
+#include "Utils.h"
+#include "Log.h"
 
 #include <stdio.h>
 
 ChannelData::ChannelData() {
+	for (size_t i = 0; i < MAX_PIDS; ++i) {
+		_pid.data[i].fd_dmx = -1;
+		resetPid(i);
+	}
+	_pid.changed = false;
 	initialize();
 }
 
@@ -37,7 +44,7 @@ void ChannelData::initialize() {
 	fec = FEC_AUTO;
 	rolloff = ROLLOFF_AUTO;
 	inversion = INVERSION_AUTO;
-	
+
 	for (size_t i = 0; i < MAX_PIDS; ++i) {
 		resetPid(i);
 	}
@@ -73,8 +80,11 @@ void ChannelData::resetPid(int pid) {
 	_pid.data[pid].cc       = 0x80;
 	_pid.data[pid].cc_error = 0;
 	_pid.data[pid].count    = 0;
-	_pid.data[pid].fd_dmx   = -1;
 	_pid.data[pid].pmt      = false;
+	_pid.data[pid].ecm      = false;
+	_pid.data[pid].demux    = -1;
+	_pid.data[pid].filter   = -1;
+	_pid.data[pid].parity   = -1;
 }
 
 uint32_t ChannelData::getPacketCounter(int pid) const {
@@ -89,6 +99,10 @@ int ChannelData::getDMXFileDescriptor(int pid) const {
 	return _pid.data[pid].fd_dmx;
 }
 
+void ChannelData::closeDMXFileDescriptor(int pid) {
+	CLOSE_FD(_pid.data[pid].fd_dmx);
+}
+
 void ChannelData::resetPIDChanged() {
 	_pid.changed = false;
 }
@@ -138,6 +152,7 @@ void ChannelData::setPID(int pid, bool val) {
 	// Do we need to remove this pid then also reset PMT
 	if (!val) {
 		_pid.data[pid].pmt = false;
+		_pid.data[pid].ecm = false;
 	}
 }
 
@@ -158,3 +173,26 @@ bool ChannelData::isPMTPID(int pid) const {
 	return _pid.data[pid].pmt;
 }
 
+void ChannelData::setECMFilterData(int demux, int filter, int pid, int parity) {
+	_pid.data[pid].ecm    = true;
+	_pid.data[pid].demux  = demux;
+	_pid.data[pid].filter = filter;
+//	_pid.data[pid].parity = parity;
+}
+
+void ChannelData::getECMFilterData(int &demux, int &filter, int pid) const {
+	demux  = _pid.data[pid].demux;
+	filter = _pid.data[pid].filter;
+}
+
+void ChannelData::setKeyParity(int pid, int parity) {
+	_pid.data[pid].parity = parity;
+}
+
+int ChannelData::getKeyParity(int pid) const {
+	return _pid.data[pid].parity;
+}
+
+bool ChannelData::isECMPID(int pid) const {
+	return _pid.data[pid].ecm;
+}

src/ChannelData.h

@@ -37,7 +37,11 @@ typedef struct {
 	uint8_t  cc;             // continuity counter (0 - 15) of this PID
 	uint32_t cc_error;       // cc error count
 	uint32_t count;          // the number of times this pid occurred
-	bool     pmt;            // show if this is an pmt pid
+	bool     pmt;            // show if this is an PMT pid
+	bool     ecm;            // show if this is an ECM pid
+	int      demux;          // dvbapi demux
+	int      filter;         // dvbapi filter
+	int      parity;         // key parity
 } PidData_t;
 
 typedef struct {
@@ -72,6 +76,9 @@ class ChannelData  {
 		/// Get DMX file descriptor
 		int getDMXFileDescriptor(int pid) const;
 
+		/// Close DMX file descriptor
+		void closeDMXFileDescriptor(int pid);
+
 		/// Get the amount of packet that were received of this pid
 		uint32_t getPacketCounter(int pid) const;
 
@@ -96,6 +103,20 @@ class ChannelData  {
 		/// Is the pid set as an PMT PID
 		bool isPMTPID(int pid) const;
 
+		/// Set the filter data and ECM pid
+		void setECMFilterData(int demux, int filter, int pid, int parity);
+		
+		/// Get the filter data of the ECM pid
+		void getECMFilterData(int &demux, int &filter, int pid) const;
+
+		/// Set the key parity of the pid
+		void setKeyParity(int pid, int parity);
+
+		/// Get the key parity of the pid
+		int getKeyParity(int pid) const;
+
+		/// Is the pid set as an ECM PID
+		bool isECMPID(int pid) const;
 //	protected:
 
 //	private:

src/Configure.h

@@ -40,4 +40,10 @@
 #define ADD_CONFIG_NUMBER(xml, clName, streamID, varName, value, minValue, maxValue) \
 	StringConverter::addFormattedString(xml, "<%s><inputtype>number</inputtype><id>%s,%d,%s</id><value>%lu</value><minvalue>%lu</minvalue><maxvalue>%lu</maxvalue></%s>", varName, clName, streamID, varName, value, minValue, maxValue, varName);
 
+#define ADD_CONFIG_TEXT(xml, clName, streamID, varName, value) \
+	StringConverter::addFormattedString(xml, "<%s><inputtype>text</inputtype><id>%s,%d,%s</id><value>%s</value></%s>", varName, clName, streamID, varName, value, varName);
+
+#define ADD_CONFIG_IP(xml, clName, streamID, varName, value) \
+	StringConverter::addFormattedString(xml, "<%s><inputtype>ip</inputtype><id>%s,%d,%s</id><value>%s</value></%s>", varName, clName, streamID, varName, value, varName);
+
 #endif // CONFIGURE_H_INCLUDE