Rename Log class filenames to oldlog

diff --git a/afeed.cc b/afeed.cc
index 546df45730645b6a4caed556a17772e361a6aab5..c0efb2a1b8e5097d78b0acb9aa93329b267a608d 100644 (file)
--- a/afeed.cc
+++ b/afeed.cc
@@ -17,7 +17,7 @@
     along with VOMP.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include "log.h"
+#include "oldlog.h"
 #include "demuxer.h"
 #include "callback.h"
 #include "util.h"

diff --git a/audio.cc b/audio.cc
index aa02ec4198886ce69ba69c00eb9834648477a166..4ff9bd0ef1a500b0d1418532656fa0047727fea1 100644 (file)
--- 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 7ad4d32465dcd2099d7c5bfc26855ff5c0a99766..10a631875695e69eda90a244309e5ce911009818 100644 (file)
--- a/audioomx.cc
+++ b/audioomx.cc
@@ -20,7 +20,7 @@
 #include <bcm_host.h>
 
 #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 9f3f9a3a0c9c18f9aaa96b08eeaa2888abc42520..44ade448cf8939df09d8433fb9708fa533cc0ccf 100644 (file)
--- 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 8617e6c7bfd896119f3103b2412dc3bed0cb3ef8..44a179eff2d7ca3217e7a2b9a787fd01cf4002a4 100644 (file)
--- 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 <winsock2.h>
 #include <dshow.h>

diff --git a/boxstack.cc b/boxstack.cc
index 1bfad7a06b9ca7406d38ae7fe569de3efc86c384..4161cd541fec888c1908d9f1bd303aaa17f3b13e 100644 (file)
--- 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 c4e5735c744dd8c7dc5f36c8dac2ebe39c482859..0e2ae1ce73b8c527fcaf85986c217c2f561b22e4 100644 (file)
--- a/boxx.cc
+++ b/boxx.cc
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 
 #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 99941f8b41fa61d36086673a4850185b1296e8e4..e6830e60dcf86138f080632fc5fabd8a93e7b67f 100644 (file)
--- 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 31c6b355bb5cf1e0241f1f40c3177f2104dc3e9a..f421d1f753b4531365c7c5edb2d6fbd097db25b4 100644 (file)
--- 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 17121801906c9a7e052808039c6fd570d2ffcc72..a91d84aeb54a146109a535e7e2852df22aa6542b 100644 (file)
--- a/demuxer.cc
+++ b/demuxer.cc
@@ -23,7 +23,7 @@
 
 #include "callback.h"
 #include "dvbsubtitles.h"
-#include "log.h"
+#include "oldlog.h"
 
 #include <cstdlib>
 #include <algorithm>

diff --git a/demuxeraudio.cc b/demuxeraudio.cc
index 23fdcc327d12e0362ecbdfeb40e14c1e4929d49f..ad6f39140b34ffbfe232c6ff5bdd4402f7053fd9 100644 (file)
--- 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 813d49b0c38a50eb2bf4c66bd9590bdf2845b75a..77a6a42677e442440a161caacadd0523479692d8 100644 (file)
--- 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 <endian.h>

diff --git a/demuxerts.cc b/demuxerts.cc
index b7059c5150f70dcd16dbe6f8f2c031037414cd29..4394c49debc82112b52ce37f13bd20d83978bee2 100644 (file)
--- 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 f1a2a3deaeeebdca9c7da1948afc2b1fcb528609..0e12eff87f8e3afdd63a011fda6099698e7c4b7e 100644 (file)
--- 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 <endian.h>

diff --git a/dsallocator.cc b/dsallocator.cc
index 80f2298cd38e310991e3e06939098bcbabe0b72d..584ceea081ee7a587f00fa53af76784207accb7f 100644 (file)
--- 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 <math.h>
 

diff --git a/dvbsubtitles.cc b/dvbsubtitles.cc
index b9fac6897e41363990679d310e95fcc799f2ffe0..22efab00b73859d998ecc4ddc50984738de8621f 100644 (file)
--- 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 b11547b0ff9c21c5c2f269151e55edb306866dcc..c33c9f4b0e279354149bcb2bb7a0c1eb20cef0af 100644 (file)
--- 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 5f772d0d8a8b274afe165cc09fdfb5156e4e046a..04230094fd70cdcadc6fea71c554f15732fc6b91 100644 (file)
--- a/glshader.h
+++ b/glshader.h
@@ -22,7 +22,7 @@
 #define GL_SHADER_H
 
 #include <GLES2/gl2.h>
-#include "log.h"
+#include "oldlog.h"
 
 class GLShader {
 public:

diff --git a/i18n.cc b/i18n.cc
index 0f14365979a21dd1d828807bf4154884eedab4a8..100aaba17d6b5e8c5e29f929bece707d619399f6 100644 (file)
--- 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 be7d9548e64888cc249a83efd52e1f7ba0a347e0..a0e119345359b696a5d31b567893c0d09a7d482e 100644 (file)
--- a/imageomx.cc
+++ b/imageomx.cc
@@ -19,7 +19,7 @@
 
 #include <bcm_host.h>
 #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 68e829302d8e0f7f0e5d67b13dc7c074e13803bd..be77f786fdbfaddee80be2b99c8d8851b212445b 100644 (file)
--- 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 030ac76f3f187d96b90de1433f8b7d312de50670..423c53f0cb7666e30ab68fd0fba0d5efe781ec87 100644 (file)
--- 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 976101a4eb798ed9344fc9b169e3f75ed0fc3b4d..ca67a9161dd7abde8d40c5bbe2be40d493838f0e 100644 (file)
--- a/inputcec.cc
+++ b/inputcec.cc
@@ -24,7 +24,7 @@ using namespace CEC;
 
 #include <bcm_host.h>
 
-#include "log.h"
+#include "oldlog.h"
 #include "vdr.h"
 #include "woptionpane.h"
 #include "inputcec.h"

diff --git a/inputlirc.cc b/inputlirc.cc
index a56e77ce9f548ca054c917a14fb55e11092a8ad5..6c208bbc2c1a87e36eb82bb483c17d64e7061df4 100644 (file)
--- a/inputlirc.cc
+++ b/inputlirc.cc
@@ -22,7 +22,7 @@
 #include <stdexcept>
 
 #include "config.h"
-#include "log.h"
+#include "oldlog.h"
 
 #include "inputman.h"
 

diff --git a/inputman.cc b/inputman.cc
index 864e558505ffb7f64d95ec45187cda082d0f6376..d5cc4eb105d3e085e38443d62ad06991d34a0def 100644 (file)
--- 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 6b707780b700be06533bb2bb16778fef584e17c1..6a37b2916ac8aa262a894e4c594cbe3e0c612abd 100644 (file)
--- a/inputudp.cc
+++ b/inputudp.cc
@@ -22,7 +22,7 @@
 #include <unistd.h>
 #endif
 
-#include "log.h"
+#include "oldlog.h"
 
 #include "inputudp.h"
 

diff --git a/inputwin.cc b/inputwin.cc
index 6a07dfebfad0c46ae1e69e482d7cde9111b2ea4c..5c6ace2be0734c566855627083cdd83cb6bb14c5 100644 (file)
--- 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 5bcf35354454dba93e61c36e9089aef6d44ca72f..70eb6c751f728d7aea9be4dda72db66a61bd4afd 100644 (file)
--- a/localmediafile.cc
+++ b/localmediafile.cc
@@ -22,7 +22,7 @@
 #include "media.h"
 #include "mediaproviderids.h"
 #include <iostream>
-#include "log.h"
+#include "oldlog.h"
 
 
 LocalMediaFile *LocalMediaFile::instance =NULL;

diff --git a/localmediafile.h b/localmediafile.h
index 6da202e00ac0173928b2f2bd51b9509d5d5d1d90..ef38f45b44df8664ec79fdfdf79e6d2a050fb04a 100644 (file)
--- a/localmediafile.h
+++ b/localmediafile.h
@@ -31,7 +31,7 @@
 
 #endif
 #include <iostream>
-#include "log.h"
+#include "oldlog.h"
 
 #define BASEDIR "media"
 

diff --git a/log.cc b/log.cc
deleted file mode 100644 (file)
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 <sys/types.h>
-
-#ifndef WIN32
-#include <sys/syscall.h>
-#include <unistd.h>
-#endif
-
-#include "vdr.h"
-
-
-#include "log.h"
-
-
-#ifdef __ANDROID__
-#include <android/log.h>
-#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<unsigned long>(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<string_size;str_written+=99) {
-               strncpy(buffer,pointer,99);
-               buffer[99]=0;
-               pointer+=99;
-               log(fromModule,level,"%s",buffer);
-       }
-
-}
-
-int Log::status()
-{
-  if (instance && logfile) return 1;
-  else return 0;
-}
-
-void Log::setExternLogger(ExternLogger* login) {
-       extlog=login;
-    log("Log", Log::DEBUG, "Extern logging started");
-}
-
-
-
-

diff --git a/log.h b/log.h
deleted file mode 100644 (file)
index be9cf27..0000000
--- a/log.h
+++ /dev/null
@@ -1,115 +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.
-*/
-
-#ifndef LOG_H
-#define LOG_H
-
-#include <stdio.h>
-#ifndef WIN32
- #include <unistd.h>
- #include <sys/time.h>
-#else
- #include <sys/timeb.h>
-#endif
-
-#include <time.h>
-#include <string.h>
-#include <stdarg.h>
-#include <sys/types.h>
-#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("<module-name>", Log::<levelname>, "<message>");
-
-Or, a pointer can be stored and used:
-
-Log *myptr = Log::getInstance();
-
-myptr->log("<module-name>", Log::<levelname>, "<message>");
-myptr->log("<module-name>", Log::<levelname>, "<message>");
-
-Level usages are above.
-
-The message parameter in the log function can be used in the same way as printf, eg.
-
-myptr->log("<module-name>", Log::<levelname>, "Success: %s %i", stringpointer, integer);
-
-*/

diff --git a/main.cc b/main.cc
index 42c9b3a42b2352083a3a88ead61c347a1bcbb89f..2abc5ecb835c6345376005a741c8182e708c4963 100644 (file)
--- 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 155842899155aa7946e8bb1650982c5d3e5cadb6..570f67dd47553f9cc444729a5d44867fbb12887a 100644 (file)
--- a/mediafile.cc
+++ b/mediafile.cc
@@ -34,7 +34,7 @@
 #include <stddef.h>
 
 #include <iostream>
-#include "log.h"
+#include "oldlog.h"
 
 
 

diff --git a/mediaoptions.h b/mediaoptions.h
index 5a9fe386d27a0961be3e7eb249bbd95ccdaad95c..a64c7640cdfc167814ee1b4b2d0cc848cbec84ca 100644 (file)
--- a/mediaoptions.h
+++ b/mediaoptions.h
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "defines.h"
-#include "log.h"
+#include "oldlog.h"
 #include "abstractoption.h"
 
 class WTabBar;

diff --git a/mediaplayer.cc b/mediaplayer.cc
index 92816721aff57058a52ab9f8b7c2601073339761..e69b9b9d7d85f8267549f225d38bf9ef90cfc3d8 100644 (file)
--- 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 e79bccbf2e5a57a9c01a14b3146a67ea2ff083ad..7c2673be62ea13abe9f7d37dd38b17562c477d2d 100644 (file)
--- 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 a9d1c0532a9eeb91f671e9be51a490503076bd0d..84ddfa1191d00b07242ee15c43a050b06affe0b0 100644 (file)
--- 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 (file)
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 <sys/types.h>
+
+#ifndef WIN32
+#include <sys/syscall.h>
+#include <unistd.h>
+#endif
+
+#include "vdr.h"
+
+
+#include "oldlog.h"
+
+
+#ifdef __ANDROID__
+#include <android/log.h>
+#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<unsigned long>(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<string_size;str_written+=99) {
+               strncpy(buffer,pointer,99);
+               buffer[99]=0;
+               pointer+=99;
+               log(fromModule,level,"%s",buffer);
+       }
+
+}
+
+int Log::status()
+{
+  if (instance && logfile) return 1;
+  else return 0;
+}
+
+void Log::setExternLogger(ExternLogger* login) {
+       extlog=login;
+    log("Log", Log::DEBUG, "Extern logging started");
+}
+
+
+
+

diff --git a/oldlog.h b/oldlog.h
new file mode 100644 (file)
index 0000000..be9cf27
--- /dev/null
+++ b/oldlog.h
@@ -0,0 +1,115 @@
+/*
+    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.
+*/
+
+#ifndef LOG_H
+#define LOG_H
+
+#include <stdio.h>
+#ifndef WIN32
+ #include <unistd.h>
+ #include <sys/time.h>
+#else
+ #include <sys/timeb.h>
+#endif
+
+#include <time.h>
+#include <string.h>
+#include <stdarg.h>
+#include <sys/types.h>
+#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("<module-name>", Log::<levelname>, "<message>");
+
+Or, a pointer can be stored and used:
+
+Log *myptr = Log::getInstance();
+
+myptr->log("<module-name>", Log::<levelname>, "<message>");
+myptr->log("<module-name>", Log::<levelname>, "<message>");
+
+Level usages are above.
+
+The message parameter in the log function can be used in the same way as printf, eg.
+
+myptr->log("<module-name>", Log::<levelname>, "Success: %s %i", stringpointer, integer);
+
+*/

diff --git a/osddirectfb.h b/osddirectfb.h
index 7814cfdcdd97438d90e552173180e5bbfd624162..9558ee8f5253449e48cba08d49dfa9bbc19396a0 100644 (file)
--- 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 730d0c54508c6964170c4170908657d56c40377b..12394c2e1c6336b3d81b5f645020b8e3bb611e39 100644 (file)
--- 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 4588c9565c81cb4103358b31a188f4f3bf2e2a9a..7b3a0f2d89773a1d89bbbda5a4f5243c62df74c1 100644 (file)
--- 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 190a40b0760f14df15997d42c674557eaf0bfd50..c84bc64b73ee2216f0ef53dea94935d42cfc7514 100644 (file)
--- 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 <gdiplus.h>
 

diff --git a/osdwinvector.h b/osdwinvector.h
index 3dea77a051aa9e400d7ee209575955a42f518dae..b75e387e3742ec046d30f20f03f3d961292e8ac0 100644 (file)
--- a/osdwinvector.h
+++ b/osdwinvector.h
@@ -32,7 +32,7 @@
 #include <d2d1.h>
 #include <dwrite.h>
 
-#include "log.h"
+#include "oldlog.h"
 #include "osdvector.h"
 
 class OsdWinVector : public OsdVector, public WindowsOsd

diff --git a/playermedia.cc b/playermedia.cc
index ecaad251c63686c2b0cf6835e45bcecf0c33fe3e..71f82d881c34fb336f355456320589940a96a098 100644 (file)
--- 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 086e069749001f25cfe8c3f8fb826c643f693afd..1f745157f8e0df5eb795f233eebbcc7a5572fbd8 100644 (file)
--- a/playerradiolive.cc
+++ b/playerradiolive.cc
@@ -24,7 +24,7 @@
 #include <time.h>
 
 #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 96df42bffbac8eb383cb5f7d83388abb0709ad70..1ae8a9ba9da41432cb70dd853b25a722471152bd 100644 (file)
--- a/playerradiorec.cc
+++ b/playerradiorec.cc
@@ -23,7 +23,7 @@
 #endif
 #include <time.h>
 
-#include "log.h"
+#include "oldlog.h"
 #include "audio.h"
 #include "video.h"
 #include "demuxervdr.h"

diff --git a/playervideolive.cc b/playervideolive.cc
index b4111c05e1639522992630789dfd1ef48c58c238..099c6b218256748b168e4a976e32ffaa1817e0ec 100644 (file)
--- a/playervideolive.cc
+++ b/playervideolive.cc
@@ -24,7 +24,7 @@
 #include <time.h>
 
 #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 03a4060b7462f10a5f0904d97cbdc8cb4b3f55d6..e9324ac1169ee2c4f13c59740cf381f13866b1d3 100644 (file)
--- a/playervideorec.cc
+++ b/playervideorec.cc
@@ -17,7 +17,7 @@
     along with VOMP.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include "log.h"
+#include "oldlog.h"
 #include "audio.h"
 #include "video.h"
 #include "demuxervdr.h"

diff --git a/recinfo.cc b/recinfo.cc
index 45a34f0432cddd1415cd0e873b47b966323c6fbd..f1d8e53ba9217d098168d1f4a8b0cb7dfd9738c3 100644 (file)
--- a/recinfo.cc
+++ b/recinfo.cc
@@ -21,7 +21,7 @@
 
 #include <math.h>
 
-#include "log.h"
+#include "oldlog.h"
 #include "i18n.h"
 
 #include "recinfo.h"

diff --git a/recman.cc b/recman.cc
index 7b8f1d203f1101ca2b237e3dc7e1fa17f67e8aeb..32036fc1e25fd95bf26d9a3c2e56bee55ad3bb94 100644 (file)
--- 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 21985681eba4e2f7f003b9afcee5be060b10360d..298a33415f1c5e5b20edb37c887f915623d21fe5 100644 (file)
--- 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 7138dde2baf48cb7347b0d7eb76a0c0a6e8f06da..60268f35b24ad39b917545da8347872728367f0e 100644 (file)
--- 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 4a49f78e816d539705da743b1b2f32227a118286..240eca60aa5854316cef002f3786da9a68f2cb66 100644 (file)
--- 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 e3d94df9f06d46a9ce720ab53ac60763df0d9001..ba6903e3b16066c99e68cdb2aa13c57dadf7e621 100644 (file)
--- a/stream.cc
+++ b/stream.cc
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "log.h"
+#include "oldlog.h"
 #include "stream.h"
 
 Stream::~Stream()

diff --git a/surface.cc b/surface.cc
index 25fd516c235e60b10a763b436ae833d8ab508d18..73b74acce1c732226508baf9770f86ecc1e1c26a 100644 (file)
--- a/surface.cc
+++ b/surface.cc
@@ -20,7 +20,7 @@
 #include <math.h>
 #include <algorithm>
 #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 2a426c45fea7d875e590a6aa860b9c755de2eac1..95b3401435a07516f146974a38edec7de24f81ee 100644 (file)
--- 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 5d3d79a4a5aa5a0f5e6d78d863e24f94c2355a41..5023a43d766c5346acc30198810071bca5b52607 100644 (file)
--- 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 126f50d60a00d80f3971179b244eccab4c986363..050f7631c8ca2d95731817f7692d2ba957cad313 100644 (file)
--- 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 <gdiplus.h>
 
 SurfaceWin::SurfaceWin(int id)

diff --git a/tbboxx.cc b/tbboxx.cc
index 8e7922fa214dfdf806e8887d089cbe3eafc13a8f..b4532866b5a908fef4f6710b165a187277a1bb5f 100644 (file)
--- 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 e435b52ac590b64cbc0d5ef3741669b8cae0b3f7..6cf82b9390d863f79e7699f1a336287bb6b7302f 100644 (file)
--- a/tcp.cc
+++ b/tcp.cc
@@ -41,7 +41,7 @@
 #include <sstream>
 
 #include "defines.h"
-#include "log.h"
+#include "oldlog.h"
 
 #include "tcp.h"
 

diff --git a/teletextdecodervbiebu.h b/teletextdecodervbiebu.h
index 8223eea6f27552882656e7de77746db75b2f2479..ef2fdb44870a6c16d754280080879963cf393b7e 100644 (file)
--- 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 063b5fa260a469bfc6506f71d21b8ddaf67d63eb..ce5bdc398694e0f0aed60b542c77cec847b8eff7 100644 (file)
--- a/tfeed.cc
+++ b/tfeed.cc
@@ -16,7 +16,7 @@
     along with VOMP.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include "log.h"
+#include "oldlog.h"
 #include "demuxer.h"
 #include "callback.h"
 #include "util.h"

diff --git a/threadpandroid.cc b/threadpandroid.cc
index 693286a5ff526035380c368edbace8c9742106fc..7b9e5caed3a691ef07653db24881357484b646ee 100644 (file)
--- 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 fe6328b782f35ef91b3781158178d8eb051e378a..1ffe4ebd5cad9a4a503f6fb730a279a2a130c7df 100644 (file)
--- a/timers.cc
+++ b/timers.cc
@@ -17,7 +17,7 @@
     along with VOMP.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include "log.h"
+#include "oldlog.h"
 
 #include "timers.h"
 

diff --git a/udp4.cc b/udp4.cc
index 1382b7f823b2ee45ef19861210df98c42714926c..6b4f3527f1850e67d493c418cd56cb826e09beae 100644 (file)
--- a/udp4.cc
+++ b/udp4.cc
@@ -36,7 +36,7 @@
 #include <errno.h>
 
 #include "defines.h"
-#include "log.h"
+#include "oldlog.h"
 
 #include "udp4.h"
 

diff --git a/udp6.cc b/udp6.cc
index 0659facd1c06286c07f057bcefc511e7b936c7fc..cecf1ee033c145e0c683c77b89ab14539e11b837 100644 (file)
--- a/udp6.cc
+++ b/udp6.cc
@@ -37,7 +37,7 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include "log.h"
+#include "oldlog.h"
 
 #include "udp6.h"
 

diff --git a/vaudioselector.cc b/vaudioselector.cc
index 142565d68438a480c6d23cc831d93b5941986062..a52663ac888942e60cf1d042f968101f06c2d864 100644 (file)
--- 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 1a6881b06dd3d9d3f314d547255e5d7194ce42f1..02fb88ecf006d9ca3b96ff768b72aa2ea8656654 100644 (file)
--- 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 32507c938914b4077654d3c540cf1fa268e46348..63133a2731ce0a36f05b1bb4ff064e39dd5be0b6 100644 (file)
--- 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 c140dfe39f0cacb80e0f6973d43286bc492d2c91..537316321176c6f8085010556dc96392738c4bac 100644 (file)
--- 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 847ef0888bed7ca1503776f0e9ecfb70e92cbffa..f7dd58c9633fb49b39306c4881ff27d5659cff4a 100644 (file)
--- a/vdpc.cc
+++ b/vdpc.cc
@@ -26,7 +26,7 @@
 #include <chrono>
 #include <algorithm>
 
-#include "log.h"
+#include "oldlog.h"
 #include "wol.h"
 
 #include "vdpc.h"

diff --git a/vdr.h b/vdr.h
index b7bd161738b28a7b57d8d58571d3f73193c3d70b..e7c8edc0ce103d7b52967e1ae367bb01abf9b632 100644 (file)
--- 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 8024fdbff59ad0696acbf24c2d91defa974b84c3..4bf7c8dc86744bd7af17772fb9e3e1dfbcd27058 100644 (file)
--- 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 ed01b89baabad7e11901d58dfd4e70c1fe331f13..70b95059319c6f9ca46379521f5fdbef26df7b89 100644 (file)
--- 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 71a025a7094d0ba7a0a29a4e992ee9c597a2e51c..3c0241d613590a478b49b95305081d3edba6e8c7 100644 (file)
--- 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 a3e5e80ef9f770d521aefc6aec79ac1207921bea..1b235d26c46d65e4591f9535a9666b698dbefdbc 100644 (file)
--- 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 00e129c99521b31f286468713323914d10b14c6a..9225142c742d4175e962bb5027b5bf0e4defa543 100644 (file)
--- a/vfeed.cc
+++ b/vfeed.cc
@@ -17,7 +17,7 @@
     along with VOMP.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include "log.h"
+#include "oldlog.h"
 #include "demuxer.h"
 #include "callback.h"
 #include "util.h"

diff --git a/videoomx.cc b/videoomx.cc
index 9a90e4da8b3726550292addcd5bd157733e46a2c..7299c42e48ad0e09c1fbd87651d1c6ad7e0c12b5 100644 (file)
--- a/videoomx.cc
+++ b/videoomx.cc
@@ -22,7 +22,7 @@
 
 #include <chrono>
 
-#include "log.h"
+#include "oldlog.h"
 #include "audioomx.h"
 #include "demuxer.h"
 #include "vdr.h"

diff --git a/videowin.cc b/videowin.cc
index 792e2a37a74f430e6305ab22d5815071920d9a16..5c09aff667d1a357e56126736a0a7a6abd1d084e 100644 (file)
--- 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 47b21d2f25401382e647130adf99c0146c1ed4ad..bfc14a6195a750fc0c660200c569cab7eff62be7 100644 (file)
--- 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 f1fff11258aa1c95e0422499dc07b891bbd59f56..d9e5db98378915d9cec3e1fa6b147533207ac1bf 100644 (file)
--- 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 ca8c3b42bdee7e214503953246c5523dac5b61d2..7cafc7176fbcabb7a155d5d7206c0466db4ca09f 100644 (file)
--- 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 9d34c2f4f7883e555a4cb20b4d028c6a1e50e027..60bde94dc9aae3302b0c627338d03b75e059eceb 100644 (file)
--- 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 08656f627832f384aa65ce37258b0b6683f32426..f8dd383541f64d9932da4a9d1ffad25a93a04118 100644 (file)
--- 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 c9936a7869a2a8a9ad15f1261b9cd441b17145d1..90cf8b3d6c77c4c32e9bc99c67a6d1d0fefb808e 100644 (file)
--- 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 a9b6caa98aff303bf7afe8db6a04d8b2aa1a0aa3..5ed781923cd409c9e4467297bbd0485db24667fc 100644 (file)
--- 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 e5570290c6cd5de435c1c0633adf18803d2a82e8..bc85a4103a9de2f298863e8b383814c072a724bd 100644 (file)
--- 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 fc1b7faedb246c42d6600f41318695b8788ec57f..8e46d78eb0a501b5732f6421963f6e4e89b6610f 100644 (file)
--- 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 0d8f38340e46ff8d8dc55aeffd46e5c3c2343edc..523dc8e78ea115195c86ca82aaba03f034074abf 100644 (file)
--- a/vscreensaver.cc
+++ b/vscreensaver.cc
@@ -22,7 +22,7 @@
 #include <math.h>
 
 #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 d093e046fb4705b14242576a149552d31b610763..4be53ca900f9c51b643bbcb83c2abb5deca60c1a 100644 (file)
--- 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 46c630597c0d24ea80314ec3c715118fb4b54d2f..e2f2669aa3b769ed59fc90426165eed205294359 100644 (file)
--- 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 ccf9d7a1fd92f9ad1ca043ab6d9274883b5c0846..fd580ac7264277045f5e4b8dc276c49aa5a82cc3 100644 (file)
--- 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 efcc59973bbb4c954436c4a168a59075930926c2..63b9b8d2a71cd19c23999bc9df7b1093ec738485 100644 (file)
--- 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 a3bace75ba7ec53df31ecc077de4762f6c88a8c7..db16293bc22b2cb91f116e8e3ee8f47c68627ac0 100644 (file)
--- 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 36a834011f0f9d12fb9b3bbdc9a3ec51f374f76d..b2edfafa3e121934b11a62b5ecc9a57518091b6e 100644 (file)
--- 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 53d24c2380238d61ec6c321572383a9e7e0d044d..cdbcb64959d0f20af535646558e6239bea8adffe 100644 (file)
--- 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 7c766787c4f0f9e3abac1698002ca5d2bb34d1d5..193a72acb94d1418ace6a744f47374bb1ca124d1 100644 (file)
--- 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 2965f4f69746017bf38abd9b73236f7a9be9f08d..ad4ce3f54b8b00c839381d41c20fcf875a52e8c9 100644 (file)
--- 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 d94be69a1fa953315906c170628bc2636ccd7637..37967bd0b3a8adbeeeee746279bc2a319a3762b7 100644 (file)
--- 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 50680eebf45048d0569c30cbe9e555c7ec98dae9..158d4915df7041bc3acbc7afd1287052ab799f5d 100644 (file)
--- a/wol.cc
+++ b/wol.cc
@@ -44,7 +44,7 @@
 #include <Iphlpapi.h>
 #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 bf3fb73a3f6e66e6a6eecbd2fe8c8dd6914da43c..20b4cab070bf44721b2b1294da264e56be661587 100644 (file)
--- 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 1dcdcfe01503cc2cb3cdbf18fc162b4fe0b178e0..007b45d62f7589dfffb8a74c6a3f48ac9e0e2e62 100644 (file)
--- 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 d7f1e0fc8c19c3513b81e678315470c56f21e367..8f7386c5409951e75f113a1c44c8a18c1c6ab54a 100644 (file)
--- a/wremoteconfig.cc
+++ b/wremoteconfig.cc
@@ -19,7 +19,7 @@
 
 #include <string>
 
-#include "log.h"
+#include "oldlog.h"
 #include "input.h"
 #include "inputman.h"
 #include "wsymbol.h"

diff --git a/wselectlist.cc b/wselectlist.cc
index 6367e6b4abdf6651bbc4e60edaf1d3079bd675c9..6fe0c4e66e254675cafd726e62718591aa2d56ce 100644 (file)
--- a/wselectlist.cc
+++ b/wselectlist.cc
@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include "colour.h"
-#include "log.h"
+#include "oldlog.h"
 
 #include "wselectlist.h"