From 321e9a1f9998324d1f72561bd982371533397954 Mon Sep 17 00:00:00 2001
From: Bartosz Taudul <wolf.pld@gmail.com>
Date: Wed, 8 Oct 2008 18:05:56 +0200
Subject: [PATCH] Reduce streamplayer iPtr magic.

---
 src/audio/symbian/streamplayer.cpp | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/audio/symbian/streamplayer.cpp b/src/audio/symbian/streamplayer.cpp
index 5ad5242..5781357 100644
--- a/src/audio/symbian/streamplayer.cpp
+++ b/src/audio/symbian/streamplayer.cpp
@@ -56,8 +56,6 @@ CStreamPlayer::~CStreamPlayer()
 	iState |= EDied;
 	if(iState & EInited)
 		Close();
-	usleep(100000); //wait buffer to be flushed
-	ASSERT(iPtr.Length() == 0);
 	delete iStream;
 }
 
@@ -122,17 +120,14 @@ void CStreamPlayer::Stop()
 
 void CStreamPlayer::Start()
 {
-	if(iPtr.Length() == 0)
+	iState |= EStarted;
+	if(iState & EInited)
 	{
-		iState |= EStarted;
-		if(iState & EInited)
-		{
-			Request();
-		}
-		else if(iState & EStopped)
-		{
-			Open();
-		}
+		Request();
+	}
+	else if(iState & EStopped)
+	{
+		Open();
 	}
 }
 
@@ -145,8 +140,6 @@ void CStreamPlayer::Close()
 
 void CStreamPlayer::Request()
 {
-	iPtr.Set(KNullDesC8);
-
 	if(iState & EVolumeChange)
 	{
 		const TReal newVol = iVolume;
@@ -174,7 +167,6 @@ void CStreamPlayer::Request()
 	}
 }
 
-
 void CStreamPlayer::SetCapsL()
 {
 	iStream->SetDataTypeL(iType);
@@ -206,7 +198,6 @@ void CStreamPlayer::MaoscOpenComplete(int aError)
 
 void CStreamPlayer::MaoscBufferCopied(int aError, const TDesC8& /*aBuffer*/)
 {
-	iPtr.Set(KNullDesC8);
 	if(aError == KErrNone)
 	{
 		if(iState & EInited)
@@ -220,7 +211,6 @@ void CStreamPlayer::MaoscBufferCopied(int aError, const TDesC8& /*aBuffer*/)
 
 void CStreamPlayer::MaoscPlayComplete(int aError)
 {
-	iPtr.Set(KNullDesC8);
 	iState &= ~EStarted;
 	if(!(iState & EDied))
 		iObs.Complete(MStreamObs::EClose, aError);
-- 
2.11.4.GIT