summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2006-04-14 11:51:13 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2006-04-14 11:51:13 +0200
commitb7181930c80a9040876e7eff7e05f0e006fb2369 (patch)
tree9acf19af88d9893c8f5a5481ef9bdaf4df67ce71
parent6635a1d69eec06c994c4b08ba2d77300616b009b (diff)
downloadvdr-b7181930c80a9040876e7eff7e05f0e006fb2369.tar.gz
vdr-b7181930c80a9040876e7eff7e05f0e006fb2369.tar.bz2
Reintroduced the log message "deleting plugin: ..." when shutting down VDR
-rw-r--r--HISTORY2
-rw-r--r--plugin.c10
-rw-r--r--plugin.h4
-rw-r--r--vdr.c4
4 files changed, 13 insertions, 7 deletions
diff --git a/HISTORY b/HISTORY
index b4831de3..568e1f5e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4518,3 +4518,5 @@ Video Disk Recorder Revision History
- Using geteuid() to check whether VDR is running as user 'root' (suggested by
Tobias Grimm).
- Added a missing "Key$" in skincurses.c (reported by Darren Salt).
+- Reintroduced the log message "deleting plugin: ..." when shutting down VDR (upon
+ request by Ville Skyttä, as in the initial patch from Christoph Haubrich).
diff --git a/plugin.c b/plugin.c
index 69d558cf..fc1a25ac 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: plugin.c 1.18 2006/04/09 14:16:17 kls Exp $
+ * $Id: plugin.c 1.19 2006/04/14 11:45:43 kls Exp $
*/
#include "plugin.h"
@@ -424,9 +424,13 @@ void cPluginManager::StopPlugins(void)
}
}
-void cPluginManager::Shutdown(void)
+void cPluginManager::Shutdown(bool Log)
{
cDll *dll;
- while ((dll = dlls.Last()) != NULL)
+ while ((dll = dlls.Last()) != NULL) {
+ cPlugin *p = dll->Plugin();
+ if (p && Log)
+ isyslog("deleting plugin: %s", p->Name());
dlls.Del(dll);
+ }
}
diff --git a/plugin.h b/plugin.h
index 2d9f9833..285d0dc2 100644
--- a/plugin.h
+++ b/plugin.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: plugin.h 1.10 2005/08/27 16:13:17 kls Exp $
+ * $Id: plugin.h 1.11 2006/04/14 11:42:48 kls Exp $
*/
#ifndef __PLUGIN_H
@@ -95,7 +95,7 @@ public:
static cPlugin *CallFirstService(const char *Id, void *Data = NULL);
static bool CallAllServices(const char *Id, void *Data = NULL);
void StopPlugins(void);
- void Shutdown(void);
+ void Shutdown(bool Log = false);
};
#endif //__PLUGIN_H
diff --git a/vdr.c b/vdr.c
index 510be02c..ec82bedb 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/vdr
*
- * $Id: vdr.c 1.255 2006/04/14 11:01:18 kls Exp $
+ * $Id: vdr.c 1.256 2006/04/14 11:45:05 kls Exp $
*/
#include <getopt.h>
@@ -1179,7 +1179,7 @@ Exit:
Setup.Save();
}
cDevice::Shutdown();
- PluginManager.Shutdown();
+ PluginManager.Shutdown(true);
cSchedules::Cleanup(true);
ReportEpgBugFixStats();
if (WatchdogTimeout > 0)