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:
parent
81f6af3bdf
commit
b62a25597b
11
common.h
11
common.h
@ -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; \
|
||||
|
1
config.c
1
config.c
@ -6,6 +6,7 @@
|
||||
*/
|
||||
|
||||
#include "discover.h"
|
||||
#include "log.h"
|
||||
#include "config.h"
|
||||
|
||||
cSatipConfig SatipConfig;
|
||||
|
1
device.c
1
device.c
@ -9,6 +9,7 @@
|
||||
|
||||
#include "config.h"
|
||||
#include "discover.h"
|
||||
#include "log.h"
|
||||
#include "param.h"
|
||||
#include "device.h"
|
||||
|
||||
|
@ -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
19
log.h
Normal 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
|
||||
|
@ -8,6 +8,7 @@
|
||||
#include "config.h"
|
||||
#include "common.h"
|
||||
#include "discover.h"
|
||||
#include "log.h"
|
||||
#include "poller.h"
|
||||
#include "msearch.h"
|
||||
|
||||
|
1
poller.c
1
poller.c
@ -11,6 +11,7 @@
|
||||
|
||||
#include "config.h"
|
||||
#include "common.h"
|
||||
#include "log.h"
|
||||
#include "poller.h"
|
||||
|
||||
cSatipPoller *cSatipPoller::instanceS = NULL;
|
||||
|
1
rtcp.c
1
rtcp.c
@ -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
1
rtp.c
@ -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
1
rtsp.c
@ -7,6 +7,7 @@
|
||||
|
||||
#include "config.h"
|
||||
#include "common.h"
|
||||
#include "log.h"
|
||||
#include "rtsp.h"
|
||||
|
||||
cSatipRtsp::cSatipRtsp(cSatipTunerIf &tunerP)
|
||||
|
1
satip.c
1
satip.c
@ -11,6 +11,7 @@
|
||||
#include "config.h"
|
||||
#include "device.h"
|
||||
#include "discover.h"
|
||||
#include "log.h"
|
||||
#include "poller.h"
|
||||
#include "setup.h"
|
||||
|
||||
|
@ -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)
|
||||
|
1
server.c
1
server.c
@ -9,6 +9,7 @@
|
||||
|
||||
#include "config.h"
|
||||
#include "common.h"
|
||||
#include "log.h"
|
||||
#include "server.h"
|
||||
|
||||
// --- cSatipServer -----------------------------------------------------------
|
||||
|
1
setup.c
1
setup.c
@ -12,6 +12,7 @@
|
||||
#include "config.h"
|
||||
#include "device.h"
|
||||
#include "discover.h"
|
||||
#include "log.h"
|
||||
#include "setup.h"
|
||||
|
||||
// --- cSatipEditSrcItem ------------------------------------------------------
|
||||
|
1
socket.c
1
socket.c
@ -16,6 +16,7 @@
|
||||
|
||||
#include "common.h"
|
||||
#include "config.h"
|
||||
#include "log.h"
|
||||
#include "socket.h"
|
||||
|
||||
cSatipSocket::cSatipSocket()
|
||||
|
@ -9,6 +9,7 @@
|
||||
|
||||
#include "common.h"
|
||||
#include "statistics.h"
|
||||
#include "log.h"
|
||||
#include "config.h"
|
||||
|
||||
// Section statistics class
|
||||
|
Loading…
Reference in New Issue
Block a user