1 files changed, 5 insertions, 8 deletions
diff --git a/src/3rdparty/phonon/mmf/audioplayer.cpp b/src/3rdparty/phonon/mmf/audioplayer.cpp
index 6c1fc68..1d259a8 100644
--- a/src/3rdparty/phonon/mmf/audioplayer.cpp
+++ b/src/3rdparty/phonon/mmf/audioplayer.cpp
@@ -34,14 +34,13 @@ using namespace Phonon::MMF;
 // Constructor / destructor
 //-----------------------------------------------------------------------------
 
-MMF::AudioPlayer::AudioPlayer() : m_player(0)
+MMF::AudioPlayer::AudioPlayer()
 {
     construct();
 }
 
 MMF::AudioPlayer::AudioPlayer(const AbstractPlayer& player)
         : AbstractMediaPlayer(player)
-        , m_player(0)
 {
     construct();
 }
@@ -51,7 +50,7 @@ void MMF::AudioPlayer::construct()
     TRACE_CONTEXT(AudioPlayer::AudioPlayer, EAudioApi);
     TRACE_ENTRY_0();
 
-    TRAPD(err, m_player = CPlayerType::NewL(*this, 0, EMdaPriorityPreferenceNone));
+    TRAPD(err, m_player.reset(CPlayerType::NewL(*this, 0, EMdaPriorityPreferenceNone)));
     if (KErrNone != err) {
         changeState(ErrorState);
     }
@@ -64,8 +63,6 @@ MMF::AudioPlayer::~AudioPlayer()
     TRACE_CONTEXT(AudioPlayer::~AudioPlayer, EAudioApi);
     TRACE_ENTRY_0();
 
-    delete m_player;
-
     TRACE_EXIT_0();
 }
 
@@ -216,8 +213,8 @@ void MMF::AudioPlayer::MapcPlayComplete(TInt aError)
     }
 
     /*
-        if(aError == KErrNone) {
-            if(m_nextSource.type() == MediaSource::Empty) {
+        if (aError == KErrNone) {
+            if (m_nextSource.type() == MediaSource::Empty) {
                 emit finished();
             } else {
                 setSource(m_nextSource);
@@ -237,7 +234,7 @@ void MMF::AudioPlayer::MapcPlayComplete(TInt aError)
 
 CPlayerType *MMF::AudioPlayer::player() const
 {
-    return m_player;
+    return m_player.data();
 }