From: Chris Tallon Date: Thu, 2 Sep 2021 13:19:46 +0000 (+0100) Subject: Rename Log class filenames to oldlog X-Git-Url: https://git.vomp.tv/gitweb/?a=commitdiff_plain;h=6165362bacf4280aedb55a85ac2d3bad88aa2112;p=vompclient.git Rename Log class filenames to oldlog --- diff --git a/afeed.cc b/afeed.cc index 546df45..c0efb2a 100644 --- a/afeed.cc +++ b/afeed.cc @@ -17,7 +17,7 @@ along with VOMP. If not, see . */ -#include "log.h" +#include "oldlog.h" #include "demuxer.h" #include "callback.h" #include "util.h" diff --git a/audio.cc b/audio.cc index aa02ec4..4ff9bd0 100644 --- a/audio.cc +++ b/audio.cc @@ -20,7 +20,7 @@ #include "audio.h" -#include "log.h" +#include "oldlog.h" Audio* Audio::instance = NULL; diff --git a/audioomx.cc b/audioomx.cc index 7ad4d32..10a6318 100644 --- a/audioomx.cc +++ b/audioomx.cc @@ -20,7 +20,7 @@ #include #include "videoomx.h" -#include "log.h" +#include "oldlog.h" #include "vdr.h" #include "woptionpane.h" #include "osdopenvg.h" diff --git a/audioplayer.cc b/audioplayer.cc index 9f3f9a3..44ade44 100644 --- a/audioplayer.cc +++ b/audioplayer.cc @@ -22,7 +22,7 @@ #include "messagequeue.h" #include "i18n.h" #include "boxx.h" -#include "log.h" +#include "oldlog.h" #include "media.h" #include "mediaplayer.h" diff --git a/audiowin.h b/audiowin.h index 8617e6c..44a179e 100644 --- a/audiowin.h +++ b/audiowin.h @@ -21,7 +21,7 @@ #define AUDIOWIN_H #include "defines.h" -#include "log.h" +#include "oldlog.h" #include "audio.h" #include #include diff --git a/boxstack.cc b/boxstack.cc index 1bfad7a..4161cd5 100644 --- a/boxstack.cc +++ b/boxstack.cc @@ -21,7 +21,7 @@ #include "messagequeue.h" #include "input.h" -#include "log.h" +#include "oldlog.h" BoxStack* BoxStack::instance = NULL; diff --git a/boxx.cc b/boxx.cc index c4e5735..0e2ae1c 100644 --- a/boxx.cc +++ b/boxx.cc @@ -20,7 +20,7 @@ #include #include "defines.h" -#include "log.h" +#include "oldlog.h" #include "message.h" #include "osd.h" #include "surface.h" diff --git a/channel.cc b/channel.cc index 99941f8..e6830e6 100644 --- a/channel.cc +++ b/channel.cc @@ -20,7 +20,7 @@ #include "channel.h" #include "vdr.h" -#include "log.h" +#include "oldlog.h" #include "control.h" Channel::Channel() diff --git a/control.cc b/control.cc index 31c6b35..f421d1f 100644 --- a/control.cc +++ b/control.cc @@ -55,7 +55,7 @@ #include "vinfo.h" #include "boxx.h" #include "boxstack.h" -#include "log.h" +#include "oldlog.h" #include "sleeptimer.h" #include "wjpeg.h" #include "osdvector.h" diff --git a/demuxer.cc b/demuxer.cc index 1712180..a91d84a 100644 --- a/demuxer.cc +++ b/demuxer.cc @@ -23,7 +23,7 @@ #include "callback.h" #include "dvbsubtitles.h" -#include "log.h" +#include "oldlog.h" #include #include diff --git a/demuxeraudio.cc b/demuxeraudio.cc index 23fdcc3..ad6f391 100644 --- a/demuxeraudio.cc +++ b/demuxeraudio.cc @@ -21,7 +21,7 @@ #include "demuxeraudio.h" #include "audio.h" #include "i18n.h" -#include "log.h" +#include "oldlog.h" #define HDRBYTE1 0xff #define HDRBYTE2 0xe0 diff --git a/demuxermedia.cc b/demuxermedia.cc index 813d49b..77a6a42 100644 --- a/demuxermedia.cc +++ b/demuxermedia.cc @@ -22,7 +22,7 @@ #include "callback.h" #include "video.h" -#include "log.h" +#include "oldlog.h" #ifndef WIN32 #include diff --git a/demuxerts.cc b/demuxerts.cc index b7059c5..4394c49 100644 --- a/demuxerts.cc +++ b/demuxerts.cc @@ -18,7 +18,7 @@ */ #include "demuxerts.h" -#include "log.h" +#include "oldlog.h" #include "video.h" #include "vdr.h" #include "audio.h" diff --git a/demuxervdr.cc b/demuxervdr.cc index f1a2a3d..0e12eff 100644 --- a/demuxervdr.cc +++ b/demuxervdr.cc @@ -20,7 +20,7 @@ #include "demuxervdr.h" #include "video.h" #include "dvbsubtitles.h" -#include "log.h" +#include "oldlog.h" #ifndef WIN32 #include diff --git a/dsallocator.cc b/dsallocator.cc index 80f2298..584ceea 100644 --- a/dsallocator.cc +++ b/dsallocator.cc @@ -22,7 +22,7 @@ #include "osd.h" #include "windowsosd.h" #include "dsallocator.h" -#include "log.h" +#include "oldlog.h" #include diff --git a/dvbsubtitles.cc b/dvbsubtitles.cc index b9fac68..22efab0 100644 --- a/dvbsubtitles.cc +++ b/dvbsubtitles.cc @@ -37,7 +37,7 @@ #include "demuxer.h" #include "osdreceiver.h" #include "video.h" -#include "log.h" +#include "oldlog.h" #include "dvbsubtitles.h" diff --git a/event.cc b/event.cc index b11547b..c33c9f4 100644 --- a/event.cc +++ b/event.cc @@ -19,7 +19,7 @@ */ #include "event.h" -#include "log.h" +#include "oldlog.h" #include "control.h" #include "movieinfo.h" #include "seriesinfo.h" diff --git a/glshader.h b/glshader.h index 5f772d0..0423009 100644 --- a/glshader.h +++ b/glshader.h @@ -22,7 +22,7 @@ #define GL_SHADER_H #include -#include "log.h" +#include "oldlog.h" class GLShader { public: diff --git a/i18n.cc b/i18n.cc index 0f14365..100aaba 100644 --- a/i18n.cc +++ b/i18n.cc @@ -29,7 +29,7 @@ #endif*/ #include "vdr.h" -#include "log.h" +#include "oldlog.h" I18n::trans_table I18n::Translations; diff --git a/imageomx.cc b/imageomx.cc index be7d954..a0e1193 100644 --- a/imageomx.cc +++ b/imageomx.cc @@ -19,7 +19,7 @@ #include #include "videoomx.h" -#include "log.h" +#include "oldlog.h" #include "vdr.h" #include "woptionpane.h" #include "util.h" diff --git a/imagereader.cc b/imagereader.cc index 68e8293..be77f78 100644 --- a/imagereader.cc +++ b/imagereader.cc @@ -22,7 +22,7 @@ #include "mediaprovider.h" #include "media.h" #include "i18n.h" -#include "log.h" +#include "oldlog.h" ImageReader::ImageReader(int c, MediaProvider *p) diff --git a/input.cc b/input.cc index 030ac76..423c53f 100644 --- a/input.cc +++ b/input.cc @@ -19,7 +19,7 @@ #include "wremoteconfig.h" #include "i18n.h" -#include "log.h" +#include "oldlog.h" #include "vdr.h" #include "wtabbar.h" #include "message.h" diff --git a/inputcec.cc b/inputcec.cc index 976101a..ca67a91 100644 --- a/inputcec.cc +++ b/inputcec.cc @@ -24,7 +24,7 @@ using namespace CEC; #include -#include "log.h" +#include "oldlog.h" #include "vdr.h" #include "woptionpane.h" #include "inputcec.h" diff --git a/inputlirc.cc b/inputlirc.cc index a56e77c..6c208bb 100644 --- a/inputlirc.cc +++ b/inputlirc.cc @@ -22,7 +22,7 @@ #include #include "config.h" -#include "log.h" +#include "oldlog.h" #include "inputman.h" diff --git a/inputman.cc b/inputman.cc index 864e558..d5cc4eb 100644 --- a/inputman.cc +++ b/inputman.cc @@ -18,7 +18,7 @@ */ #include "config.h" -#include "log.h" +#include "oldlog.h" #include "wremoteconfig.h" #include "wtabbar.h" #ifdef VOMP_PLATFORM_RASPBERRY diff --git a/inputudp.cc b/inputudp.cc index 6b70778..6a37b29 100644 --- a/inputudp.cc +++ b/inputudp.cc @@ -22,7 +22,7 @@ #include #endif -#include "log.h" +#include "oldlog.h" #include "inputudp.h" diff --git a/inputwin.cc b/inputwin.cc index 6a07dfe..5c6ace2 100644 --- a/inputwin.cc +++ b/inputwin.cc @@ -19,7 +19,7 @@ #include "vompreswin.h" #include "i18n.h" -#include "log.h" +#include "oldlog.h" #include "inputwin.h" #define W_G_HCW(type,code) ( (((ULLONG)(type))<<32) | code) diff --git a/localmediafile.cc b/localmediafile.cc index 5bcf353..70eb6c7 100644 --- a/localmediafile.cc +++ b/localmediafile.cc @@ -22,7 +22,7 @@ #include "media.h" #include "mediaproviderids.h" #include -#include "log.h" +#include "oldlog.h" LocalMediaFile *LocalMediaFile::instance =NULL; diff --git a/localmediafile.h b/localmediafile.h index 6da202e..ef38f45 100644 --- a/localmediafile.h +++ b/localmediafile.h @@ -31,7 +31,7 @@ #endif #include -#include "log.h" +#include "oldlog.h" #define BASEDIR "media" diff --git a/log.cc b/log.cc deleted file mode 100644 index fbb767f..0000000 --- a/log.cc +++ /dev/null @@ -1,240 +0,0 @@ -/* - Copyright 2004-2005 Chris Tallon - Copyright 2003-2004 University Of Bradford - - This file is part of VOMP. - - VOMP is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - VOMP is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with VOMP; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ - -#include - -#ifndef WIN32 -#include -#include -#endif - -#include "vdr.h" - - -#include "log.h" - - -#ifdef __ANDROID__ -#include -#endif - -Log* Log::instance = NULL; - -Log::Log() -{ - if (instance) return; - instance = this; - logfile = NULL; - initted = 0; - logLevel = 0; - extlog = NULL; -} - -Log::~Log() -{ - instance = NULL; -} - -Log* Log::getInstance() -{ - return instance; -} - -void Log::upLogLevel() -{ - if (logLevel == Log::DEBUG) - { - log("Log", logLevel, "Log level is at its highest already"); - return; - } - - logLevel++; - log("Log", logLevel, "Log level is now %i", logLevel); -} - -void Log::downLogLevel() -{ - if (logLevel == Log::CRAZY) - { - log("Log", logLevel, "Log level is at its lowest already"); - return; - } - - logLevel--; - log("Log", logLevel, "Log level is now %i", logLevel); -} - -int Log::init(int startLogLevel, const char* fileName, int tenabled) -{ - (void)fileName; - - initted = 1; - logLevel = startLogLevel; - enabled = tenabled; - - // FIXME fix this with NCONFIG -// logfile = fopen(fileName, "a"); -// logfile = fopen(stdout, "a"); - logfile = stdout; -// logfile = fopen("/log", "a"); - - if (logfile) return 1; - else return 0; -} - -int Log::shutdown() -{ - if (!initted) return 1; - if (enabled && (logfile != stdout)) fclose(logfile); - return 1; -} - -int Log::log(const char *fromModule, int level,const char* message, ...) -{ - if (!instance || !logfile) return 0; - - if (!enabled && !extlog) return 1; - if (level > logLevel) return 1; - - char buffer[151]; - int spaceLeft = 150; - -#ifndef _MSC_VER - struct timeval tv; - gettimeofday(&tv, NULL); - struct tm tms; - LOCALTIME_R(&tv.tv_sec, &tms); - spaceLeft -= strftime(buffer, spaceLeft, "%H:%M:%S.", &tms); - spaceLeft -= SNPRINTF(&buffer[150-spaceLeft], spaceLeft, "%06lu ", static_cast(tv.tv_usec)); -#else - struct _timeb tb; - _ftime(&tb); - struct tm* tms = localtime(&tb.time); - spaceLeft -= strftime(buffer, spaceLeft, "%H:%M:%S.", tms); - spaceLeft -= SNPRINTF(&buffer[150-spaceLeft], spaceLeft, "%06lu ", (unsigned long)tb.millitm); -#endif - - char levelString[10]; - if (level == CRAZY) strcpy(levelString, "[CRAZY] "); - if (level == EMERG) strcpy(levelString, "[EMERG] "); - if (level == ALERT) strcpy(levelString, "[ALERT] "); - if (level == CRIT) strcpy(levelString, "[CRIT] "); - if (level == ERR) strcpy(levelString, "[ERR] "); - if (level == WARN) strcpy(levelString, "[WARN] "); - if (level == NOTICE) strcpy(levelString, "[notice]"); - if (level == INFO) strcpy(levelString, "[info] "); - if (level == DEBUG) strcpy(levelString, "[debug] "); - -#ifndef WIN32 - spaceLeft -= SNPRINTF(&buffer[150-spaceLeft], spaceLeft, "%s %lu %li %s - ", levelString, pthread_self(), syscall(SYS_gettid), fromModule); -#else - spaceLeft -= SNPRINTF(&buffer[150-spaceLeft], spaceLeft, "%s %s - ", levelString, fromModule); -#endif - - va_list ap; - va_start(ap, message); - spaceLeft = VSNPRINTF(&buffer[150-spaceLeft], spaceLeft, message, ap); - va_end(ap); - - int messageLength = strlen(buffer); - if (messageLength < 150) - { - buffer[messageLength] = '\n'; - buffer[messageLength+1] = '\0'; - } - else - { - buffer[149] = '\n'; - buffer[150] = '\0'; - } - - int success = 1; - if (enabled) - { -#ifndef __ANDROID__ - success = fputs(buffer, logfile); - fflush(NULL); -#else - int and_level=0; - switch (level) { - case CRAZY: - case ALERT: - case EMERG : - case CRIT:{ - and_level=ANDROID_LOG_FATAL; - } break; - case ERR: { - and_level=ANDROID_LOG_ERROR; - } break; - case WARN: { - and_level=ANDROID_LOG_WARN; - } break; - case NOTICE: - case INFO: { - and_level=ANDROID_LOG_INFO; - } break; - case DEBUG :{ - and_level=ANDROID_LOG_DEBUG; - } break; - }; - __android_log_vprint(and_level, fromModule, - message, ap); -#endif - } - - if (extlog) extlog->LogExtern(buffer); //Replacement for network logging - - - if (success != EOF) - return 1; - else - return 0; - -} - -void Log::logLongString(const char *fromModule, int level,const char *message) -{ - int string_size=strlen(message); - char buffer[100]; - const char * pointer=message; - for (int str_written=0; str_written -#ifndef WIN32 - #include - #include -#else - #include -#endif - -#include -#include -#include -#include -#include "defines.h" - - -class ExternLogger { -public: - virtual bool LogExtern(const char* message)=0; -}; - - -class Log -{ - public: - Log(); - ~Log(); - static Log* getInstance(); - - int init(int defaultLevel,const char* fileName, int enabled); - int shutdown(); - int log(const char *fromModule, int level,const char *message, ...); - void logLongString(const char *fromModule, int level,const char *message); - int status(); - void upLogLevel(); - void downLogLevel(); - void setExternLogger(ExternLogger* log); - void unsetExternLogger() { - extlog=NULL; - } - - - - const static int CRAZY = 0; // mad crazy things that should never happen - const static int EMERG = 1; // human assist required NOW - const static int ALERT = 2; // system unusable, but happy to sit there - const static int CRIT = 3; // still working, but maybe about to die - const static int ERR = 4; // that response is not even listed... - const static int WARN = 5; // this could be a bad thing. still running tho - const static int NOTICE = 6; // significant good thing - const static int INFO = 7; // verbose good thing - const static int DEBUG = 8; // debug-level messages - - private: - static Log* instance; - int initted; - int logLevel; - int enabled; - - FILE *logfile; - - ExternLogger* extlog; - - -}; - -#endif - -/* - -Documentation -------------- - -This class is intended to be instatiated once by the core. -For a one off use: - -Log::getInstance()->log("", Log::, ""); - -Or, a pointer can be stored and used: - -Log *myptr = Log::getInstance(); - -myptr->log("", Log::, ""); -myptr->log("", Log::, ""); - -Level usages are above. - -The message parameter in the log function can be used in the same way as printf, eg. - -myptr->log("", Log::, "Success: %s %i", stringpointer, integer); - -*/ diff --git a/main.cc b/main.cc index 42c9b3a..2abc5ec 100644 --- a/main.cc +++ b/main.cc @@ -43,7 +43,7 @@ #endif #include "config.h" -#include "log.h" +#include "oldlog.h" #include "util.h" #include "control.h" diff --git a/mediafile.cc b/mediafile.cc index 1558428..570f67d 100644 --- a/mediafile.cc +++ b/mediafile.cc @@ -34,7 +34,7 @@ #include #include -#include "log.h" +#include "oldlog.h" diff --git a/mediaoptions.h b/mediaoptions.h index 5a9fe38..a64c764 100644 --- a/mediaoptions.h +++ b/mediaoptions.h @@ -25,7 +25,7 @@ #include #include #include "defines.h" -#include "log.h" +#include "oldlog.h" #include "abstractoption.h" class WTabBar; diff --git a/mediaplayer.cc b/mediaplayer.cc index 9281672..e69b9b9 100644 --- a/mediaplayer.cc +++ b/mediaplayer.cc @@ -20,7 +20,7 @@ #include "mediaplayer.h" #include "media.h" -#include "log.h" +#include "oldlog.h" class MediaProviderHolder { public: diff --git a/messagequeue.cc b/messagequeue.cc index e79bccb..7c2673b 100644 --- a/messagequeue.cc +++ b/messagequeue.cc @@ -20,7 +20,7 @@ #include "messagequeue.h" #include "message.h" -#include "log.h" +#include "oldlog.h" MessageQueue* MessageQueue::instance{}; diff --git a/objects.mk b/objects.mk index a9d1c05..84ddfa1 100644 --- a/objects.mk +++ b/objects.mk @@ -1,5 +1,5 @@ OBJ_COMMON = util.o control.o thread.o timers.o i18n.o udp4.o udp6.o vdpc.o tcp.o \ - message.o messagequeue.o wol.o audio.o video.o log.o \ + message.o messagequeue.o wol.o audio.o video.o oldlog.o \ vdr.o recman.o recording.o recinfo.o channel.o rectimer.o event.o \ directory.o mark.o option.o vfeed.o afeed.o \ demuxer.o demuxervdr.o demuxerts.o stream.o osd.o surface.o \ diff --git a/oldlog.cc b/oldlog.cc new file mode 100644 index 0000000..558c1ef --- /dev/null +++ b/oldlog.cc @@ -0,0 +1,240 @@ +/* + Copyright 2004-2005 Chris Tallon + Copyright 2003-2004 University Of Bradford + + This file is part of VOMP. + + VOMP is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + VOMP is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with VOMP; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + +#include + +#ifndef WIN32 +#include +#include +#endif + +#include "vdr.h" + + +#include "oldlog.h" + + +#ifdef __ANDROID__ +#include +#endif + +Log* Log::instance = NULL; + +Log::Log() +{ + if (instance) return; + instance = this; + logfile = NULL; + initted = 0; + logLevel = 0; + extlog = NULL; +} + +Log::~Log() +{ + instance = NULL; +} + +Log* Log::getInstance() +{ + return instance; +} + +void Log::upLogLevel() +{ + if (logLevel == Log::DEBUG) + { + log("Log", logLevel, "Log level is at its highest already"); + return; + } + + logLevel++; + log("Log", logLevel, "Log level is now %i", logLevel); +} + +void Log::downLogLevel() +{ + if (logLevel == Log::CRAZY) + { + log("Log", logLevel, "Log level is at its lowest already"); + return; + } + + logLevel--; + log("Log", logLevel, "Log level is now %i", logLevel); +} + +int Log::init(int startLogLevel, const char* fileName, int tenabled) +{ + (void)fileName; + + initted = 1; + logLevel = startLogLevel; + enabled = tenabled; + + // FIXME fix this with NCONFIG +// logfile = fopen(fileName, "a"); +// logfile = fopen(stdout, "a"); + logfile = stdout; +// logfile = fopen("/log", "a"); + + if (logfile) return 1; + else return 0; +} + +int Log::shutdown() +{ + if (!initted) return 1; + if (enabled && (logfile != stdout)) fclose(logfile); + return 1; +} + +int Log::log(const char *fromModule, int level,const char* message, ...) +{ + if (!instance || !logfile) return 0; + + if (!enabled && !extlog) return 1; + if (level > logLevel) return 1; + + char buffer[151]; + int spaceLeft = 150; + +#ifndef _MSC_VER + struct timeval tv; + gettimeofday(&tv, NULL); + struct tm tms; + LOCALTIME_R(&tv.tv_sec, &tms); + spaceLeft -= strftime(buffer, spaceLeft, "%H:%M:%S.", &tms); + spaceLeft -= SNPRINTF(&buffer[150-spaceLeft], spaceLeft, "%06lu ", static_cast(tv.tv_usec)); +#else + struct _timeb tb; + _ftime(&tb); + struct tm* tms = localtime(&tb.time); + spaceLeft -= strftime(buffer, spaceLeft, "%H:%M:%S.", tms); + spaceLeft -= SNPRINTF(&buffer[150-spaceLeft], spaceLeft, "%06lu ", (unsigned long)tb.millitm); +#endif + + char levelString[10]; + if (level == CRAZY) strcpy(levelString, "[CRAZY] "); + if (level == EMERG) strcpy(levelString, "[EMERG] "); + if (level == ALERT) strcpy(levelString, "[ALERT] "); + if (level == CRIT) strcpy(levelString, "[CRIT] "); + if (level == ERR) strcpy(levelString, "[ERR] "); + if (level == WARN) strcpy(levelString, "[WARN] "); + if (level == NOTICE) strcpy(levelString, "[notice]"); + if (level == INFO) strcpy(levelString, "[info] "); + if (level == DEBUG) strcpy(levelString, "[debug] "); + +#ifndef WIN32 + spaceLeft -= SNPRINTF(&buffer[150-spaceLeft], spaceLeft, "%s %lu %li %s - ", levelString, pthread_self(), syscall(SYS_gettid), fromModule); +#else + spaceLeft -= SNPRINTF(&buffer[150-spaceLeft], spaceLeft, "%s %s - ", levelString, fromModule); +#endif + + va_list ap; + va_start(ap, message); + spaceLeft = VSNPRINTF(&buffer[150-spaceLeft], spaceLeft, message, ap); + va_end(ap); + + int messageLength = strlen(buffer); + if (messageLength < 150) + { + buffer[messageLength] = '\n'; + buffer[messageLength+1] = '\0'; + } + else + { + buffer[149] = '\n'; + buffer[150] = '\0'; + } + + int success = 1; + if (enabled) + { +#ifndef __ANDROID__ + success = fputs(buffer, logfile); + fflush(NULL); +#else + int and_level=0; + switch (level) { + case CRAZY: + case ALERT: + case EMERG : + case CRIT:{ + and_level=ANDROID_LOG_FATAL; + } break; + case ERR: { + and_level=ANDROID_LOG_ERROR; + } break; + case WARN: { + and_level=ANDROID_LOG_WARN; + } break; + case NOTICE: + case INFO: { + and_level=ANDROID_LOG_INFO; + } break; + case DEBUG :{ + and_level=ANDROID_LOG_DEBUG; + } break; + }; + __android_log_vprint(and_level, fromModule, + message, ap); +#endif + } + + if (extlog) extlog->LogExtern(buffer); //Replacement for network logging + + + if (success != EOF) + return 1; + else + return 0; + +} + +void Log::logLongString(const char *fromModule, int level,const char *message) +{ + int string_size=strlen(message); + char buffer[100]; + const char * pointer=message; + for (int str_written=0; str_written +#ifndef WIN32 + #include + #include +#else + #include +#endif + +#include +#include +#include +#include +#include "defines.h" + + +class ExternLogger { +public: + virtual bool LogExtern(const char* message)=0; +}; + + +class Log +{ + public: + Log(); + ~Log(); + static Log* getInstance(); + + int init(int defaultLevel,const char* fileName, int enabled); + int shutdown(); + int log(const char *fromModule, int level,const char *message, ...); + void logLongString(const char *fromModule, int level,const char *message); + int status(); + void upLogLevel(); + void downLogLevel(); + void setExternLogger(ExternLogger* log); + void unsetExternLogger() { + extlog=NULL; + } + + + + const static int CRAZY = 0; // mad crazy things that should never happen + const static int EMERG = 1; // human assist required NOW + const static int ALERT = 2; // system unusable, but happy to sit there + const static int CRIT = 3; // still working, but maybe about to die + const static int ERR = 4; // that response is not even listed... + const static int WARN = 5; // this could be a bad thing. still running tho + const static int NOTICE = 6; // significant good thing + const static int INFO = 7; // verbose good thing + const static int DEBUG = 8; // debug-level messages + + private: + static Log* instance; + int initted; + int logLevel; + int enabled; + + FILE *logfile; + + ExternLogger* extlog; + + +}; + +#endif + +/* + +Documentation +------------- + +This class is intended to be instatiated once by the core. +For a one off use: + +Log::getInstance()->log("", Log::, ""); + +Or, a pointer can be stored and used: + +Log *myptr = Log::getInstance(); + +myptr->log("", Log::, ""); +myptr->log("", Log::, ""); + +Level usages are above. + +The message parameter in the log function can be used in the same way as printf, eg. + +myptr->log("", Log::, "Success: %s %i", stringpointer, integer); + +*/ diff --git a/osddirectfb.h b/osddirectfb.h index 7814cfd..9558ee8 100644 --- a/osddirectfb.h +++ b/osddirectfb.h @@ -29,7 +29,7 @@ #include "osd.h" #include "defines.h" -#include "log.h" +#include "oldlog.h" #include "surfacedirectfb.h" #include "video.h" diff --git a/osdopengl.h b/osdopengl.h index 730d0c5..12394c2 100644 --- a/osdopengl.h +++ b/osdopengl.h @@ -29,7 +29,7 @@ #include "osd.h" #include "defines.h" -#include "log.h" +#include "oldlog.h" #include "threadp.h" #include "videoomx.h" diff --git a/osdopenvg.h b/osdopenvg.h index 4588c95..7b3a0f2 100644 --- a/osdopenvg.h +++ b/osdopenvg.h @@ -33,7 +33,7 @@ #include "defines.h" #include "osdvector.h" -#include "log.h" +#include "oldlog.h" #include "videoomx.h" #include "staticartwork.h" #ifdef PICTURE_DECODER_OMX diff --git a/osdwinpixel.h b/osdwinpixel.h index 190a40b..c84bc64 100644 --- a/osdwinpixel.h +++ b/osdwinpixel.h @@ -25,7 +25,7 @@ #include "osd.h" #include "defines.h" -#include "log.h" +#include "oldlog.h" #include "windowsosd.h" #include diff --git a/osdwinvector.h b/osdwinvector.h index 3dea77a..b75e387 100644 --- a/osdwinvector.h +++ b/osdwinvector.h @@ -32,7 +32,7 @@ #include #include -#include "log.h" +#include "oldlog.h" #include "osdvector.h" class OsdWinVector : public OsdVector, public WindowsOsd diff --git a/playermedia.cc b/playermedia.cc index ecaad25..71f82d8 100644 --- a/playermedia.cc +++ b/playermedia.cc @@ -24,7 +24,7 @@ #include "messagequeue.h" #include "i18n.h" #include "boxx.h" -#include "log.h" +#include "oldlog.h" #include "media.h" #include "mediaplayer.h" diff --git a/playerradiolive.cc b/playerradiolive.cc index 086e069..1f74515 100644 --- a/playerradiolive.cc +++ b/playerradiolive.cc @@ -24,7 +24,7 @@ #include #include "defines.h" -#include "log.h" +#include "oldlog.h" #include "audio.h" #include "demuxerts.h" #include "vdr.h" diff --git a/playerradiorec.cc b/playerradiorec.cc index 96df42b..1ae8a9b 100644 --- a/playerradiorec.cc +++ b/playerradiorec.cc @@ -23,7 +23,7 @@ #endif #include -#include "log.h" +#include "oldlog.h" #include "audio.h" #include "video.h" #include "demuxervdr.h" diff --git a/playervideolive.cc b/playervideolive.cc index b4111c0..099c6b2 100644 --- a/playervideolive.cc +++ b/playervideolive.cc @@ -24,7 +24,7 @@ #include #include "defines.h" -#include "log.h" +#include "oldlog.h" #include "audio.h" #include "video.h" #include "demuxerts.h" diff --git a/playervideorec.cc b/playervideorec.cc index 03a4060..e9324ac 100644 --- a/playervideorec.cc +++ b/playervideorec.cc @@ -17,7 +17,7 @@ along with VOMP. If not, see . */ -#include "log.h" +#include "oldlog.h" #include "audio.h" #include "video.h" #include "demuxervdr.h" diff --git a/recinfo.cc b/recinfo.cc index 45a34f0..f1d8e53 100644 --- a/recinfo.cc +++ b/recinfo.cc @@ -21,7 +21,7 @@ #include -#include "log.h" +#include "oldlog.h" #include "i18n.h" #include "recinfo.h" diff --git a/recman.cc b/recman.cc index 7b8f1d2..32036fc 100644 --- a/recman.cc +++ b/recman.cc @@ -20,7 +20,7 @@ #include "recman.h" #include "vdr.h" -#include "log.h" +#include "oldlog.h" RecMan::RecMan() { diff --git a/recording.cc b/recording.cc index 2198568..298a334 100644 --- a/recording.cc +++ b/recording.cc @@ -20,7 +20,7 @@ #include "recinfo.h" #include "mark.h" -#include "log.h" +#include "oldlog.h" #include "demuxer.h" #include "demuxerts.h" #include "control.h" diff --git a/remotelirc.cc b/remotelirc.cc index 7138dde..60268f3 100644 --- a/remotelirc.cc +++ b/remotelirc.cc @@ -22,7 +22,7 @@ #include "remotelirc.h" #include "i18n.h" -#include "log.h" +#include "oldlog.h" #define LIRC_BUFFER_SIZE 128 diff --git a/sleeptimer.cc b/sleeptimer.cc index 4a49f78..240eca6 100644 --- a/sleeptimer.cc +++ b/sleeptimer.cc @@ -19,7 +19,7 @@ */ #include "defines.h" -#include "log.h" +#include "oldlog.h" #include "input.h" #include "wsymbol.h" #include "colour.h" diff --git a/stream.cc b/stream.cc index e3d94df..ba6903e 100644 --- a/stream.cc +++ b/stream.cc @@ -21,7 +21,7 @@ #include #include -#include "log.h" +#include "oldlog.h" #include "stream.h" Stream::~Stream() diff --git a/surface.cc b/surface.cc index 25fd516..73b74ac 100644 --- a/surface.cc +++ b/surface.cc @@ -20,7 +20,7 @@ #include #include #include "osd.h" -#include "log.h" +#include "oldlog.h" #include "video.h" #include "teletxt/txtfont.h" diff --git a/surfacedirectfb.cc b/surfacedirectfb.cc index 2a426c4..95b3401 100644 --- a/surfacedirectfb.cc +++ b/surfacedirectfb.cc @@ -23,7 +23,7 @@ #include "osd.h" #include "bitmap.h" -#include "log.h" +#include "oldlog.h" #include "osddirectfb.h" diff --git a/surfaceopengl.cc b/surfaceopengl.cc index 5d3d79a..5023a43 100644 --- a/surfaceopengl.cc +++ b/surfaceopengl.cc @@ -22,7 +22,7 @@ #include "surfaceopengl.h" #include "osdopengl.h" #include "bitmap.h" -#include "log.h" +#include "oldlog.h" #include "mutex.h" inline unsigned int InternalColour(unsigned int c){ diff --git a/surfacewin.cc b/surfacewin.cc index 126f50d..050f763 100644 --- a/surfacewin.cc +++ b/surfacewin.cc @@ -21,7 +21,7 @@ #include "surfacewin.h" #include "osdwinpixel.h" #include "bitmap.h" -#include "log.h" +#include "oldlog.h" #include SurfaceWin::SurfaceWin(int id) diff --git a/tbboxx.cc b/tbboxx.cc index 8e7922f..b453286 100644 --- a/tbboxx.cc +++ b/tbboxx.cc @@ -20,7 +20,7 @@ #include "tbboxx.h" -#include "log.h" +#include "oldlog.h" TBBoxx::TBBoxx() { diff --git a/tcp.cc b/tcp.cc index e435b52..6cf82b9 100644 --- a/tcp.cc +++ b/tcp.cc @@ -41,7 +41,7 @@ #include #include "defines.h" -#include "log.h" +#include "oldlog.h" #include "tcp.h" diff --git a/teletextdecodervbiebu.h b/teletextdecodervbiebu.h index 8223eea..ef2fdb4 100644 --- a/teletextdecodervbiebu.h +++ b/teletextdecodervbiebu.h @@ -36,7 +36,7 @@ #define TXTDECVBIEBU_H #include "draintarget.h" -#include "log.h" +#include "oldlog.h" /* from osdteletext begin */ diff --git a/tfeed.cc b/tfeed.cc index 063b5fa..ce5bdc3 100644 --- a/tfeed.cc +++ b/tfeed.cc @@ -16,7 +16,7 @@ along with VOMP. If not, see . */ -#include "log.h" +#include "oldlog.h" #include "demuxer.h" #include "callback.h" #include "util.h" diff --git a/threadpandroid.cc b/threadpandroid.cc index 693286a..7b9e5ca 100644 --- a/threadpandroid.cc +++ b/threadpandroid.cc @@ -19,7 +19,7 @@ */ #include "threadpandroid.h" -#include "log.h" +#include "oldlog.h" // Undeclared functions, only for use in this file to start the thread void threadPAndroidInternalStart(void *arg) diff --git a/timers.cc b/timers.cc index fe6328b..1ffe4eb 100644 --- a/timers.cc +++ b/timers.cc @@ -17,7 +17,7 @@ along with VOMP. If not, see . */ -#include "log.h" +#include "oldlog.h" #include "timers.h" diff --git a/udp4.cc b/udp4.cc index 1382b7f..6b4f352 100644 --- a/udp4.cc +++ b/udp4.cc @@ -36,7 +36,7 @@ #include #include "defines.h" -#include "log.h" +#include "oldlog.h" #include "udp4.h" diff --git a/udp6.cc b/udp6.cc index 0659fac..cecf1ee 100644 --- a/udp6.cc +++ b/udp6.cc @@ -37,7 +37,7 @@ #include #include -#include "log.h" +#include "oldlog.h" #include "udp6.h" diff --git a/vaudioselector.cc b/vaudioselector.cc index 142565d..a52663a 100644 --- a/vaudioselector.cc +++ b/vaudioselector.cc @@ -30,7 +30,7 @@ #include "message.h" #include "messagequeue.h" #include "recinfo.h" -#include "log.h" +#include "oldlog.h" #include "channel.h" #include "vaudioselector.h" diff --git a/vchannelselect.cc b/vchannelselect.cc index 1a6881b..02fb88e 100644 --- a/vchannelselect.cc +++ b/vchannelselect.cc @@ -22,7 +22,7 @@ #include "message.h" #include "boxstack.h" #include "colour.h" -#include "log.h" +#include "oldlog.h" #include "vdr.h" #include "messagequeue.h" diff --git a/vcolourtuner.cc b/vcolourtuner.cc index 32507c9..63133a2 100644 --- a/vcolourtuner.cc +++ b/vcolourtuner.cc @@ -26,7 +26,7 @@ #include "vinfo.h" #include "boxstack.h" #include "i18n.h" -#include "log.h" +#include "oldlog.h" #include "mediaoptions.h" #define PICTUREFILE "/colourtest.jpg" diff --git a/vconnect.cc b/vconnect.cc index c140dfe..5373163 100644 --- a/vconnect.cc +++ b/vconnect.cc @@ -24,7 +24,7 @@ #include "i18n.h" #include "boxstack.h" #include "message.h" -#include "log.h" +#include "oldlog.h" #include "vdr.h" #include "wol.h" #include "vserverselect.h" diff --git a/vdpc.cc b/vdpc.cc index 847ef08..f7dd58c 100644 --- a/vdpc.cc +++ b/vdpc.cc @@ -26,7 +26,7 @@ #include #include -#include "log.h" +#include "oldlog.h" #include "wol.h" #include "vdpc.h" diff --git a/vdr.h b/vdr.h index b7bd161..e7c8edc 100644 --- a/vdr.h +++ b/vdr.h @@ -40,7 +40,7 @@ #endif #include "eventdispatcher.h" #include "i18n.h" -#include "log.h" +#include "oldlog.h" #include "control.h" #include "tcp.h" diff --git a/vepg.cc b/vepg.cc index 8024fdb..4bf7c8d 100644 --- a/vepg.cc +++ b/vepg.cc @@ -42,7 +42,7 @@ #include "boxstack.h" #include "channel.h" #include "i18n.h" -#include "log.h" +#include "oldlog.h" #include "vepg.h" diff --git a/vepglistadvanced.cc b/vepglistadvanced.cc index ed01b89..70b9505 100644 --- a/vepglistadvanced.cc +++ b/vepglistadvanced.cc @@ -28,7 +28,7 @@ #include "video.h" #include "i18n.h" #include "messagequeue.h" -#include "log.h" +#include "oldlog.h" #include "movieinfo.h" #include "seriesinfo.h" #include "event.h" diff --git a/vepgsettimer.cc b/vepgsettimer.cc index 71a025a..3c0241d 100644 --- a/vepgsettimer.cc +++ b/vepgsettimer.cc @@ -23,7 +23,7 @@ #include "channel.h" #include "boxstack.h" #include "vdr.h" -#include "log.h" +#include "oldlog.h" #include "vinfo.h" #include "message.h" #include "control.h" diff --git a/vepgsummary.cc b/vepgsummary.cc index a3e5e80..1b235d2 100644 --- a/vepgsummary.cc +++ b/vepgsummary.cc @@ -32,7 +32,7 @@ #include "event.h" #include "channel.h" #include "message.h" -#include "log.h" +#include "oldlog.h" #include "wmovieview.h" #include "wseriesview.h" #include "wpictureview.h" diff --git a/vfeed.cc b/vfeed.cc index 00e129c..9225142 100644 --- a/vfeed.cc +++ b/vfeed.cc @@ -17,7 +17,7 @@ along with VOMP. If not, see . */ -#include "log.h" +#include "oldlog.h" #include "demuxer.h" #include "callback.h" #include "util.h" diff --git a/videoomx.cc b/videoomx.cc index 9a90e4d..7299c42 100644 --- a/videoomx.cc +++ b/videoomx.cc @@ -22,7 +22,7 @@ #include -#include "log.h" +#include "oldlog.h" #include "audioomx.h" #include "demuxer.h" #include "vdr.h" diff --git a/videowin.cc b/videowin.cc index 792e2a3..5c09aff 100644 --- a/videowin.cc +++ b/videowin.cc @@ -21,7 +21,7 @@ #include "videowin.h" -#include "log.h" +#include "oldlog.h" #include "dssourcefilter.h" #include "dsallocator.h" #include "vdr.h" diff --git a/vmedialist.cc b/vmedialist.cc index 47b21d2..bfc14a6 100644 --- a/vmedialist.cc +++ b/vmedialist.cc @@ -69,7 +69,7 @@ #include "vinfo.h" #include "media.h" #include "mediaplayer.h" -#include "log.h" +#include "oldlog.h" #include "localmediafile.h" #include "mediaoptions.h" diff --git a/vmediaview.cc b/vmediaview.cc index f1fff11..d9e5db9 100644 --- a/vmediaview.cc +++ b/vmediaview.cc @@ -38,7 +38,7 @@ #include "control.h" #include "mediaoptions.h" #include "mediaplayer.h" -#include "log.h" +#include "oldlog.h" #include "messagequeue.h" const int VMediaView::EVENT_SLIDESHOW=100; diff --git a/vopts.cc b/vopts.cc index ca8c3b4..7cafc71 100644 --- a/vopts.cc +++ b/vopts.cc @@ -27,7 +27,7 @@ #include "boxstack.h" #include "woptionpane.h" #include "wremoteconfig.h" -#include "log.h" +#include "oldlog.h" #include "option.h" #include "vdr.h" #include "messagequeue.h" diff --git a/vpicturebanner.cc b/vpicturebanner.cc index 9d34c2f..60bde94 100644 --- a/vpicturebanner.cc +++ b/vpicturebanner.cc @@ -27,7 +27,7 @@ #include "vinfo.h" #include "boxstack.h" #include "i18n.h" -#include "log.h" +#include "oldlog.h" VPictureBanner::VPictureBanner(bool ld, bool sl) { diff --git a/vradiorec.cc b/vradiorec.cc index 08656f6..f8dd383 100644 --- a/vradiorec.cc +++ b/vradiorec.cc @@ -30,7 +30,7 @@ #include "input.h" #include "vinfo.h" #include "i18n.h" -#include "log.h" +#include "oldlog.h" #include "messagequeue.h" #include "vradiorec.h" diff --git a/vrecording.cc b/vrecording.cc index c9936a7..90cf8b3 100644 --- a/vrecording.cc +++ b/vrecording.cc @@ -34,7 +34,7 @@ #include "vrecordinglist.h" #include "recording.h" #include "message.h" -#include "log.h" +#include "oldlog.h" #include "wmovieview.h" #include "wseriesview.h" #include "wpictureview.h" diff --git a/vrecordinglist.cc b/vrecordinglist.cc index a9b6caa..5ed7819 100644 --- a/vrecordinglist.cc +++ b/vrecordinglist.cc @@ -35,7 +35,7 @@ #include "i18n.h" #include "control.h" #include "vinfo.h" -#include "log.h" +#include "oldlog.h" VRecordingList::VRecordingList() { diff --git a/vrecordinglistadvanced.cc b/vrecordinglistadvanced.cc index e557029..bc85a41 100644 --- a/vrecordinglistadvanced.cc +++ b/vrecordinglistadvanced.cc @@ -37,7 +37,7 @@ #include "i18n.h" #include "control.h" #include "vinfo.h" -#include "log.h" +#include "oldlog.h" #include "movieinfo.h" #include "seriesinfo.h" #include "staticartwork.h" diff --git a/vrecordinglistclassic.cc b/vrecordinglistclassic.cc index fc1b7fa..8e46d78 100644 --- a/vrecordinglistclassic.cc +++ b/vrecordinglistclassic.cc @@ -33,7 +33,7 @@ #include "i18n.h" #include "control.h" #include "vinfo.h" -#include "log.h" +#include "oldlog.h" #include "vrecordinglistclassic.h" diff --git a/vscreensaver.cc b/vscreensaver.cc index 0d8f383..523dc8e 100644 --- a/vscreensaver.cc +++ b/vscreensaver.cc @@ -22,7 +22,7 @@ #include #include "defines.h" -#include "log.h" +#include "oldlog.h" #include "input.h" #include "colour.h" #include "video.h" diff --git a/vtimerlist.cc b/vtimerlist.cc index d093e04..4be53ca 100644 --- a/vtimerlist.cc +++ b/vtimerlist.cc @@ -32,7 +32,7 @@ #include "control.h" #include "boxstack.h" #include "vinfo.h" -#include "log.h" +#include "oldlog.h" #include "staticartwork.h" #include "vtimerlist.h" diff --git a/vvideolivetv.cc b/vvideolivetv.cc index 46c6305..e2f2669 100644 --- a/vvideolivetv.cc +++ b/vvideolivetv.cc @@ -39,7 +39,7 @@ #include "event.h" #include "vepg.h" #include "bitmap.h" -#include "log.h" +#include "oldlog.h" #include "vteletextview.h" #include "vepgsummary.h" #include "vepglistadvanced.h" diff --git a/vvideomedia.cc b/vvideomedia.cc index ccf9d7a..fd580ac 100644 --- a/vvideomedia.cc +++ b/vvideomedia.cc @@ -34,7 +34,7 @@ #include "boxstack.h" #include "vinfo.h" #include "i18n.h" -#include "log.h" +#include "oldlog.h" #include "recinfo.h" #include "messagequeue.h" diff --git a/vvideorec.cc b/vvideorec.cc index efcc599..63b9b8d 100644 --- a/vvideorec.cc +++ b/vvideorec.cc @@ -35,7 +35,7 @@ #include "i18n.h" #include "bitmap.h" #include "recinfo.h" -#include "log.h" +#include "oldlog.h" #include "channel.h" #include "vteletextview.h" #include "messagequeue.h" diff --git a/vwelcome.cc b/vwelcome.cc index a3bace7..db16293 100644 --- a/vwelcome.cc +++ b/vwelcome.cc @@ -18,7 +18,7 @@ */ -#include "log.h" +#include "oldlog.h" #include "input.h" #include "vdr.h" #include "vchannellist.h" diff --git a/windowsosd.cc b/windowsosd.cc index 36a8340..b2edfaf 100644 --- a/windowsosd.cc +++ b/windowsosd.cc @@ -22,7 +22,7 @@ #include "dsallocator.h" #include "video.h" #include "videowin.h" -#include "log.h" +#include "oldlog.h" #include "colour.h" typedef HRESULT(__stdcall *FCT_DXVA2CreateDirect3DDeviceManager9)(UINT* pResetToken, IDirect3DDeviceManager9** ppDeviceManager); diff --git a/winmain.cc b/winmain.cc index 53d24c2..cdbcb64 100644 --- a/winmain.cc +++ b/winmain.cc @@ -31,7 +31,7 @@ #include "vompreswin.h" #include "defines.h" -#include "log.h" +#include "oldlog.h" #include "inputman.h" #include "inputwin.h" #include "util.h" diff --git a/wjpeg.cc b/wjpeg.cc index 7c76678..193a72a 100644 --- a/wjpeg.cc +++ b/wjpeg.cc @@ -30,7 +30,7 @@ #endif #include "i18n.h" -#include "log.h" +#include "oldlog.h" #include "surface.h" diff --git a/wjpegcomplex.cc b/wjpegcomplex.cc index 2965f4f..ad4ce3f 100644 --- a/wjpegcomplex.cc +++ b/wjpegcomplex.cc @@ -30,7 +30,7 @@ #endif #include "i18n.h" -#include "log.h" +#include "oldlog.h" #include "surface.h" #ifndef __ANDROID__ diff --git a/wjpegsimple.cc b/wjpegsimple.cc index d94be69..37967bd 100644 --- a/wjpegsimple.cc +++ b/wjpegsimple.cc @@ -26,7 +26,7 @@ #include "i18n.h" -#include "log.h" +#include "oldlog.h" #include "surface.h" diff --git a/wol.cc b/wol.cc index 50680ee..158d491 100644 --- a/wol.cc +++ b/wol.cc @@ -44,7 +44,7 @@ #include #endif #include "wol.h" -#include "log.h" +#include "oldlog.h" #define _PATH_PROCNET_ARP "/proc/net/arp" diff --git a/woptionbox.cc b/woptionbox.cc index bf3fb73..20b4cab 100644 --- a/woptionbox.cc +++ b/woptionbox.cc @@ -18,7 +18,7 @@ */ #include "colour.h" -#include "log.h" +#include "oldlog.h" #ifndef WIN32 #include "unistd.h" #endif diff --git a/woptionpane.cc b/woptionpane.cc index 1dcdcfe..007b45d 100644 --- a/woptionpane.cc +++ b/woptionpane.cc @@ -20,7 +20,7 @@ #include "wtextbox.h" #include "i18n.h" #include "woptionbox.h" -#include "log.h" +#include "oldlog.h" #include "vdr.h" #include "input.h" #include "option.h" diff --git a/wremoteconfig.cc b/wremoteconfig.cc index d7f1e0f..8f7386c 100644 --- a/wremoteconfig.cc +++ b/wremoteconfig.cc @@ -19,7 +19,7 @@ #include -#include "log.h" +#include "oldlog.h" #include "input.h" #include "inputman.h" #include "wsymbol.h" diff --git a/wselectlist.cc b/wselectlist.cc index 6367e6b..6fe0c4e 100644 --- a/wselectlist.cc +++ b/wselectlist.cc @@ -21,7 +21,7 @@ #include #include "colour.h" -#include "log.h" +#include "oldlog.h" #include "wselectlist.h"