# HG changeset patch
# User srilekhas <srilekhas@symbian.org>
# Date 1282568066 -3600
# Node ID 88cd424627a2357aa485f75581486b684ca01b1d
# Parent  37b610eb7fe3af6d77273a111b1c449107fc6b6c# Parent  ac0dcfe5059daeb7dbfa6287b92b9a8c512e663a
Merge RCL_3 fixes with latest delivery.

diff -r ac0dcfe5059d -r 88cd424627a2 audiostubs/devsoundextensions_stubs/audioinputcistub/Group/bld.inf
--- a/audiostubs/devsoundextensions_stubs/audioinputcistub/Group/bld.inf	Fri May 28 16:45:30 2010 +0100
+++ b/audiostubs/devsoundextensions_stubs/audioinputcistub/Group/bld.inf	Mon Aug 23 13:54:26 2010 +0100
@@ -21,6 +21,6 @@
 PRJ_EXPORTS
 
 PRJ_MMPFILES
-AudioInputCIStub.mmp
+//AudioInputCIStub.mmp
 
 //  End of File  
\ No newline at end of file
diff -r ac0dcfe5059d -r 88cd424627a2 audiostubs/devsoundextensions_stubs/audiooutputcistub/Group/bld.inf
--- a/audiostubs/devsoundextensions_stubs/audiooutputcistub/Group/bld.inf	Fri May 28 16:45:30 2010 +0100
+++ b/audiostubs/devsoundextensions_stubs/audiooutputcistub/Group/bld.inf	Mon Aug 23 13:54:26 2010 +0100
@@ -22,6 +22,6 @@
 PRJ_EXPORTS
 
 PRJ_MMPFILES
-AudioOutputCIStub.mmp
+//AudioOutputCIStub.mmp
 
 //  End of File  
diff -r ac0dcfe5059d -r 88cd424627a2 audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/group/MmfDevSoundAdaptation.mmp
--- a/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/group/MmfDevSoundAdaptation.mmp	Fri May 28 16:45:30 2010 +0100
+++ b/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/group/MmfDevSoundAdaptation.mmp	Mon Aug 23 13:54:26 2010 +0100
@@ -12,7 +12,7 @@
 * Contributors:
 *
 * Description: Audio Stubs -  Project specification file for MmfDevSoundAdaptation_Stub
-*  Version     : %version: bh1mmcf#32 %
+*  Version     : %version: bh1mmcf#33 %
 *
 */
 
@@ -27,12 +27,13 @@
 VENDORID        VID_DEFAULT
 
 SOURCEPATH      ../src
-SOURCE          MmfDevSoundAdaptation.cpp
-SOURCE          MmfDevSoundAdaptationBody.cpp
-SOURCE          MmfHwDeviceStub.cpp
-SOURCE          ToneGenerator.cpp
-SOURCE          DevSoundUtility.cpp
-SOURCE          TonePlayCompleteTimer.cpp
+#if defined(WINS)
+ SOURCE          MmfDevSoundAdaptation.cpp
+ SOURCE          MmfDevSoundAdaptationBody.cpp
+ SOURCE          MmfHwDeviceStub.cpp
+ SOURCE          ToneGenerator.cpp
+ SOURCE          DevSoundUtility.cpp
+ SOURCE          TonePlayCompleteTimer.cpp
 
 USERINCLUDE     ../inc
 USERINCLUDE     ../../inc
@@ -66,6 +67,7 @@
 LIBRARY         SpeechEncoderConfigCI.lib
 
 deffile         MmfDevSoundAdaptation.def
+#endif
 nostrictdef
 
 // End of File
diff -r ac0dcfe5059d -r 88cd424627a2 audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/group/bld.inf
--- a/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/group/bld.inf	Fri May 28 16:45:30 2010 +0100
+++ b/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/group/bld.inf	Mon Aug 23 13:54:26 2010 +0100
@@ -25,4 +25,6 @@
 ../data/sample1.wav	/Epoc32/winscw/c/sample1.wav
 
 PRJ_MMPFILES
+#ifdef WINS
 ./MmfDevSoundAdaptation.mmp
+#endif
diff -r ac0dcfe5059d -r 88cd424627a2 audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/Group/bld.inf
--- a/audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/Group/bld.inf	Fri May 28 16:45:30 2010 +0100
+++ b/audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/Group/bld.inf	Mon Aug 23 13:54:26 2010 +0100
@@ -22,6 +22,6 @@
 PRJ_EXPORTS
 
 PRJ_MMPFILES
-RestrictedAudioOutputCIStub.mmp
+//RestrictedAudioOutputCIStub.mmp
 
 //  End of File  
\ No newline at end of file