1
0
mirror of https://github.com/rofafor/vdr-plugin-satip.git synced 2023-10-10 13:37:42 +02:00

Reworked header dependencies.

This commit is contained in:
Rolf Ahrenberg 2014-12-05 23:14:40 +02:00
parent 81f6af3bdf
commit b62a25597b
17 changed files with 37 additions and 8 deletions

View File

@ -13,11 +13,6 @@
#include <vdr/config.h>
#include <vdr/i18n.h>
#define error(x...) esyslog("SATIP-ERROR: " x)
#define info(x...) isyslog("SATIP: " x)
#define debug(x...) void( SatipConfig.IsLogLevelDebug() ? dsyslog("SATIP: " x) : void() )
#define extra(x...) void( SatipConfig.IsLogLevelExtra() ? dsyslog("SATIP: " x) : void() )
#define ELEMENTS(x) (sizeof(x) / sizeof(x[0]))
#define SATIP_MAX_DEVICES MAXDEVICES
@ -44,19 +39,19 @@
#define SATIP_CURL_EASY_SETOPT(X, Y, Z) \
if ((res = curl_easy_setopt((X), (Y), (Z))) != CURLE_OK) { \
error("curl_easy_setopt(%s, %s) [%s,%d] failed: %s (%d)", #Y, #Z, __FILE__, __LINE__, curl_easy_strerror(res), res); \
esyslog("curl_easy_setopt(%s, %s) [%s,%d] failed: %s (%d)", #Y, #Z, __FILE__, __LINE__, curl_easy_strerror(res), res); \
}
#define SATIP_CURL_EASY_PERFORM(X) \
if ((res = curl_easy_perform((X))) != CURLE_OK) { \
error("curl_easy_perform() [%s,%d] failed: %s (%d)", __FILE__, __LINE__, curl_easy_strerror(res), res); \
esyslog("curl_easy_perform() [%s,%d] failed: %s (%d)", __FILE__, __LINE__, curl_easy_strerror(res), res); \
}
#define ERROR_IF_FUNC(exp, errstr, func, ret) \
do { \
if (exp) { \
char tmp[64]; \
error("[%s,%d]: "errstr": %s", __FILE__, __LINE__, \
esyslog("[%s,%d]: "errstr": %s", __FILE__, __LINE__, \
strerror_r(errno, tmp, sizeof(tmp))); \
func; \
ret; \

View File

@ -6,6 +6,7 @@
*/
#include "discover.h"
#include "log.h"
#include "config.h"
cSatipConfig SatipConfig;

View File

@ -9,6 +9,7 @@
#include "config.h"
#include "discover.h"
#include "log.h"
#include "param.h"
#include "device.h"

View File

@ -13,6 +13,7 @@
#endif
#include "common.h"
#include "config.h"
#include "log.h"
#include "socket.h"
#include "discover.h"

19
log.h Normal file
View File

@ -0,0 +1,19 @@
/*
* log.h: SAT>IP plugin for the Video Disk Recorder
*
* See the README file for copyright information and how to reach the author.
*
*/
#ifndef __SATIP_LOG_H
#define __SATIP_LOG_H
#include "config.h"
#define error(x...) esyslog("SATIP-ERROR: " x)
#define info(x...) isyslog("SATIP: " x)
#define debug(x...) void( SatipConfig.IsLogLevelDebug() ? dsyslog("SATIP: " x) : void() )
#define extra(x...) void( SatipConfig.IsLogLevelExtra() ? dsyslog("SATIP: " x) : void() )
#endif // __SATIP_LOG_H

View File

@ -8,6 +8,7 @@
#include "config.h"
#include "common.h"
#include "discover.h"
#include "log.h"
#include "poller.h"
#include "msearch.h"

View File

@ -11,6 +11,7 @@
#include "config.h"
#include "common.h"
#include "log.h"
#include "poller.h"
cSatipPoller *cSatipPoller::instanceS = NULL;

1
rtcp.c
View File

@ -7,6 +7,7 @@
#include "config.h"
#include "common.h"
#include "log.h"
#include "rtcp.h"
cSatipRtcp::cSatipRtcp(cSatipTunerIf &tunerP, unsigned int bufferLenP)

1
rtp.c
View File

@ -7,6 +7,7 @@
#include "config.h"
#include "common.h"
#include "log.h"
#include "rtp.h"
cSatipRtp::cSatipRtp(cSatipTunerIf &tunerP, unsigned int bufferLenP)

1
rtsp.c
View File

@ -7,6 +7,7 @@
#include "config.h"
#include "common.h"
#include "log.h"
#include "rtsp.h"
cSatipRtsp::cSatipRtsp(cSatipTunerIf &tunerP)

View File

@ -11,6 +11,7 @@
#include "config.h"
#include "device.h"
#include "discover.h"
#include "log.h"
#include "poller.h"
#include "setup.h"

View File

@ -6,6 +6,7 @@
*/
#include "config.h"
#include "log.h"
#include "sectionfilter.h"
cSatipSectionFilter::cSatipSectionFilter(int deviceIndexP, uint16_t pidP, uint8_t tidP, uint8_t maskP)

View File

@ -9,6 +9,7 @@
#include "config.h"
#include "common.h"
#include "log.h"
#include "server.h"
// --- cSatipServer -----------------------------------------------------------

View File

@ -12,6 +12,7 @@
#include "config.h"
#include "device.h"
#include "discover.h"
#include "log.h"
#include "setup.h"
// --- cSatipEditSrcItem ------------------------------------------------------

View File

@ -16,6 +16,7 @@
#include "common.h"
#include "config.h"
#include "log.h"
#include "socket.h"
cSatipSocket::cSatipSocket()

View File

@ -9,6 +9,7 @@
#include "common.h"
#include "statistics.h"
#include "log.h"
#include "config.h"
// Section statistics class

View File

@ -8,6 +8,7 @@
#include "common.h"
#include "config.h"
#include "discover.h"
#include "log.h"
#include "poller.h"
#include "tuner.h"