merged in the s^2 fix
authorJohn Kern <johnk@symbian.org>
Thu, 17 Dec 2009 15:55:37 -0800
changeset 30 ebe5f1b0149a
parent 29 a85dea9790d3 (current diff)
parent 21 8374da225e88 (diff)
child 31 a9d6d2890663
merged in the s^2 fix
--- a/baseport/syborg/soundsc/shared_sound.h	Tue Dec 15 14:32:19 2009 +0000
+++ b/baseport/syborg/soundsc/shared_sound.h	Thu Dec 17 15:55:37 2009 -0800
@@ -51,6 +51,11 @@
 	void Callback(TUint aTransferID, TInt aTransferResult, TInt aBytesTransferred);
 
 	void SetCaps();
+        // There was a change in the signature for DfcQ() which
+        // is a pure virtual method in the parent.
+        //  for Symbian^2
+        TDfcQue* DfcQ();
+        //  for Symbian^3
 	TDfcQue* DfcQ(TInt aUnit);
 	
 	TInt CalculateBufferTime(TInt aNumBytes);
--- a/baseport/syborg/soundsc/shared_txsound.cpp	Tue Dec 15 14:32:19 2009 +0000
+++ b/baseport/syborg/soundsc/shared_txsound.cpp	Thu Dec 17 15:55:37 2009 -0800
@@ -249,10 +249,14 @@
 	}
 
 TDfcQue*DDriverSyborgSoundScPdd::DfcQ(TInt /* aUnit*/ )
-	{
-	return iPhysicalDevice->iDfcQ;
-	}
+        {
+        return this->DfcQ();
+        }
 
+TDfcQue*DDriverSyborgSoundScPdd::DfcQ()
+        {
+        return iPhysicalDevice->iDfcQ;
+        }
 
 TInt DDriverSyborgSoundScPdd::MaxTransferLen() const
 	{