frodovdr
/
vdr-plugin-satip
mirror of https://github.com/rofafor/vdr-plugin-satip.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Renamed logging level to the actual mask.

This commit is contained in:
Rolf Ahrenberg 2014-12-06 00:02:51 +02:00
parent b62a25597b
commit 796a047401
6 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.c
View File

@ -14,9 +14,9 @@ cSatipConfig SatipConfig;
cSatipConfig::cSatipConfig(void) cSatipConfig::cSatipConfig(void)
: operatingModeM(eOperatingModeLow), : operatingModeM(eOperatingModeLow),
#ifdef DEBUG #ifdef DEBUG
logLevelM(eLogLevelMask), loggingM(eLoggingMask),
#else #else
logLevelM(eLogLevelNormal), loggingM(eLoggingNormal),
#endif #endif
eitScanM(1), eitScanM(1),
useBytesM(1) useBytesM(1)

18
config.h
View File

@ -15,7 +15,7 @@ class cSatipConfig
{ {
private: private:
unsigned int operatingModeM; unsigned int operatingModeM;
unsigned int logLevelM; unsigned int loggingM;
unsigned int eitScanM; unsigned int eitScanM;
unsigned int useBytesM; unsigned int useBytesM;
int disabledSourcesM[MAX_DISABLED_SOURCES_COUNT]; int disabledSourcesM[MAX_DISABLED_SOURCES_COUNT];
@ -31,10 +31,10 @@ public:
eOperatingModeCount eOperatingModeCount
}; };
enum { enum {
eLogLevelNormal = 0x00, eLoggingNormal = 0x00,
eLogLevelDebug = 0x01, eLoggingDebug = 0x01,
eLogLevelExtra = 0x02, eLoggingExtra = 0x02,
eLogLevelMask = 0x0F eLoggingMask = 0x0F
}; };
cSatipConfig(); cSatipConfig();
unsigned int GetOperatingMode(void) const { return operatingModeM; } unsigned int GetOperatingMode(void) const { return operatingModeM; }
@ -43,9 +43,9 @@ public:
bool IsOperatingModeNormal(void) const { return (operatingModeM == eOperatingModeNormal); } bool IsOperatingModeNormal(void) const { return (operatingModeM == eOperatingModeNormal); }
bool IsOperatingModeHigh(void) const { return (operatingModeM == eOperatingModeHigh); } bool IsOperatingModeHigh(void) const { return (operatingModeM == eOperatingModeHigh); }
void ToggleOperatingMode(void) { operatingModeM = (operatingModeM + 1) % eOperatingModeCount; } void ToggleOperatingMode(void) { operatingModeM = (operatingModeM + 1) % eOperatingModeCount; }
unsigned int GetLogLevel(void) const { return logLevelM; } unsigned int GetLogging(void) const { return loggingM; }
bool IsLogLevelDebug(void) const { return (logLevelM & eLogLevelDebug); } bool IsLoggingDebug(void) const { return (loggingM & eLoggingDebug); }
bool IsLogLevelExtra(void) const { return (logLevelM & eLogLevelExtra); } bool IsLoggingExtra(void) const { return (loggingM & eLoggingExtra); }
unsigned int GetEITScan(void) const { return eitScanM; } unsigned int GetEITScan(void) const { return eitScanM; }
unsigned int GetUseBytes(void) const { return useBytesM; } unsigned int GetUseBytes(void) const { return useBytesM; }
const char *GetConfigDirectory(void) const { return configDirectoryM; } const char *GetConfigDirectory(void) const { return configDirectoryM; }
@ -55,7 +55,7 @@ public:
int GetDisabledFilters(unsigned int indexP) const; int GetDisabledFilters(unsigned int indexP) const;
void SetOperatingMode(unsigned int operatingModeP) { operatingModeM = operatingModeP; } void SetOperatingMode(unsigned int operatingModeP) { operatingModeM = operatingModeP; }
void SetLogLevel(unsigned int logLevelP) { logLevelM = (logLevelP & eLogLevelMask); } void SetLogging(unsigned int logLevelP) { loggingM = (logLevelP & eLoggingMask); }
void SetEITScan(unsigned int onOffP) { eitScanM = onOffP; } void SetEITScan(unsigned int onOffP) { eitScanM = onOffP; }
void SetUseBytes(unsigned int onOffP) { useBytesM = onOffP; } void SetUseBytes(unsigned int onOffP) { useBytesM = onOffP; }
void SetConfigDirectory(const char *directoryP); void SetConfigDirectory(const char *directoryP);

2
discover.c
View File

@ -199,7 +199,7 @@ void cSatipDiscover::Fetch(const char *urlP)
CURLcode res = CURLE_OK; CURLcode res = CURLE_OK;
// Verbose output // Verbose output
if (SatipConfig.IsLogLevelExtra()) { if (SatipConfig.IsLoggingExtra()) {
SATIP_CURL_EASY_SETOPT(handleM, CURLOPT_VERBOSE, 1L); SATIP_CURL_EASY_SETOPT(handleM, CURLOPT_VERBOSE, 1L);
SATIP_CURL_EASY_SETOPT(handleM, CURLOPT_DEBUGFUNCTION, cSatipDiscover::DebugCallback); SATIP_CURL_EASY_SETOPT(handleM, CURLOPT_DEBUGFUNCTION, cSatipDiscover::DebugCallback);
SATIP_CURL_EASY_SETOPT(handleM, CURLOPT_DEBUGDATA, this); SATIP_CURL_EASY_SETOPT(handleM, CURLOPT_DEBUGDATA, this);

4
log.h
View File

@ -12,8 +12,8 @@
#define error(x...) esyslog("SATIP-ERROR: " x) #define error(x...) esyslog("SATIP-ERROR: " x)
#define info(x...) isyslog("SATIP: " x) #define info(x...) isyslog("SATIP: " x)
#define debug(x...) void( SatipConfig.IsLogLevelDebug() ? dsyslog("SATIP: " x) : void() ) #define debug(x...) void( SatipConfig.IsLoggingDebug() ? dsyslog("SATIP: " x) : void() )
#define extra(x...) void( SatipConfig.IsLogLevelExtra() ? dsyslog("SATIP: " x) : void() ) #define extra(x...) void( SatipConfig.IsLoggingExtra() ? dsyslog("SATIP: " x) : void() )
#endif // __SATIP_LOG_H #endif // __SATIP_LOG_H

2
rtsp.c
View File

@ -21,7 +21,7 @@ cSatipRtsp::cSatipRtsp(cSatipTunerIf &tunerP)
CURLcode res = CURLE_OK; CURLcode res = CURLE_OK;
// Verbose output // Verbose output
if (SatipConfig.IsLogLevelExtra()) { if (SatipConfig.IsLoggingExtra()) {
SATIP_CURL_EASY_SETOPT(handleM, CURLOPT_VERBOSE, 1L); SATIP_CURL_EASY_SETOPT(handleM, CURLOPT_VERBOSE, 1L);
SATIP_CURL_EASY_SETOPT(handleM, CURLOPT_DEBUGFUNCTION, cSatipRtsp::DebugCallback); SATIP_CURL_EASY_SETOPT(handleM, CURLOPT_DEBUGFUNCTION, cSatipRtsp::DebugCallback);
SATIP_CURL_EASY_SETOPT(handleM, CURLOPT_DEBUGDATA, this); SATIP_CURL_EASY_SETOPT(handleM, CURLOPT_DEBUGDATA, this);

16
satip.c
View File

@ -91,7 +91,7 @@ bool cPluginSatip::ProcessArgs(int argc, char *argv[])
// Implement command line argument processing here if applicable. // Implement command line argument processing here if applicable.
static const struct option long_options[] = { static const struct option long_options[] = {
{ "devices", required_argument, NULL, 'd' }, { "devices", required_argument, NULL, 'd' },
{ "loglevel", required_argument, NULL, 'l' }, { "logging", required_argument, NULL, 'l' },
{ "server", required_argument, NULL, 's' }, { "server", required_argument, NULL, 's' },
{ NULL, no_argument, NULL, 0 } { NULL, no_argument, NULL, 0 }
}; };
@ -100,10 +100,10 @@ bool cPluginSatip::ProcessArgs(int argc, char *argv[])
while ((c = getopt_long(argc, argv, "d:l:s:", long_options, NULL)) != -1) { while ((c = getopt_long(argc, argv, "d:l:s:", long_options, NULL)) != -1) {
switch (c) { switch (c) {
case 'd': case 'd':
deviceCountM = atoi(optarg); deviceCountM = strtol(optarg, NULL, 0);
break; break;
case 'l': case 'l':
SatipConfig.SetLogLevel(atoi(optarg)); SatipConfig.SetLogging(strtol(optarg, NULL, 0));
break; break;
case 's': case 's':
ParseServer(optarg); ParseServer(optarg);
@ -321,8 +321,8 @@ const char **cPluginSatip::SVDRPHelpPages(void)
" Shows SAT>IP device count.\n", " Shows SAT>IP device count.\n",
"OPER\n" "OPER\n"
" Toggles operating mode of SAT>IP devices.\n", " Toggles operating mode of SAT>IP devices.\n",
"LOGL [ <level> ]\n" "LOGG [ <mask> ]\n"
" Gets and sets used logging level.\n", " Gets and sets used logging mask.\n",
NULL NULL
}; };
return HelpPages; return HelpPages;
@ -403,10 +403,10 @@ cString cPluginSatip::SVDRPCommand(const char *commandP, const char *optionP, in
} }
return cString::sprintf("SAT>IP operating mode: %s\n", *mode); return cString::sprintf("SAT>IP operating mode: %s\n", *mode);
} }
else if (strcasecmp(commandP, "LOGL") == 0) { else if (strcasecmp(commandP, "LOGG") == 0) {
if (optionP && *optionP) if (optionP && *optionP)
SatipConfig.SetLogLevel(atoi(optionP)); SatipConfig.SetLogging(strtol(optionP, NULL, 0));
return cString::sprintf("SAT>IP logging level: %d\n", SatipConfig.GetLogLevel()); return cString::sprintf("SAT>IP logging: 0x%02X\n", SatipConfig.GetLogging());
} }
return NULL; return NULL;