summaryrefslogtreecommitdiff
path: root/pcmplayer.c
diff options
context:
space:
mode:
Diffstat (limited to 'pcmplayer.c')
-rw-r--r--pcmplayer.c17
1 files changed, 5 insertions, 12 deletions
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 ();