[vdr-plugin-osdteletext] 02/04: Imported Upstream version 0.9.5

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository vdr-plugin-osdteletext.

commit eb1a3c296b9a37790f42a01d788ed5edc7489f7c
Author: etobi <git at e-tobi.net>
Date:   Fri Feb 13 18:46:55 2015 +0100

    Imported Upstream version 0.9.5
---
 HISTORY       |  5 +++++
 Makefile      |  2 +-
 display.c     |  2 +-
 displaybase.c |  3 +--
 osdteletext.c | 18 +++++++++++-------
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/HISTORY b/HISTORY
index 9f61a0a..d9c8487 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,11 @@
 VDR Plugin 'osdteletext' Revision History
 -----------------------------------------
 
+2015-02-13: version 0.9.5
+- Avoid pkg-config warnings
+- Improved cleanup when closing OSDTeletext
+  (Thx to Ville Skyttä and Rolf Ahrenberg)
+
 2013-03-10: version 0.9.4
 - Allow to override the CXXFLAGS
 - Fixed CZ font and added CZ-SK subset - patch provided Marek Hajduk
diff --git a/Makefile b/Makefile
index acbc86b..40d2d5f 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The directory environment:
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
 LIBDIR = $(call PKGCFG,libdir)
 LOCDIR = $(call PKGCFG,locdir)
 PLGCFG = $(call PKGCFG,plgcfg)
diff --git a/display.c b/display.c
index 2669cd9..a3b3a58 100644
--- a/display.c
+++ b/display.c
@@ -183,7 +183,7 @@ cDisplay4BPPHalf::cDisplay4BPPHalf(int x0, int y0, int width, int height, bool u
 }
 
 void cDisplay4BPPHalf::InitOSD() {
-    if (osd) delete osd;
+    delete osd;
     osd = cOsdProvider::NewOsd(OsdX0, OsdY0);
     if (!osd) return;
    
diff --git a/displaybase.c b/displaybase.c
index 03c15b7..a65b5d9 100644
--- a/displaybase.c
+++ b/displaybase.c
@@ -29,8 +29,7 @@ cDisplay::cDisplay(int width, int height)
 }
 
 cDisplay::~cDisplay() {
-    if (osd) delete osd;
-    osd=NULL;   
+    DELETENULL(osd);
 }
 
 void cDisplay::InitScaler() {
diff --git a/osdteletext.c b/osdteletext.c
index 208d049..2cd772a 100644
--- a/osdteletext.c
+++ b/osdteletext.c
@@ -27,7 +27,7 @@ using namespace std;
 #error "VDR-1.7.39 API version or greater is required!"
 #endif
 
-static const char *VERSION        = "0.9.4";
+static const char *VERSION        = "0.9.5";
 static const char *DESCRIPTION    = trNOOP("Displays teletext on the OSD");
 static const char *MAINMENUENTRY  = trNOOP("Teletext");
 
@@ -49,6 +49,7 @@ public:
   virtual const char *CommandLineHelp(void);
   virtual bool ProcessArgs(int argc, char *argv[]);
   virtual bool Start(void);
+  virtual void Stop(void);
   virtual void Housekeeping(void);
   virtual const char *MainMenuEntry(void);
   virtual cOsdObject *MainMenuAction(void);
@@ -113,12 +114,6 @@ cPluginTeletextosd::cPluginTeletextosd(void)
 cPluginTeletextosd::~cPluginTeletextosd()
 {
    // Clean up after yourself!
-   if (txtStatus)
-      delete txtStatus;
-   if(storage) {
-     storage->cleanUp();
-     delete storage;
-   }
 }
 
 const char *cPluginTeletextosd::CommandLineHelp(void)
@@ -197,6 +192,15 @@ bool cPluginTeletextosd::Start(void)
    return true;
 }
 
+void cPluginTeletextosd::Stop(void)
+{
+   DELETENULL(txtStatus);
+   if (storage) {
+      storage->cleanUp();
+      DELETENULL(storage);
+   }
+}
+
 void cPluginTeletextosd::initTexts() {
    if (cTeletextSetupPage::actionKeyNames)
       return;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-osdteletext.git