# HG changeset patch
# User John Kern <johnk@symbian.org>
# Date 1261094137 28800
# Node ID ebe5f1b0149aa1d543cba73abfe0714ca1052b8e
# Parent  a85dea9790d3554e6af4b10c04da18e67e71065b# Parent  8374da225e8847ecf3ba615943f2926f3dc74606
merged in the s^2 fix

diff -r a85dea9790d3 -r ebe5f1b0149a baseport/syborg/soundsc/shared_sound.h
--- 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);
diff -r a85dea9790d3 -r ebe5f1b0149a baseport/syborg/soundsc/shared_txsound.cpp
--- 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
 	{