Use DELETENULL().

12 files changed, 30 insertions, 62 deletions

diff --git a/mg_db.c b/mg_db.c
index 6dda2a0..bb9efc7 100644
--- a/mg_db.c
+++ b/mg_db.c
@@ -34,6 +34,7 @@ using namespace std;
 #include <errno.h>
 #include <mpegfile.h>
 #include <flacfile.h>
+#include <vdr/tools.h>
 
 
 static map <mgKeyTypes, map<string,string> > map_values;
@@ -64,8 +65,7 @@ mgDbServer::mgDbServer() {
 }
 
 mgDbServer::~mgDbServer() {
-	delete m_server;
-	m_server = 0;
+	DELETENULL(m_server);
 }
 
 mgSQLString::~mgSQLString() {
diff --git a/mg_image_provider.c b/mg_image_provider.c
index babd2a7..4228779 100644
--- a/mg_image_provider.c
+++ b/mg_image_provider.c
@@ -62,7 +62,7 @@ mgImage::mgImage() {
 }
 
 mgImage::~mgImage() {
-	delete bmp;bmp=0;
+	DELETENULL(bmp);
 }
 #endif
 
diff --git a/mg_menu.c b/mg_menu.c
index 9db9902..f7d6df7 100644
--- a/mg_menu.c
+++ b/mg_menu.c
@@ -60,8 +60,7 @@ mgMenu::GenerateAction(const mgActions action,mgActions on) {
 	if (result) {
 		result->SetMenu(this);
 		if (!result->Enabled(on)) {
-			delete result;
-			result=NULL;
+			DELETENULL(result);
 		}
 	}
 	return result;
@@ -144,8 +143,7 @@ mgOsd::LoadExternalCommands() {
 #endif
 
 	if (!have_cmd_file) {
-		delete external_commands;
-		external_commands = NULL;
+		DELETENULL(external_commands);
 	}
 }
 
diff --git a/muggle.c b/muggle.c
index 6be11fa..ad704a6 100644
--- a/muggle.c
+++ b/muggle.c
@@ -46,8 +46,7 @@ mgMuggle::mgMuggle (void) {
 
 void
 mgMuggle::Stop (void) {
-	delete DbServer;
-	DbServer = 0;
+	DELETENULL(DbServer);
 }
 
 const char *
diff --git a/pcmplayer.c b/pcmplayer.c
index 696ed92..aa5aa51 100644
--- a/pcmplayer.c
+++ b/pcmplayer.c
@@ -108,8 +108,7 @@ mgPCMPlayer::NewPlaylist (mgSelection * plist) {
 	Lock ();
 	StopPlay ();
 
-	delete m_current;
-	m_current = 0;
+	DELETENULL(m_current);
 	delete m_playlist;
 	m_playlist = plist;
 	PlayTrack();
@@ -394,8 +393,7 @@ mgPCMPlayer::Action (void) {
 					if (m_decoder) {
 								 // who deletes decoder?
 						m_decoder->stop ();
-						delete m_decoder;
-						m_decoder = 0;
+						DELETENULL(m_decoder);
 					}
 
 					levelgood = false;
@@ -481,16 +479,12 @@ mgPCMPlayer::Action (void) {
 
 	Lock ();
 
-	if (m_rframe) {
-		delete m_rframe;
-		m_rframe = 0;
-	}
+	DELETENULL(m_rframe);
 
 	if (m_decoder) {
 								 // who deletes decoder?
 		m_decoder->stop ();
-		delete m_decoder;
-		m_decoder = 0;
+		DELETENULL(m_decoder);
 	}
 
 	m_playing = false;
@@ -516,8 +510,7 @@ mgPCMPlayer::Empty (void) {
 	m_ringbuffer->Clear ();
 	DeviceClear ();
 
-	delete m_rframe;
-	m_rframe = 0;
+	DELETENULL(m_rframe);
 	m_pframe = 0;
 
 	Unlock ();
diff --git a/vdr_decoder.c b/vdr_decoder.c
index 4ee990c..de758c0 100644
--- a/vdr_decoder.c
+++ b/vdr_decoder.c
@@ -127,8 +127,7 @@ mgDecoders::findDecoder (mgItemGd * item) {
 	if (decoder && !decoder->valid ()) {
 		// no decoder found or decoder doesn't match
 
-		delete decoder;			 // might be carried out on NULL pointer
-		decoder = 0;
+		DELETENULL(decoder);			 // might be carried out on NULL pointer
 
 		esyslog ("ERROR: no valid decoder found for %s", filename.c_str ());
 	}
diff --git a/vdr_decoder_flac.c b/vdr_decoder_flac.c
index d39ff63..07f1186 100644
--- a/vdr_decoder_flac.c
+++ b/vdr_decoder_flac.c
@@ -96,8 +96,7 @@ bool mgFlacDecoder::initialize() {
 bool mgFlacDecoder::clean() {
 	m_playing = false;
 
-	delete m_pcm;
-	m_pcm = 0;
+	DELETENULL(m_pcm);
 
 	if( m_reservoir ) {
 		delete[] m_reservoir[0];
diff --git a/vdr_decoder_mp3.c b/vdr_decoder_mp3.c
index 5b5f06c..fb08991 100644
--- a/vdr_decoder_mp3.c
+++ b/vdr_decoder_mp3.c
@@ -23,6 +23,7 @@
 #include <cmath>
 #include <cstring>
 #include <iostream>
+#include <vdr/tools.h>
 
 #include "vdr_config.h"
 #include "vdr_decoder_mp3.h"
@@ -99,14 +100,12 @@ mgMP3Decoder::clean () {
 	m_playing = false;
 	if (m_madsynth) {
 		mad_synth_finish (m_madsynth);
-		delete m_madsynth;
-		m_madsynth = 0;
+		DELETENULL(m_madsynth);
 	}
 
 	if (m_madframe) {
 		mad_frame_finish (m_madframe);
-		delete m_madframe;
-		m_madframe = 0;
+		DELETENULL(m_madframe);
 	}
 	mad_stream_finish (&m_madstream);
 }
diff --git a/vdr_decoder_sndfile.c b/vdr_decoder_sndfile.c
index c0f7327..63d23d0 100644
--- a/vdr_decoder_sndfile.c
+++ b/vdr_decoder_sndfile.c
@@ -124,8 +124,7 @@ bool mgSndfileDecoder::clean(void) {
 	m_fgCond.Broadcast();
 	m_buffMutex.Unlock();
 
-	delete m_pcm;
-	m_pcm=0;
+	DELETENULL(m_pcm);
 
 #ifdef GUARD_DEBUG
 	if(m_framebuff) {
diff --git a/vdr_menu.c b/vdr_menu.c
index cba2521..05b71d2 100644
--- a/vdr_menu.c
+++ b/vdr_menu.c
@@ -113,8 +113,7 @@ mgSelection* mgSelOsd::getSelection(unsigned int idx) {
 
 void
 mgSelOsd::CollectionChanged(string name,bool added) {
-	delete moveselection;
-	moveselection = NULL;
+	DELETENULL(moveselection);
 	forcerefresh = true;		 // TODO brauchen wir das?
 	if (name == play_collection) {
 		playselection()->clearCache();
@@ -564,8 +563,7 @@ mgTree::UpdateIncrementalSearch( eKeys key ) {
 void mgTree::TerminateIncrementalSearch( bool remain_on_current ) {
 	if( m_incsearch ) {
 		m_filter = "";
-		delete m_incsearch;
-		m_incsearch = NULL;
+		DELETENULL(m_incsearch);
 
 		if( remain_on_current ) {
 			m_start_position = osd()->Current();
diff --git a/vdr_player.c b/vdr_player.c
index 2a5ee95..71c89ac 100644
--- a/vdr_player.c
+++ b/vdr_player.c
@@ -182,8 +182,7 @@ mgPlayerControl::~mgPlayerControl () {
 	cStatus::MsgReplaying (this, 0);
 #endif
 
-	delete m_img_provider;
-	m_img_provider = NULL;
+	DELETENULL(m_img_provider);
 	
 	Hide ();
 	Stop ();
@@ -204,10 +203,7 @@ mgPlayerControl::Stop (void) {
 #else
 	cStatus::MsgReplaying( this, 0);
 #endif
-	if (player) {
-		delete player;
-		player = 0;
-	}
+	DELETENULL(player);
 }
 
 void
@@ -559,7 +555,7 @@ mgPlayerControl::SetAreas(const char *caller,const tArea *Areas, int NumAreas) {
 		osd->SetAreas(Areas, NumAreas);
 	else { 
 		DumpAreas(caller,Areas,NumAreas,result);
-		if (osd){ delete osd; osd=0;}
+		DELETENULL(osd);
 	}
 	return result==oeOk;
 }
@@ -874,28 +870,19 @@ void
 mgPlayerControl::Hide () {
 	HideStatus();
 #if 0
-	if (cmdMenu) {
-		delete cmdMenu;
-		cmdMenu=0;
-	}
+	DELETENULL(cmdMenu);
 #endif
-	if (cmdOsd) {
-		delete cmdOsd;
-		cmdOsd=0;
-	}
+	DELETENULL(cmdOsd);
 
 #if 0
-	if (rateMenu) {
-		delete rateMenu;
-		rateMenu=0;
-	}
+	DELETENULL(rateMenu);
 #endif
 	HidePlayOsd();
 }
 
 void
 mgPlayerControl::HidePlayOsd() {
-	delete osd; osd=0;
+	DELETENULL(osd);
 }
 
 void
@@ -977,7 +964,7 @@ eOSState mgPlayerControl::ProcessKey(eKeys Key) {
 	if (cmdOsd) {
 		eOSState st=cmdOsd->ProcessKey(Key);
 		if (st==osBack) {
-			delete cmdOsd; cmdOsd=0;
+			DELETENULL(cmdOsd);
 			return osContinue;
 		} else if (st==osContinue)
 		return osContinue;
@@ -1010,8 +997,7 @@ eOSState mgPlayerControl::ProcessKey(eKeys Key) {
 		switch(eOSRet) {
 			case kRed:
 			case osBack:
-				delete cmdOsd;
-				cmdOsd = NULL;
+				DELETENULL(cmdOsd);
 				Display();
 
 				return osContinue;
@@ -1024,8 +1010,7 @@ eOSState mgPlayerControl::ProcessKey(eKeys Key) {
 		switch(eOSRet) {
 			case kRed:
 			case osBack:
-				delete rateMenu;
-				rateMenu = NULL;
+				DELETENULL(rateMenu);
 				Display();
 
 				return osContinue;
diff --git a/vdr_sound.c b/vdr_sound.c
index 88dd0f2..2b7fcf2 100644
--- a/vdr_sound.c
+++ b/vdr_sound.c
@@ -302,8 +302,7 @@ mgNormalize::mgNormalize (void) {
 		printf ("norm: accuracy %.12f\n", mad_f_todouble (maxdiff));
 		if (mad_f_todouble (maxdiff) > 1e-6) {
 			esyslog ("ERROR: accuracy check failed, normalizer disabled");
-			delete table;
-			table = 0;
+			DELETENULL(table);
 		}
 	}
 	else