aboutsummaryrefslogtreecommitdiffstats
path: root/src/dabInputPacketFile.cpp
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2014-01-12 21:54:07 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2014-01-12 21:54:07 +0100
commitf1874c259259a039227517a9cd58d7017a1bef34 (patch)
treefb1cc85521a67d5efb05434fe78cb43a4098e03d /src/dabInputPacketFile.cpp
parente9c4e1762c3b7531ffe82dc26c67919ee38bfc3a (diff)
downloaddabmux-f1874c259259a039227517a9cd58d7017a1bef34.tar.gz
dabmux-f1874c259259a039227517a9cd58d7017a1bef34.tar.bz2
dabmux-f1874c259259a039227517a9cd58d7017a1bef34.zip
replace all occurrencies of TcpLog and old etiLog
Diffstat (limited to 'src/dabInputPacketFile.cpp')
-rw-r--r--src/dabInputPacketFile.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/dabInputPacketFile.cpp b/src/dabInputPacketFile.cpp
index 65b5ebe..0dc157d 100644
--- a/src/dabInputPacketFile.cpp
+++ b/src/dabInputPacketFile.cpp
@@ -166,7 +166,7 @@ int dabInputPacketFileRead(dabInputOperations* ops, void* args, void* buffer,
}
continue;
} else if (nbBytes < 3) {
- etiLog.print(TcpLog::ERR,
+ etiLog.log(error,
"Error while reading file for packet header; "
"read %i out of 3 bytes\n", nbBytes);
break;
@@ -192,14 +192,14 @@ int dabInputPacketFileRead(dabInputOperations* ops, void* args, void* buffer,
perror("Packet file");
return -1;
} else if (nbBytes == 0) {
- etiLog.print(TcpLog::NOTICE,
+ etiLog.log(info,
"Packet header read, but no data!\n");
if (ops->rewind(args) == -1) {
goto END_PACKET;
}
continue;
} else if (nbBytes < length - 3) {
- etiLog.print(TcpLog::ERR, "Error while reading packet file; "
+ etiLog.log(error, "Error while reading packet file; "
"read %i out of %i bytes\n", nbBytes, length - 3);
break;
}
@@ -216,7 +216,7 @@ int dabInputPacketFileRead(dabInputOperations* ops, void* args, void* buffer,
data->enhancedPacketLength += length;
if (data->enhancedPacketLength >= (12 * 188)) {
if (data->enhancedPacketLength > (12 * 188)) {
- etiLog.print(TcpLog::ERR,
+ etiLog.log(error,
"Error, too much enhanced packet data!\n");
}
ReedSolomon encoder(204, 188);
@@ -237,14 +237,14 @@ END_PACKET:
fifoStats->frameRecords[fifoStats->frameCount].curSize = written;
fifoStats->frameRecords[fifoStats->frameCount].maxSize = size;
if (++fifoStats->frameCount == NB_RECORDS) {
- etiLog.print(TcpLog::INFO, "Packet subchannel usage: (%i)",
+ etiLog.log(info, "Packet subchannel usage: (%i)",
fifoStats->id);
for (int i = 0; i < fifoStats->frameCount; ++i) {
- etiLog.print(TcpLog::INFO, " %i/%i",
+ etiLog.log(info, " %i/%i",
fifoStats->frameRecords[i].curSize,
fifoStats->frameRecords[i].maxSize);
}
- etiLog.print(TcpLog::INFO, "\n");
+ etiLog.log(info, "\n");
fifoStats->frameCount = 0;
}
}