# HG changeset patch # User John Kern # Date 1260299269 28800 # Node ID 8374da225e8847ecf3ba615943f2926f3dc74606 # Parent 3bf560f85513641cd0c376fd85cfdfbe782fd09b fix for S^2 builds diff -r 3bf560f85513 -r 8374da225e88 baseport/syborg/soundsc/shared_sound.h --- a/baseport/syborg/soundsc/shared_sound.h Thu Nov 12 14:39:23 2009 -0800 +++ b/baseport/syborg/soundsc/shared_sound.h Tue Dec 08 11:07:49 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 3bf560f85513 -r 8374da225e88 baseport/syborg/soundsc/shared_txsound.cpp --- a/baseport/syborg/soundsc/shared_txsound.cpp Thu Nov 12 14:39:23 2009 -0800 +++ b/baseport/syborg/soundsc/shared_txsound.cpp Tue Dec 08 11:07:49 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 {