summaryrefslogtreecommitdiffstats
path: root/src/dabInputFifo.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/dabInputFifo.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/dabInputFifo.cpp')
-rw-r--r--src/dabInputFifo.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/dabInputFifo.cpp b/src/dabInputFifo.cpp
index a2c2ef7..7b2a30f 100644
--- a/src/dabInputFifo.cpp
+++ b/src/dabInputFifo.cpp
@@ -212,7 +212,7 @@ int dabInputFifoRead(void* args, void* buffer, int size)
if (curSize == 0) {
stats->empty = true;
} else {
- etiLog.print(TcpLog::WARNING, "Not enough data in FIFO buffer: (%i) %i/%i\n",
+ etiLog.log(warn, "Not enough data in FIFO buffer: (%i) %i/%i\n",
data->stats.id, curSize, size);
}
return 0;
@@ -292,31 +292,31 @@ int dabInputFifoLock(void* args) {
stats->bufferRecords[stats->bufferCount].maxSize = maxSize;
if (++stats->bufferCount == NB_RECORDS) {
- etiLog.print(TcpLog::INFO, "FIFO buffer state: (%i)", stats->id);
+ etiLog.log(info, "FIFO buffer state: (%i)", stats->id);
for (int i = 0; i < stats->bufferCount; ++i) {
- etiLog.print(TcpLog::INFO, " %i/%i",
+ etiLog.log(info, " %i/%i",
stats->bufferRecords[i].curSize,
stats->bufferRecords[i].maxSize);
}
- etiLog.print(TcpLog::INFO, "\n");
+ etiLog.log(info, "\n");
if (stats->full) {
- etiLog.print(TcpLog::WARNING, "FIFO buffer full: (%i)\n",
+ etiLog.log(warn, "FIFO buffer full: (%i)\n",
data->stats.id);
stats->full = false;
}
if (stats->empty) {
- etiLog.print(TcpLog::WARNING, "FIFO buffer empty: (%i)\n",
+ etiLog.log(warn, "FIFO buffer empty: (%i)\n",
data->stats.id);
stats->empty = false;
}
if (stats->error) {
- etiLog.print(TcpLog::ERR, "FIFO input read error: (%i)\n",
+ etiLog.log(error, "FIFO input read error: (%i)\n",
data->stats.id);
stats->error = false;
}
if (stats->input) {
- etiLog.print(TcpLog::ERR, "FIFO input not connected: (%i)\n",
+ etiLog.log(error, "FIFO input not connected: (%i)\n",
data->stats.id);
stats->input = false;
}
@@ -352,7 +352,7 @@ int dabInputFifoClean(void** args)
{
dabInputFifoData* data = (dabInputFifoData*)*args;
data->running = false;
- etiLog.print(TcpLog::DBG, "Wait FIFO child...\n");
+ etiLog.log(debug, "Wait FIFO child...\n");
#ifdef WIN32
DWORD status;
for (int i = 0; i < 5; ++i) {
@@ -363,16 +363,16 @@ int dabInputFifoClean(void** args)
}
TerminateThread(data->thread, 1);
if (CloseHandle(data->thread) == 0) {
- etiLog.print(TcpLog::DBG, "ERROR: Failed to close FIFO child thread\n");
+ etiLog.log(debug, "ERROR: Failed to close FIFO child thread\n");
}
#else
if (data->thread != (pthread_t)NULL) {
if (pthread_join(data->thread, NULL)) {
- etiLog.print(TcpLog::DBG, "ERROR: FIFO child thread had not exit normally\n");
+ etiLog.log(debug, "ERROR: FIFO child thread had not exit normally\n");
}
}
#endif
- etiLog.print(TcpLog::DBG, "Done\n");
+ etiLog.log(debug, "Done\n");
#ifdef _WIN32
CloseHandle(data->semInfo);
CloseHandle(data->semFull);