# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1265061682 -7200 # Node ID f935d51494d103facecbe4afe2b0da45daa43718 # Parent ffb8e2ddd8dc1ec026ba1483dd996270b864659d Revision: 201005 Kit: 201005 diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/addeddevsoundcontrolcistub/Group/AddedDevSoundControlCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/addeddevsoundcontrolcistub/Group/AddedDevSoundControlCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/addeddevsoundcontrolcistub/Group/AddedDevSoundControlCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -26,7 +26,7 @@ VENDORID VID_DEFAULT SOURCEPATH ../src -SOURCE AddedDevSoundControlCIStub.cpp +SOURCE addeddevsoundcontrolcistub.cpp USERINCLUDE ../inc diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/addeddevsoundcontrolcistub/Group/bld.inf --- a/audiostubs/devsoundextensions_stubs/addeddevsoundcontrolcistub/Group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/addeddevsoundcontrolcistub/Group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -23,6 +23,6 @@ PRJ_MMPFILES -AddedDevSoundControlCIStub.mmp +addeddevsoundcontrolcistub.mmp // End of File diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/addeddevsoundcontrolcistub/inc/AddedDevSoundControlCIStub.h --- a/audiostubs/devsoundextensions_stubs/addeddevsoundcontrolcistub/inc/AddedDevSoundControlCIStub.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/addeddevsoundcontrolcistub/inc/AddedDevSoundControlCIStub.h Tue Feb 02 00:01:22 2010 +0200 @@ -21,7 +21,7 @@ // INCLUDES #include -#include +#include // CONSTANTS diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/addeddevsoundcontrolcistub/src/AddedDevSoundControlCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/addeddevsoundcontrolcistub/src/AddedDevSoundControlCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/addeddevsoundcontrolcistub/src/AddedDevSoundControlCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES #include -#include "AddedDevSoundControlCIStub.h" +#include "addeddevsoundcontrolcistub.h" // EXTERNAL DATA STRUCTURES diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/aacdecoderconfigcistub/group/AacDecoderConfigCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/aacdecoderconfigcistub/group/AacDecoderConfigCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/aacdecoderconfigcistub/group/AacDecoderConfigCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: Audio Stubs - -* Version : %version: bh1mmcf#14 % +* Version : %version: bh1mmcf#13 % * */ @@ -27,7 +27,7 @@ VENDORID VID_DEFAULT SOURCEPATH ../src -SOURCE AacDecoderConfigCIStub.cpp +SOURCE aacdecoderconfigcistub.cpp USERINCLUDE ../inc USERINCLUDE ../../inc diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/aacdecoderconfigcistub/group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/aacdecoderconfigcistub/group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/aacdecoderconfigcistub/group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -22,6 +22,6 @@ PRJ_MMPFILES -AacDecoderConfigCIStub.mmp +aacdecoderconfigcistub.mmp // End of File diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/aacdecoderconfigcistub/src/AacDecoderConfigCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/aacdecoderconfigcistub/src/AacDecoderConfigCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/aacdecoderconfigcistub/src/AacDecoderConfigCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include "AacDecoderConfigCI.h" +#include "aacdecoderconfigci.h" #include // EXTERNAL DATA STRUCTURES diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/eaacplusdecoderintfccistub/Group/EAacPlusDecoderIntfcCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/eaacplusdecoderintfccistub/Group/EAacPlusDecoderIntfcCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/eaacplusdecoderintfccistub/Group/EAacPlusDecoderIntfcCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -13,7 +13,7 @@ * * Description: Audio Stubs - Project specification for Enahanced AAC+ decoder configuration * : Custom Interface stub implementation. -* Version : %version: bh1mmcf#7.1.7 % +* Version : %version: bh1mmcf#7.1.6 % * */ @@ -27,7 +27,7 @@ VENDORID VID_DEFAULT SOURCEPATH ../src -SOURCE EAacPlusDecoderIntfcCIStub.cpp +SOURCE eaacplusdecoderintfccistub.cpp USERINCLUDE ../inc USERINCLUDE ../../inc diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/eaacplusdecoderintfccistub/Group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/eaacplusdecoderintfccistub/Group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/eaacplusdecoderintfccistub/Group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -24,6 +24,6 @@ PRJ_MMPFILES -EAacPlusDecoderIntfcCIStub.mmp +eaacplusdecoderintfccistub.mmp // End of File diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/eaacplusdecoderintfccistub/src/EAacPlusDecoderIntfcCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/eaacplusdecoderintfccistub/src/EAacPlusDecoderIntfcCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/eaacplusdecoderintfccistub/src/EAacPlusDecoderIntfcCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES #include -#include "EAacPlusDecoderIntfcCI.h" +#include "eaacplusdecoderintfcci.h" // EXTERNAL DATA STRUCTURES diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/errorconcealmentintfccistub/group/ErrorConcealmentIntfcCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/errorconcealmentintfccistub/group/ErrorConcealmentIntfcCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/errorconcealmentintfccistub/group/ErrorConcealmentIntfcCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: Audio Stubs - -* Version : %version: bh1mmcf#14 % +* Version : %version: bh1mmcf#13 % * */ @@ -27,7 +27,7 @@ VENDORID VID_DEFAULT SOURCEPATH ../src -SOURCE ErrorConcealmentIntfcCIStub.cpp +SOURCE errorconcealmentintfccistub.cpp USERINCLUDE ../inc USERINCLUDE ../../inc diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/errorconcealmentintfccistub/group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/errorconcealmentintfccistub/group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/errorconcealmentintfccistub/group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -22,6 +22,6 @@ PRJ_EXPORTS PRJ_MMPFILES -ErrorConcealmentIntfcCIStub.mmp +errorconcealmentintfccistub.mmp // End of File diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/errorconcealmentintfccistub/src/ErrorConcealmentIntfcCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/errorconcealmentintfccistub/src/ErrorConcealmentIntfcCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/errorconcealmentintfccistub/src/ErrorConcealmentIntfcCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include "ErrorConcealmentIntfcCI.h" +#include "errorconcealmentintfcci.h" #include // EXTERNAL DATA STRUCTURES diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/g711decoderintfccistub/group/G711DecoderIntfcCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g711decoderintfccistub/group/G711DecoderIntfcCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g711decoderintfccistub/group/G711DecoderIntfcCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: Audio Stubs - -* Version : %version: bh1mmcf#14 % +* Version : %version: bh1mmcf#13 % * */ @@ -27,7 +27,7 @@ VENDORID VID_DEFAULT SOURCEPATH ../src -SOURCE G711DecoderIntfcCIStub.cpp +SOURCE g711decoderintfccistub.cpp USERINCLUDE ../inc USERINCLUDE ../../inc diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/g711decoderintfccistub/group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g711decoderintfccistub/group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g711decoderintfccistub/group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -22,6 +22,6 @@ PRJ_EXPORTS PRJ_MMPFILES -G711DecoderIntfcCIStub.mmp +g711decoderintfccistub.mmp // End of File diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/g711decoderintfccistub/src/G711DecoderIntfcCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g711decoderintfccistub/src/G711DecoderIntfcCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g711decoderintfccistub/src/G711DecoderIntfcCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include "G711DecoderIntfcCI.h" +#include "g711decoderintfcci.h" #include // EXTERNAL DATA STRUCTURES diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/g711encoderintfccistub/group/G711EncoderIntfcCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g711encoderintfccistub/group/G711EncoderIntfcCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g711encoderintfccistub/group/G711EncoderIntfcCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: Audio Stubs - -* Version : %version: bh1mmcf#14 % +* Version : %version: bh1mmcf#13 % * */ @@ -27,7 +27,7 @@ VENDORID VID_DEFAULT SOURCEPATH ../src -SOURCE G711EncoderIntfcCIStub.cpp +SOURCE g711encoderintfccistub.cpp USERINCLUDE ../inc USERINCLUDE ../../inc diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/g711encoderintfccistub/group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g711encoderintfccistub/group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g711encoderintfccistub/group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -22,6 +22,6 @@ PRJ_EXPORTS PRJ_MMPFILES -G711EncoderIntfcCIStub.mmp +g711encoderintfccistub.mmp // End of File diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/g711encoderintfccistub/src/G711EncoderIntfcCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g711encoderintfccistub/src/G711EncoderIntfcCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g711encoderintfccistub/src/G711EncoderIntfcCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include "G711EncoderIntfcCI.h" +#include "g711encoderintfcci.h" #include // EXTERNAL DATA STRUCTURES diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/g729decoderintfccistub/group/G729DecoderIntfcCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g729decoderintfccistub/group/G729DecoderIntfcCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g729decoderintfccistub/group/G729DecoderIntfcCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: Audio Stubs - -* Version : %version: bh1mmcf#10.1.7 % +* Version : %version: bh1mmcf#10.1.6 % * */ @@ -27,7 +27,7 @@ VENDORID VID_DEFAULT SOURCEPATH ../src -SOURCE G729DecoderIntfcCIStub.cpp +SOURCE g729decoderintfccistub.cpp USERINCLUDE ../inc USERINCLUDE ../../inc diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/g729decoderintfccistub/group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g729decoderintfccistub/group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g729decoderintfccistub/group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -22,6 +22,6 @@ PRJ_EXPORTS PRJ_MMPFILES -G729DecoderIntfcCIStub.mmp +g729decoderintfccistub.mmp // End of File diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/g729decoderintfccistub/src/G729DecoderIntfcCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g729decoderintfccistub/src/G729DecoderIntfcCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g729decoderintfccistub/src/G729DecoderIntfcCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include "G729DecoderIntfcCI.h" +#include "g729decoderintfcci.h" #include // EXTERNAL DATA STRUCTURES diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/g729encoderintfccistub/group/G729EncoderIntfcCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g729encoderintfccistub/group/G729EncoderIntfcCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g729encoderintfccistub/group/G729EncoderIntfcCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: Audio Stubs - -* Version : %version: bh1mmcf#14 % +* Version : %version: bh1mmcf#13 % * */ @@ -28,7 +28,7 @@ SOURCEPATH ../src -SOURCE G729EncoderIntfcCIStub.cpp +SOURCE g729encoderintfccistub.cpp USERINCLUDE ../inc USERINCLUDE ../../inc diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/g729encoderintfccistub/group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g729encoderintfccistub/group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g729encoderintfccistub/group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -22,6 +22,6 @@ PRJ_EXPORTS PRJ_MMPFILES -G729EncoderIntfcCIStub.mmp +g729encoderintfccistub.mmp // End of File diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/g729encoderintfccistub/src/G729EncoderIntfcCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g729encoderintfccistub/src/G729EncoderIntfcCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g729encoderintfccistub/src/G729EncoderIntfcCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include "G729EncoderIntfcCI.h" +#include "g729encoderintfcci.h" #include // EXTERNAL DATA STRUCTURES diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -19,7 +19,7 @@ #include "../aacdecoderconfigcistub/group/bld.inf" //#include "../audiovibracontrolcistub/group/bld.inf" //Audio vibra Control API is deprecated -#include "../eaacplusdecoderintfccistub/Group/bld.inf" +#include "../eaacplusdecoderintfccistub/group/bld.inf" #include "../errorconcealmentintfccistub/group/bld.inf" #include "../g711decoderintfccistub/group/bld.inf" #include "../g711encoderintfccistub/group/bld.inf" @@ -27,9 +27,9 @@ #include "../g729encoderintfccistub/group/bld.inf" #include "../ilbcdecoderintfccistub/group/bld.inf" #include "../ilbcencoderintfccistub/group/bld.inf" -#include "../sbcencoderintfccistub/Group/bld.inf" +#include "../sbcencoderintfccistub/group/bld.inf" #include "../speechencoderconfigcistub/group/bld.inf" -#include "../ra8decoderintfccistub/Group/bld.inf" +#include "../ra8decoderintfccistub/group/bld.inf" #include "../wmadecodercintfccistub/group/bld.inf" // End of File diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/ilbcdecoderintfccistub/group/IlbcDecoderIntfcCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/ilbcdecoderintfccistub/group/IlbcDecoderIntfcCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/ilbcdecoderintfccistub/group/IlbcDecoderIntfcCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: Audio Stubs - -* Version : %version: bh1mmcf#14 % +* Version : %version: bh1mmcf#13 % * */ @@ -27,7 +27,7 @@ VENDORID VID_DEFAULT SOURCEPATH ../src -SOURCE IlbcDecoderIntfcCIStub.cpp +SOURCE ilbcdecoderintfccistub.cpp USERINCLUDE ../inc USERINCLUDE ../../inc diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/ilbcdecoderintfccistub/group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/ilbcdecoderintfccistub/group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/ilbcdecoderintfccistub/group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -22,6 +22,6 @@ PRJ_EXPORTS PRJ_MMPFILES -IlbcDecoderIntfcCIStub.mmp +ilbcdecoderintfccistub.mmp // End of File diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/ilbcdecoderintfccistub/src/IlbcDecoderIntfcCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/ilbcdecoderintfccistub/src/IlbcDecoderIntfcCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/ilbcdecoderintfccistub/src/IlbcDecoderIntfcCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include "IlbcDecoderIntfcCI.h" +#include "ilbcdecoderintfcci.h" #include // EXTERNAL DATA STRUCTURES diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/ilbcencoderintfccistub/group/IlbcEncoderIntfcCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/ilbcencoderintfccistub/group/IlbcEncoderIntfcCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/ilbcencoderintfccistub/group/IlbcEncoderIntfcCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: Audio Stubs - -* Version : %version: bh1mmcf#10.1.7 % +* Version : %version: bh1mmcf#10.1.6 % * */ @@ -27,7 +27,7 @@ VENDORID VID_DEFAULT SOURCEPATH ../src -SOURCE IlbcEncoderIntfcCIStub.cpp +SOURCE ilbcencoderintfccistub.cpp USERINCLUDE ../inc USERINCLUDE ../../inc diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/ilbcencoderintfccistub/group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/ilbcencoderintfccistub/group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/ilbcencoderintfccistub/group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -22,6 +22,6 @@ PRJ_EXPORTS PRJ_MMPFILES -IlbcEncoderIntfcCIStub.mmp +ilbcencoderintfccistub.mmp // End of File diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/ilbcencoderintfccistub/src/IlbcEncoderIntfcCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/ilbcencoderintfccistub/src/IlbcEncoderIntfcCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/ilbcencoderintfccistub/src/IlbcEncoderIntfcCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include "IlbcEncoderIntfcCI.h" +#include "ilbcencoderintfcci.h" #include // EXTERNAL DATA STRUCTURES diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/ra8decoderintfccistub/Group/Ra8DecoderIntfcCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/ra8decoderintfccistub/Group/Ra8DecoderIntfcCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/ra8decoderintfccistub/Group/Ra8DecoderIntfcCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -13,7 +13,7 @@ * * Description: Audio Stubs - Project specification for RA8 decoder configuration custom * : interface stub implementation. -* Version : %version: bh1mmcf#8 % +* Version : %version: bh1mmcf#7 % * */ @@ -28,7 +28,7 @@ VENDORID VID_DEFAULT SOURCEPATH ../src -SOURCE Ra8DecoderIntfcCIStub.cpp +SOURCE ra8decoderintfccistub.cpp USERINCLUDE ../inc USERINCLUDE ../../inc diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/ra8decoderintfccistub/Group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/ra8decoderintfccistub/Group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/ra8decoderintfccistub/Group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -22,6 +22,6 @@ PRJ_EXPORTS PRJ_MMPFILES -Ra8DecoderIntfcCIStub.mmp +ra8decoderintfccistub.mmp // End of File diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/ra8decoderintfccistub/src/Ra8DecoderIntfcCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/ra8decoderintfccistub/src/Ra8DecoderIntfcCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/ra8decoderintfccistub/src/Ra8DecoderIntfcCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES #include -#include "Ra8CustomInterfaceCI.h" +#include "ra8custominterfaceci.h" // EXTERNAL DATA STRUCTURES diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/sbcencoderintfccistub/Group/SbcEncoderIntfcCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/sbcencoderintfccistub/Group/SbcEncoderIntfcCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/sbcencoderintfccistub/Group/SbcEncoderIntfcCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -13,7 +13,7 @@ * * Description: Audio Stubs - Project specification for BT SBC Encoder configuration custom * : interface stub implementation. -* Version : %version: bh1mmcf#10 % +* Version : %version: bh1mmcf#9 % * */ @@ -28,7 +28,7 @@ VENDORID VID_DEFAULT SOURCEPATH ../src -SOURCE SbcEncoderIntfcCIStub.cpp +SOURCE sbcencoderintfccistub.cpp USERINCLUDE ../inc USERINCLUDE ../../inc diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/sbcencoderintfccistub/Group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/sbcencoderintfccistub/Group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/sbcencoderintfccistub/Group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -22,6 +22,6 @@ PRJ_EXPORTS PRJ_MMPFILES -SbcEncoderIntfcCIStub.mmp +sbcencoderintfccistub.mmp // End of File diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/sbcencoderintfccistub/src/SbcEncoderIntfcCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/sbcencoderintfccistub/src/SbcEncoderIntfcCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/sbcencoderintfccistub/src/SbcEncoderIntfcCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES #include -#include "SbcEncoderIntfcCI.h" +#include "sbcencoderintfcci.h" // EXTERNAL DATA STRUCTURES diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/speechencoderconfigcistub/group/SpeechEncoderConfigCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/speechencoderconfigcistub/group/SpeechEncoderConfigCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/speechencoderconfigcistub/group/SpeechEncoderConfigCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: Audio Stubs - -* Version : %version: bh1mmcf#14 % +* Version : %version: bh1mmcf#13 % * */ @@ -27,7 +27,7 @@ VENDORID VID_DEFAULT SOURCEPATH ../src -SOURCE SpeechEncoderConfigCIStub.cpp +SOURCE speechencoderconfigcistub.cpp USERINCLUDE ../inc USERINCLUDE ../../inc diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/speechencoderconfigcistub/group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/speechencoderconfigcistub/group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/speechencoderconfigcistub/group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -22,6 +22,6 @@ PRJ_EXPORTS PRJ_MMPFILES -SpeechEncoderConfigCIStub.mmp +speechencoderconfigcistub.mmp // End of File diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/speechencoderconfigcistub/src/SpeechEncoderConfigCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/speechencoderconfigcistub/src/SpeechEncoderConfigCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/speechencoderconfigcistub/src/SpeechEncoderConfigCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include "SpeechEncoderConfigCI.h" +#include "speechencoderconfigci.h" #include // EXTERNAL DATA STRUCTURES diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/wmadecodercintfccistub/group/WmaDecoderintfcStub.mmp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/wmadecodercintfccistub/group/WmaDecoderintfcStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/wmadecodercintfccistub/group/WmaDecoderintfcStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: Audio Stubs - -* Version : %version: bh1mmcf#3.1.7 % +* Version : %version: bh1mmcf#3.1.6 % * */ @@ -27,7 +27,7 @@ VENDORID VID_DEFAULT SOURCEPATH ../src -SOURCE WmaDecoderIntfcCIStub.cpp +SOURCE wmadecoderintfccistub.cpp USERINCLUDE ../inc USERINCLUDE ../../inc diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/wmadecodercintfccistub/group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/wmadecodercintfccistub/group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/wmadecodercintfccistub/group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -23,6 +23,6 @@ PRJ_MMPFILES -WmaDecoderintfcStub.mmp +wmadecoderintfcstub.mmp // End of File diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiocodeccistubs/wmadecodercintfccistub/src/WmaDecoderIntfcCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audiocodeccistubs/wmadecodercintfccistub/src/WmaDecoderIntfcCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiocodeccistubs/wmadecodercintfccistub/src/WmaDecoderIntfcCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include "WmaDecoderIntfcCI.h" +#include "wmadecoderintfcci.h" #include // EXTERNAL DATA STRUCTURES diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/audioequalizercistub/Group/AudioEqualizerCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/audioequalizercistub/Group/AudioEqualizerCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/audioequalizercistub/Group/AudioEqualizerCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -29,7 +29,7 @@ SOURCEPATH ../src -SOURCE AudioEqualizerCIStub.cpp +SOURCE audioequalizercistub.cpp USERINCLUDE ../inc ../src diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/audioequalizercistub/Group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/audioequalizercistub/Group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/audioequalizercistub/Group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -22,6 +22,6 @@ PRJ_EXPORTS PRJ_MMPFILES -AudioEqualizerCIStub.mmp +audioequalizercistub.mmp // End of File \ No newline at end of file diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/audioequalizercistub/inc/AudioEqualizerCI.h --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/audioequalizercistub/inc/AudioEqualizerCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/audioequalizercistub/inc/AudioEqualizerCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -17,8 +17,8 @@ */ -#include -#include +#include +#include class CMMFDevSound; diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/audioequalizercistub/src/AudioEqualizerCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/audioequalizercistub/src/AudioEqualizerCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/audioequalizercistub/src/AudioEqualizerCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -19,7 +19,7 @@ #ifdef _DEBUG #include #endif -#include "AudioEqualizerCI.h" +#include "audioequalizerci.h" EXPORT_C CAudioEqualizerCI* CAudioEqualizerCI::NewL( diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/bassboostcistub/Group/BassBoostCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/bassboostcistub/Group/BassBoostCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/bassboostcistub/Group/BassBoostCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -28,7 +28,7 @@ SOURCEPATH ../src -SOURCE BassBoostCIStub.cpp +SOURCE bassboostcistub.cpp USERINCLUDE ../inc ../src diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/bassboostcistub/Group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/bassboostcistub/Group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/bassboostcistub/Group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -22,6 +22,6 @@ PRJ_EXPORTS PRJ_MMPFILES -BassBoostCIStub.mmp +bassboostcistub.mmp // End of File \ No newline at end of file diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/bassboostcistub/inc/BassBoostCI.h --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/bassboostcistub/inc/BassBoostCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/bassboostcistub/inc/BassBoostCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -22,8 +22,8 @@ */ -#include -#include +#include +#include class CMMFDevSound; diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/bassboostcistub/src/BassBoostCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/bassboostcistub/src/BassBoostCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/bassboostcistub/src/BassBoostCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -20,7 +20,7 @@ #include // Needed for RDebug Prints #endif -#include "BassBoostCI.h" +#include "bassboostci.h" #include // ----------------------------------------------------------------------------- diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/distanceattenuationcistub/Group/DistanceAttenuationCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/distanceattenuationcistub/Group/DistanceAttenuationCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/distanceattenuationcistub/Group/DistanceAttenuationCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -29,7 +29,7 @@ SOURCEPATH ../src -SOURCE DistanceAttenuationCIStub.cpp +SOURCE distanceattenuationcistub.cpp USERINCLUDE ../inc ../src diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/distanceattenuationcistub/Group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/distanceattenuationcistub/Group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/distanceattenuationcistub/Group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -22,6 +22,6 @@ PRJ_EXPORTS PRJ_MMPFILES -DistanceAttenuationCIStub.mmp +distanceattenuationcistub.mmp // End of File \ No newline at end of file diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/distanceattenuationcistub/inc/DistanceAttenuationCI.h --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/distanceattenuationcistub/inc/DistanceAttenuationCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/distanceattenuationcistub/inc/DistanceAttenuationCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -17,8 +17,8 @@ */ -#include -#include +#include +#include class CMMFDevSound; diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/distanceattenuationcistub/src/DistanceAttenuationCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/distanceattenuationcistub/src/DistanceAttenuationCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/distanceattenuationcistub/src/DistanceAttenuationCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -19,7 +19,7 @@ #ifdef _DEBUG #include #endif -#include "DistanceAttenuationCI.h" +#include "distanceattenuationci.h" EXPORT_C CDistanceAttenuationCI* CDistanceAttenuationCI::NewL( diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/environmentalreverbcistub/Group/EnvironmentalReverbCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/environmentalreverbcistub/Group/EnvironmentalReverbCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/environmentalreverbcistub/Group/EnvironmentalReverbCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -29,7 +29,7 @@ SOURCEPATH ../src -SOURCE EnvironmentalReverbCIStub.cpp +SOURCE environmentalreverbcistub.cpp USERINCLUDE ../inc ../src diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/environmentalreverbcistub/Group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/environmentalreverbcistub/Group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/environmentalreverbcistub/Group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -23,6 +23,6 @@ PRJ_MMPFILES -EnvironmentalReverbCIStub.mmp +environmentalreverbcistub.mmp // End of File \ No newline at end of file diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/environmentalreverbcistub/inc/EnvironmentalReverbCI.h --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/environmentalreverbcistub/inc/EnvironmentalReverbCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/environmentalreverbcistub/inc/EnvironmentalReverbCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -17,8 +17,8 @@ */ -#include -#include +#include +#include class CMMFDevSound; diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/environmentalreverbcistub/src/EnvironmentalReverbCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/environmentalreverbcistub/src/EnvironmentalReverbCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/environmentalreverbcistub/src/EnvironmentalReverbCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -19,7 +19,7 @@ #ifdef _DEBUG #include #endif -#include "EnvironmentalReverbCI.h" +#include "environmentalreverbci.h" EXPORT_C CEnvironmentalReverbCI* CEnvironmentalReverbCI::NewL( diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -17,16 +17,16 @@ -#include "../audioequalizercistub/Group/bld.inf" -#include "../bassboostcistub/Group/bld.inf" -#include "../distanceattenuationcistub/Group/bld.inf" -#include "../environmentalreverbcistub/Group/bld.inf" -#include "../listenerdopplercistub/Group/bld.inf" -#include "../listenerlocationcistub/Group/bld.inf" -#include "../listenerorientationcistub/Group/bld.inf" -#include "../loudnesscistub/Group/bld.inf" -#include "../roomlevelcistub/Group/bld.inf" -#include "../sourcedopplercistub/Group/bld.inf" -#include "../sourcelocationcistub/Group/bld.inf" -#include "../sourceorientationcistub/Group/bld.inf" -#include "../stereowideningcistub/Group/bld.inf" \ No newline at end of file +#include "../audioequalizercistub/group/bld.inf" +#include "../bassboostcistub/group/bld.inf" +#include "../distanceattenuationcistub/group/bld.inf" +#include "../environmentalreverbcistub/group/bld.inf" +#include "../listenerdopplercistub/group/bld.inf" +#include "../listenerlocationcistub/group/bld.inf" +#include "../listenerorientationcistub/group/bld.inf" +#include "../loudnesscistub/group/bld.inf" +#include "../roomlevelcistub/group/bld.inf" +#include "../sourcedopplercistub/group/bld.inf" +#include "../sourcelocationcistub/group/bld.inf" +#include "../sourceorientationcistub/group/bld.inf" +#include "../stereowideningcistub/group/bld.inf" \ No newline at end of file diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerdopplercistub/Group/ListenerDopplerCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerdopplercistub/Group/ListenerDopplerCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerdopplercistub/Group/ListenerDopplerCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -29,7 +29,7 @@ SOURCEPATH ../src -SOURCE ListenerDopplerCIStub.cpp +SOURCE listenerdopplercistub.cpp USERINCLUDE ../inc ../src diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerdopplercistub/Group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerdopplercistub/Group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerdopplercistub/Group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -23,6 +23,6 @@ PRJ_MMPFILES -ListenerDopplerCIStub.mmp +listenerdopplercistub.mmp // End of File \ No newline at end of file diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerdopplercistub/inc/ListenerDopplerCI.h --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerdopplercistub/inc/ListenerDopplerCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerdopplercistub/inc/ListenerDopplerCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -22,8 +22,8 @@ */ -#include -#include +#include +#include class CMMFDevSound; diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerdopplercistub/src/ListenerDopplerCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerdopplercistub/src/ListenerDopplerCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerdopplercistub/src/ListenerDopplerCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -20,7 +20,7 @@ #include // Needed for RDebug Prints #endif -#include "ListenerDopplerCI.h" +#include "listenerdopplerci.h" #include // ----------------------------------------------------------------------------- diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerlocationcistub/Group/ListenerLocationCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerlocationcistub/Group/ListenerLocationCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerlocationcistub/Group/ListenerLocationCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -29,7 +29,7 @@ SOURCEPATH ../src -SOURCE ListenerLocationCIStub.cpp +SOURCE listenerlocationcistub.cpp USERINCLUDE ../inc ../src diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerlocationcistub/Group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerlocationcistub/Group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerlocationcistub/Group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -23,6 +23,6 @@ PRJ_MMPFILES -ListenerLocationCIStub.mmp +listenerlocationcistub.mmp // End of File \ No newline at end of file diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerlocationcistub/inc/ListenerLocationCI.h --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerlocationcistub/inc/ListenerLocationCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerlocationcistub/inc/ListenerLocationCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -22,8 +22,8 @@ */ -#include -#include +#include +#include class CMMFDevSound; diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerlocationcistub/src/ListenerLocationCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerlocationcistub/src/ListenerLocationCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerlocationcistub/src/ListenerLocationCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -20,7 +20,7 @@ #include // Needed for RDebug Prints #endif -#include "ListenerLocationCI.h" +#include "listenerlocationci.h" #include // ----------------------------------------------------------------------------- diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerorientationcistub/Group/ListenerOrientationCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerorientationcistub/Group/ListenerOrientationCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerorientationcistub/Group/ListenerOrientationCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -29,7 +29,7 @@ SOURCEPATH ../src -SOURCE ListenerOrientationCIStub.cpp +SOURCE listenerorientationcistub.cpp USERINCLUDE ../inc ../src diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerorientationcistub/Group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerorientationcistub/Group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerorientationcistub/Group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -23,6 +23,6 @@ PRJ_MMPFILES -ListenerOrientationCIStub.mmp +listenerorientationcistub.mmp // End of File \ No newline at end of file diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerorientationcistub/inc/ListenerOrientationCI.h --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerorientationcistub/inc/ListenerOrientationCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerorientationcistub/inc/ListenerOrientationCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -22,8 +22,8 @@ */ -#include -#include +#include +#include class CMMFDevSound; diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerorientationcistub/src/ListenerOrientationCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerorientationcistub/src/ListenerOrientationCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerorientationcistub/src/ListenerOrientationCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -20,7 +20,7 @@ #include // Needed for RDebug Prints #endif -#include "ListenerOrientationCI.h" +#include "listenerorientationci.h" #include // ----------------------------------------------------------------------------- diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/loudnesscistub/Group/LoudnessCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/loudnesscistub/Group/LoudnessCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/loudnesscistub/Group/LoudnessCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -28,7 +28,7 @@ SOURCEPATH ../src -SOURCE LoudnessCIStub.cpp +SOURCE loudnesscistub.cpp USERINCLUDE ../inc ../src diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/loudnesscistub/Group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/loudnesscistub/Group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/loudnesscistub/Group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -22,6 +22,6 @@ PRJ_EXPORTS PRJ_MMPFILES -LoudnessCIStub.mmp +loudnesscistub.mmp // End of File \ No newline at end of file diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/loudnesscistub/inc/LoudnessCI.h --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/loudnesscistub/inc/LoudnessCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/loudnesscistub/inc/LoudnessCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -17,8 +17,8 @@ */ -#include -#include +#include +#include class CMMFDevSound; diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/loudnesscistub/src/LoudnessCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/loudnesscistub/src/LoudnessCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/loudnesscistub/src/LoudnessCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -19,7 +19,7 @@ #ifdef _DEBUG #include #endif -#include "LoudnessCI.h" +#include "loudnessci.h" EXPORT_C CLoudnessCI* CLoudnessCI::NewL( diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/roomlevelcistub/Group/RoomLevelCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/roomlevelcistub/Group/RoomLevelCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/roomlevelcistub/Group/RoomLevelCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -29,7 +29,7 @@ SOURCEPATH ../src -SOURCE RoomLevelCIStub.cpp +SOURCE roomlevelcistub.cpp USERINCLUDE ../inc ../src diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/roomlevelcistub/Group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/roomlevelcistub/Group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/roomlevelcistub/Group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -23,6 +23,6 @@ PRJ_MMPFILES -RoomLevelCIStub.mmp +roomlevelcistub.mmp // End of File \ No newline at end of file diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/roomlevelcistub/inc/RoomLevelCI.h --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/roomlevelcistub/inc/RoomLevelCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/roomlevelcistub/inc/RoomLevelCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -17,8 +17,8 @@ */ -#include -#include +#include +#include class CMMFDevSound; diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/roomlevelcistub/src/RoomLevelCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/roomlevelcistub/src/RoomLevelCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/roomlevelcistub/src/RoomLevelCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -19,7 +19,7 @@ #ifdef _DEBUG #include #endif -#include "RoomLevelCI.h" +#include "roomlevelci.h" EXPORT_C CRoomLevelCI* CRoomLevelCI::NewL( diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcedopplercistub/Group/SourceDopplerCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcedopplercistub/Group/SourceDopplerCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcedopplercistub/Group/SourceDopplerCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -30,7 +30,7 @@ SOURCEPATH ../src -SOURCE SourceDopplerCIStub.cpp +SOURCE sourcedopplercistub.cpp USERINCLUDE ../inc ../src diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcedopplercistub/Group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcedopplercistub/Group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcedopplercistub/Group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -22,6 +22,6 @@ PRJ_EXPORTS PRJ_MMPFILES -SourceDopplerCIStub.mmp +sourcedopplercistub.mmp // End of File \ No newline at end of file diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcedopplercistub/inc/SourceDopplerCI.h --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcedopplercistub/inc/SourceDopplerCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcedopplercistub/inc/SourceDopplerCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -22,8 +22,8 @@ */ -#include -#include +#include +#include class CMMFDevSound; diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcedopplercistub/src/SourceDopplerCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcedopplercistub/src/SourceDopplerCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcedopplercistub/src/SourceDopplerCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -20,7 +20,7 @@ #include // Needed for RDebug Prints #endif -#include "SourceDopplerCI.h" +#include "sourcedopplerci.h" #include // ----------------------------------------------------------------------------- diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcelocationcistub/Group/SourceLocationCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcelocationcistub/Group/SourceLocationCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcelocationcistub/Group/SourceLocationCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -29,7 +29,7 @@ SOURCEPATH ../src -SOURCE SourceLocationCIStub.cpp +SOURCE sourcelocationcistub.cpp USERINCLUDE ../inc ../src diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcelocationcistub/Group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcelocationcistub/Group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcelocationcistub/Group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -23,6 +23,6 @@ PRJ_MMPFILES -SourceLocationCIStub.mmp +sourcelocationcistub.mmp // End of File \ No newline at end of file diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcelocationcistub/inc/SourceLocationCI.h --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcelocationcistub/inc/SourceLocationCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcelocationcistub/inc/SourceLocationCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -22,8 +22,8 @@ */ -#include -#include +#include +#include class CMMFDevSound; diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcelocationcistub/src/SourceLocationCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcelocationcistub/src/SourceLocationCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcelocationcistub/src/SourceLocationCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -20,7 +20,7 @@ #include // Needed for RDebug Prints #endif -#include "SourceLocationCI.h" +#include "sourcelocationci.h" #include // ----------------------------------------------------------------------------- diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourceorientationcistub/Group/SourceOrientationCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourceorientationcistub/Group/SourceOrientationCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourceorientationcistub/Group/SourceOrientationCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -29,7 +29,7 @@ SOURCEPATH ../src -SOURCE SourceOrientationCIStub.cpp +SOURCE sourceorientationcistub.cpp USERINCLUDE ../inc ../src diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourceorientationcistub/Group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourceorientationcistub/Group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourceorientationcistub/Group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -23,6 +23,6 @@ PRJ_MMPFILES -SourceOrientationCIStub.mmp +sourceorientationcistub.mmp // End of File \ No newline at end of file diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourceorientationcistub/inc/SourceOrientationCI.h --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourceorientationcistub/inc/SourceOrientationCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourceorientationcistub/inc/SourceOrientationCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -22,8 +22,8 @@ */ -#include -#include +#include +#include class CMMFDevSound; diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourceorientationcistub/src/SourceOrientationCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourceorientationcistub/src/SourceOrientationCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourceorientationcistub/src/SourceOrientationCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -20,7 +20,7 @@ #include // Needed for RDebug Prints #endif -#include "SourceOrientationCI.h" +#include "sourceorientationci.h" #include // ----------------------------------------------------------------------------- diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/stereowideningcistub/Group/StereoWideningCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/stereowideningcistub/Group/StereoWideningCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/stereowideningcistub/Group/StereoWideningCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -29,7 +29,7 @@ SOURCEPATH ../src -SOURCE StereoWideningCIStub.cpp +SOURCE stereowideningcistub.cpp USERINCLUDE ../inc ../src diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/stereowideningcistub/Group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/stereowideningcistub/Group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/stereowideningcistub/Group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -23,6 +23,6 @@ PRJ_MMPFILES -StereoWideningCIStub.mmp +stereowideningcistub.mmp // End of File \ No newline at end of file diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/stereowideningcistub/inc/StereoWideningCI.h --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/stereowideningcistub/inc/StereoWideningCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/stereowideningcistub/inc/StereoWideningCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -17,8 +17,8 @@ */ -#include -#include +#include +#include class CMMFDevSound; diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioeffectscistubs/stereowideningcistub/src/StereoWideningCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audioeffectscistubs/stereowideningcistub/src/StereoWideningCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioeffectscistubs/stereowideningcistub/src/StereoWideningCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -19,7 +19,7 @@ #ifdef _DEBUG #include #endif -#include "StereoWideningCI.h" +#include "stereowideningci.h" EXPORT_C CStereoWideningCI* CStereoWideningCI::NewL( diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/CustomInterfaceProxyFactory_stub/group/CustomInterfaceProxyFactory_stub.mmp --- a/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/CustomInterfaceProxyFactory_stub/group/CustomInterfaceProxyFactory_stub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/CustomInterfaceProxyFactory_stub/group/CustomInterfaceProxyFactory_stub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -27,10 +27,10 @@ SOURCEPATH ../src -SOURCE CustomInterfaceProxyFactory.cpp +SOURCE custominterfaceproxyfactory.cpp USERINCLUDE ../inc -USERINCLUDE ../../Inc +USERINCLUDE ../../inc USERINCLUDE ../src OS_LAYER_SYSTEMINCLUDE diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/CustomInterfaceProxyFactory_stub/inc/CustomInterfaceProxyFactory.h --- a/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/CustomInterfaceProxyFactory_stub/inc/CustomInterfaceProxyFactory.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/CustomInterfaceProxyFactory_stub/inc/CustomInterfaceProxyFactory.h Tue Feb 02 00:01:22 2010 +0200 @@ -19,7 +19,7 @@ #define __CUSTOMINTERFACEPROXYFACTORY_H #include -#include +#include // FORWARD DECLARATIONS class CCustomInterfaceUtility; diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/CustomInterfaceProxyFactory_stub/src/CustomInterfaceProxyFactory.cpp --- a/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/CustomInterfaceProxyFactory_stub/src/CustomInterfaceProxyFactory.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/CustomInterfaceProxyFactory_stub/src/CustomInterfaceProxyFactory.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -16,35 +16,35 @@ */ -#include "AudioEqualizerProxy.h" -#include "BassBoostProxy.h" -#include "DistanceAttenuationProxy.h" -#include "EnvironmentalReverbProxy.h" -#include "ListenerDopplerProxy.h" -#include "ListenerLocationProxy.h" -#include "ListenerOrientationProxy.h" -#include "LoudnessProxy.h" -#include "RoomLevelProxy.h" -#include "SourceDopplerProxy.h" -#include "SourceLocationProxy.h" -#include "SourceOrientationProxy.h" -#include "StereoWideningProxy.h" -#include "AddedDevSoundControlCI.h" -#include "AddedDevSoundControlProxy.h" -#include "RestrictedAudioOutputProxy.h" -#include "AudioInputProxy.h" -#include "AudioOutputProxy.h" -#include "AudioInputMessageTypes.h" -#include "AudioOutputMessageTypes.h" -#include "G711DecoderIntfcProxy.h" -#include "G729DecoderIntfcProxy.h" -#include "IlbcDecoderIntfcProxy.h" -#include "G711EncoderIntfcProxy.h" -#include "G729EncoderIntfcProxy.h" -#include "IlbcEncoderIntfcProxy.h" -#include "SpeechEncoderConfigProxy.h" -#include "ErrorConcealmentIntfcProxy.h" -#include "CustomInterfaceProxyFactory.h" +#include "audioequalizerproxy.h" +#include "bassboostproxy.h" +#include "distanceattenuationproxy.h" +#include "environmentalreverbproxy.h" +#include "listenerdopplerproxy.h" +#include "listenerlocationproxy.h" +#include "listenerorientationproxy.h" +#include "loudnessproxy.h" +#include "roomlevelproxy.h" +#include "sourcedopplerproxy.h" +#include "sourcelocationproxy.h" +#include "sourceorientationproxy.h" +#include "stereowideningproxy.h" +#include "addeddevsoundcontrolci.h" +#include "addeddevsoundcontrolproxy.h" +#include "restrictedaudiooutputproxy.h" +#include "audioinputproxy.h" +#include "audiooutputproxy.h" +#include "audioinputmessagetypes.h" +#include "audiooutputmessagetypes.h" +#include "g711decoderintfcproxy.h" +#include "g729decoderintfcproxy.h" +#include "ilbcdecoderintfcproxy.h" +#include "g711encoderintfcproxy.h" +#include "g729encoderintfcproxy.h" +#include "ilbcencoderintfcproxy.h" +#include "speechencoderconfigproxy.h" +#include "errorconcealmentintfcproxy.h" +#include "custominterfaceproxyfactory.h" EXPORT_C TAny* CCustomInterfaceProxyFactory::CreateProxy(TUid aInterfaceUid, diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/Inc/AddedDevSoundControlProxy.h --- a/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/Inc/AddedDevSoundControlProxy.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/Inc/AddedDevSoundControlProxy.h Tue Feb 02 00:01:22 2010 +0200 @@ -21,7 +21,7 @@ // INCLUDES #include -#include "AddedDevSoundControlCI.h" +#include "addeddevsoundcontrolci.h" // CONSTANTS diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/MessageHandlerFactory_stub/group/MessageHandlerFactory_stub.mmp --- a/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/MessageHandlerFactory_stub/group/MessageHandlerFactory_stub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/MessageHandlerFactory_stub/group/MessageHandlerFactory_stub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: Audio Stubs - Project definition file for project MessageHandlerFactory_stub -* Version : %version: bh1mmcf#16 % +* Version : %version: bh1mmcf#15 % * */ @@ -27,10 +27,10 @@ VENDORID VID_DEFAULT SOURCEPATH ../src -SOURCE MessageHandlerFactory.cpp +SOURCE messagehandlerfactory.cpp USERINCLUDE ../inc -USERINCLUDE ../../Inc +USERINCLUDE ../../inc USERINCLUDE ../src OS_LAYER_SYSTEMINCLUDE diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/MessageHandlerFactory_stub/src/MessageHandlerFactory.cpp --- a/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/MessageHandlerFactory_stub/src/MessageHandlerFactory.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/MessageHandlerFactory_stub/src/MessageHandlerFactory.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -16,50 +16,50 @@ * */ -#include "MessageHandlerFactory.h" -#include "AudioInputMessageHandler.h" -#include "AudioOutputMessageHandler.h" -#include "AudioInputMessageTypes.h" -#include "AudioOutputMessageTypes.h" +#include "messagehandlerfactory.h" +#include "audioinputmessagehandler.h" +#include "audiooutputmessagehandler.h" +#include "audioinputmessagetypes.h" +#include "audiooutputmessagetypes.h" -#include "MessageHandlerFactory.h" -#include "AudioEqualizerMessageHandler.h" -#include "BassBoostMessageHandler.h" -#include "DistanceAttenuationMessageHandler.h" -#include "EnvironmentalReverbMessageHandler.h" -#include "ListenerDopplerMessageHandler.h" -#include "ListenerLocationMessageHandler.h" -#include "ListenerOrientationMessageHandler.h" -#include "LoudnessMessageHandler.h" -#include "RoomLevelMessageHandler.h" -#include "SourceDopplerMessageHandler.h" -#include "SourceLocationMessageHandler.h" -#include "SourceOrientationMessageHandler.h" -#include "StereoWideningMessageHandler.h" -#include "AddedDevSoundControlMsgHdlr.h" -#include "RestrictedAudioOutputMessageHandler.h" -#include "AudioOutputMessageHandler.h" +#include "messagehandlerfactory.h" +#include "audioequalizermessagehandler.h" +#include "bassboostmessagehandler.h" +#include "distanceattenuationmessagehandler.h" +#include "environmentalreverbmessagehandler.h" +#include "listenerdopplermessagehandler.h" +#include "listenerlocationmessagehandler.h" +#include "listenerorientationmessagehandler.h" +#include "loudnessmessagehandler.h" +#include "roomlevelmessagehandler.h" +#include "sourcedopplermessagehandler.h" +#include "sourcelocationmessagehandler.h" +#include "sourceorientationmessagehandler.h" +#include "stereowideningmessagehandler.h" +#include "addeddevsoundcontrolmsghdlr.h" +#include "restrictedaudiooutputmessagehandler.h" +#include "audiooutputmessagehandler.h" -#include "SpeechEncoderConfigMsgHdlr.h" -#include "ErrorConcealmentIntfcMsgHdlr.h" -#include "G711DecoderIntfcMsgHdlr.h" -#include "G729DecoderIntfcMsgHdlr.h" -#include "IlbcDecoderIntfcMsgHdlr.h" -#include "G711EncoderIntfcMsgHdlr.h" -#include "G729EncoderIntfcMsgHdlr.h" -#include "IlbcEncoderIntfcMsgHdlr.h" -#include "AacDecoderConfigMsgHdlr.h" +#include "speechencoderconfigmsghdlr.h" +#include "errorconcealmentintfcmsghdlr.h" +#include "g711decoderintfcmsghdlr.h" +#include "g729decoderintfcmsghdlr.h" +#include "ilbcdecoderintfcmsghdlr.h" +#include "g711encoderintfcmsghdlr.h" +#include "g729encoderintfcmsghdlr.h" +#include "ilbcencoderintfcmsghdlr.h" +#include "aacdecoderconfigmsghdlr.h" //#include "AudioVibraControlMsgHdlr.h" // Audio Vibra Control API is deprecated -#include "SpeechEncoderConfig.h" -#include "AacDecoderConfig.h" -#include "ErrorConcealmentIntfc.h" -#include "G711DecoderIntfc.h" -#include "G729DecoderIntfc.h" -#include "IlbcDecoderIntfc.h" -#include "G711EncoderIntfc.h" -#include "G729EncoderIntfc.h" -#include "IlbcEncoderIntfc.h" +#include "speechencoderconfig.h" +#include "aacdecoderconfig.h" +#include "errorconcealmentintfc.h" +#include "g711decoderintfc.h" +#include "g729decoderintfc.h" +#include "ilbcdecoderintfc.h" +#include "g711encoderintfc.h" +#include "g729encoderintfc.h" +#include "ilbcencoderintfc.h" //#include "AudioVibraControl.h" // Audio Vibra Control API is deprecated EXPORT_C CMMFObject* CMessageHandlerFactory::Create(TUid aInterfaceUid, diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -22,7 +22,7 @@ PRJ_EXPORTS PRJ_MMPFILES -../CustomInterfaceProxyFactory_stub/group/CustomInterfaceProxyFactory_stub.mmp -../MessageHandlerFactory_stub/group/MessageHandlerFactory_stub.mmp +../custominterfaceproxyfactory_stub/group/custominterfaceproxyfactory_stub.mmp +../messagehandlerfactory_stub/group/messagehandlerfactory_stub.mmp // End of File diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioinputcistub/Group/AudioInputCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audioinputcistub/Group/AudioInputCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioinputcistub/Group/AudioInputCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: Audio Stubs - Project definition file for project AudioInputCIStub -* Version : %version: bh1mmcf#17 % +* Version : %version: bh1mmcf#16 % * */ @@ -26,7 +26,7 @@ VENDORID VID_DEFAULT SOURCEPATH ../src -SOURCE AudioInputCIStub.cpp +SOURCE audioinputcistub.cpp USERINCLUDE ../inc USERINCLUDE ../../inc diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioinputcistub/Group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audioinputcistub/Group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioinputcistub/Group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -21,6 +21,6 @@ PRJ_EXPORTS PRJ_MMPFILES -AudioInputCIStub.mmp +audioinputcistub.mmp // End of File \ No newline at end of file diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audioinputcistub/src/AudioInputCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audioinputcistub/src/AudioInputCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audioinputcistub/src/AudioInputCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -16,7 +16,7 @@ */ #include -#include "AudioInputCI.h" +#include "audioinputci.h" EXPORT_C CAudioInputCI* CAudioInputCI::NewL(CMMFDevSound& aDevSound) diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiooutputcistub/Group/AudioOutputCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/audiooutputcistub/Group/AudioOutputCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiooutputcistub/Group/AudioOutputCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: Audio Stubs - Project definition file for project AudioOutputCIStub -* Version : %version: bh1mmcf#16 % +* Version : %version: bh1mmcf#15 % * */ @@ -27,7 +27,7 @@ VENDORID VID_DEFAULT SOURCEPATH ../src -SOURCE AudioOutputCIStub.cpp +SOURCE audiooutputcistub.cpp USERINCLUDE ../inc USERINCLUDE ../../inc diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiooutputcistub/Group/bld.inf --- a/audiostubs/devsoundextensions_stubs/audiooutputcistub/Group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiooutputcistub/Group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -22,6 +22,6 @@ PRJ_EXPORTS PRJ_MMPFILES -AudioOutputCIStub.mmp +audiooutputcistub.mmp // End of File diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/audiooutputcistub/src/AudioOutputCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/audiooutputcistub/src/AudioOutputCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/audiooutputcistub/src/AudioOutputCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -17,10 +17,10 @@ #include //#include "AudioOutputCustomInterfaceHandler.h" -#include "AudioOutputCI.h" +#include "audiooutputci.h" //#include "AudioOutputMessageTypes.h" -#include -#include +#include +#include EXPORT_C CAudioOutputCI* CAudioOutputCI::NewL(CMMFDevSound& aDevSound) { diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/cistubplugin/group/cistubplugin.mmp --- a/audiostubs/devsoundextensions_stubs/cistubplugin/group/cistubplugin.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/cistubplugin/group/cistubplugin.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -43,7 +43,7 @@ SOURCEPATH ../src SOURCE cistubplugin.cpp -SOURCE cistubpluginMain.cpp +SOURCE cistubpluginmain.cpp SOURCEPATH ../data START RESOURCE cistubplugin.rss diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/cistubplugin/inc/cistubplugin.h --- a/audiostubs/devsoundextensions_stubs/cistubplugin/inc/cistubplugin.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/cistubplugin/inc/cistubplugin.h Tue Feb 02 00:01:22 2010 +0200 @@ -26,11 +26,11 @@ #include // TBuf #include #include -#include "RestrictedAudioOutputCIStub.h" -#include "AudioOutputCI.h" -#include "AudioInputCI.h" -#include "AudioOutputMessageTypes.h" -#include "AudioInputMessageTypes.h" +#include "restrictedaudiooutputcistub.h" +#include "audiooutputci.h" +#include "audioinputci.h" +#include "audiooutputmessagetypes.h" +#include "audioinputmessagetypes.h" class MyMCustomInterface { diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/group/bld.inf --- a/audiostubs/devsoundextensions_stubs/group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -31,14 +31,14 @@ #include "../mmfaudioserverfactorystub/group/bld.inf" // Added DevSoundControl CI Stub -#include "../addeddevsoundcontrolcistub/Group/bld.inf" +#include "../addeddevsoundcontrolcistub/group/bld.inf" // Audio Enhancement Factory Stubs #include "../audioenhancementfactorystubs/group/bld.inf" // Audio Routing CI Stub -#include "../audioinputcistub/Group/bld.inf" -#include "../audiooutputcistub/Group/bld.inf" +#include "../audioinputcistub/group/bld.inf" +#include "../audiooutputcistub/group/bld.inf" // Audio Effect CI Stub #include "../audioeffectscistubs/group/bld.inf" @@ -50,7 +50,7 @@ //#include "../audiovisualizationstub/Group/bld.inf" // Restricted Audio Output CI Stub -#include "../restrictedaudiooutputcistub/Group/bld.inf" +#include "../restrictedaudiooutputcistub/group/bld.inf" //CI stub plugin #include "../cistubplugin/group/bld.inf" diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/inc/AacDecoderConfigCI.h --- a/audiostubs/devsoundextensions_stubs/inc/AacDecoderConfigCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/inc/AacDecoderConfigCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -21,7 +21,7 @@ // INCLUDES #include -#include +#include // CONSTANTS diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/inc/AudioInputCI.h --- a/audiostubs/devsoundextensions_stubs/inc/AudioInputCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/inc/AudioInputCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -15,7 +15,7 @@ * */ -#include "AudioInput.h" +#include "audioinput.h" class CMMFDevSound; diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/inc/AudioOutputCI.h --- a/audiostubs/devsoundextensions_stubs/inc/AudioOutputCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/inc/AudioOutputCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -19,7 +19,7 @@ #define _AUDIOOUTPUTCI_H__ #include -#include "AudioOutput.h" +#include "audiooutput.h" class CMMFDevSound; class CAudioOutputCustomInterfaceHandler; diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/inc/EAacPlusDecoderIntfcCI.h --- a/audiostubs/devsoundextensions_stubs/inc/EAacPlusDecoderIntfcCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/inc/EAacPlusDecoderIntfcCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -21,7 +21,7 @@ // INCLUDES #include -#include +#include // CONSTANTS diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/inc/ErrorConcealmentIntfcCI.h --- a/audiostubs/devsoundextensions_stubs/inc/ErrorConcealmentIntfcCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/inc/ErrorConcealmentIntfcCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -21,7 +21,7 @@ // INCLUDES #include -#include +#include // CONSTANTS diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/inc/G711DecoderIntfcCI.h --- a/audiostubs/devsoundextensions_stubs/inc/G711DecoderIntfcCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/inc/G711DecoderIntfcCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -21,7 +21,7 @@ // INCLUDES #include -#include +#include // CONSTANTS diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/inc/G711EncoderIntfcCI.h --- a/audiostubs/devsoundextensions_stubs/inc/G711EncoderIntfcCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/inc/G711EncoderIntfcCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -21,7 +21,7 @@ // INCLUDES #include -#include +#include // CONSTANTS diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/inc/G729DecoderIntfcCI.h --- a/audiostubs/devsoundextensions_stubs/inc/G729DecoderIntfcCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/inc/G729DecoderIntfcCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -21,7 +21,7 @@ // INCLUDES #include -#include +#include // CONSTANTS diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/inc/G729EncoderIntfcCI.h --- a/audiostubs/devsoundextensions_stubs/inc/G729EncoderIntfcCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/inc/G729EncoderIntfcCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -21,7 +21,7 @@ // INCLUDES #include -#include +#include // CONSTANTS diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/inc/IlbcDecoderIntfcCI.h --- a/audiostubs/devsoundextensions_stubs/inc/IlbcDecoderIntfcCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/inc/IlbcDecoderIntfcCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -21,7 +21,7 @@ // INCLUDES #include -#include +#include // CONSTANTS diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/inc/IlbcEncoderIntfcCI.h --- a/audiostubs/devsoundextensions_stubs/inc/IlbcEncoderIntfcCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/inc/IlbcEncoderIntfcCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -21,7 +21,7 @@ // INCLUDES #include -#include +#include // CONSTANTS diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/inc/Ra8CustomInterfaceCI.h --- a/audiostubs/devsoundextensions_stubs/inc/Ra8CustomInterfaceCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/inc/Ra8CustomInterfaceCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -21,7 +21,7 @@ // INCLUDES #include -#include +#include // CONSTANTS diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/inc/RestrictedAudioOutputCIStub.h --- a/audiostubs/devsoundextensions_stubs/inc/RestrictedAudioOutputCIStub.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/inc/RestrictedAudioOutputCIStub.h Tue Feb 02 00:01:22 2010 +0200 @@ -24,8 +24,8 @@ #ifndef RESTRICTEDAUDIOOUTPUTCI_H #define RESTRICTEDAUDIOOUTPUTCI_H -#include -#include +#include +#include # class CMMFDevSound; diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/inc/SbcEncoderIntfcCI.h --- a/audiostubs/devsoundextensions_stubs/inc/SbcEncoderIntfcCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/inc/SbcEncoderIntfcCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -21,7 +21,7 @@ // INCLUDES #include -#include +#include // CONSTANTS diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/inc/SpeechEncoderConfigCI.h --- a/audiostubs/devsoundextensions_stubs/inc/SpeechEncoderConfigCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/inc/SpeechEncoderConfigCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -21,7 +21,7 @@ // INCLUDES #include -#include +#include // CONSTANTS diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/inc/WmaDecoderIntfcCI.h --- a/audiostubs/devsoundextensions_stubs/inc/WmaDecoderIntfcCI.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/inc/WmaDecoderIntfcCI.h Tue Feb 02 00:01:22 2010 +0200 @@ -21,7 +21,7 @@ // INCLUDES #include -#include +#include // CONSTANTS diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/mmfaudioserverfactorystub/group/mmfaudioserverfactorystub.mmp --- a/audiostubs/devsoundextensions_stubs/mmfaudioserverfactorystub/group/mmfaudioserverfactorystub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/mmfaudioserverfactorystub/group/mmfaudioserverfactorystub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -49,7 +49,7 @@ SOURCEPATH ../data -START RESOURCE 10207ABC.rss +START RESOURCE 10207abc.rss TARGET mmfaudioserverfactorystub.rsc END diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/mmfaudioserverfactorystub/inc/telephonyaudioroutingmanagerstub.h --- a/audiostubs/devsoundextensions_stubs/mmfaudioserverfactorystub/inc/telephonyaudioroutingmanagerstub.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/mmfaudioserverfactorystub/inc/telephonyaudioroutingmanagerstub.h Tue Feb 02 00:01:22 2010 +0200 @@ -18,7 +18,7 @@ #ifndef TELEPHONYAUDIOROUTINGMANAGERSTUB_H #define TELEPHONYAUDIOROUTINGMANAGERSTUB_H -#include +#include // FORWARD DECLARATIONS class CTelephonyAudioRoutingManager; diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/mmfaudioserverfactorystub/src/telephonyaudioroutingmanagerstub.cpp --- a/audiostubs/devsoundextensions_stubs/mmfaudioserverfactorystub/src/telephonyaudioroutingmanagerstub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/mmfaudioserverfactorystub/src/telephonyaudioroutingmanagerstub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -16,7 +16,7 @@ * */ -#include +#include #include "devsoundextensionstubs_common.h" #include "telephonyaudioroutingmanagerstub.h" diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/group/MmfDevSoundAdaptation.mmp --- a/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/group/MmfDevSoundAdaptation.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/group/MmfDevSoundAdaptation.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: Audio Stubs - Project specification file for MmfDevSoundAdaptation_Stub -* Version : %version: bh1mmcf#32 % +* Version : %version: bh1mmcf#31 % * */ @@ -27,17 +27,17 @@ VENDORID VID_DEFAULT SOURCEPATH ../src -SOURCE MmfDevSoundAdaptation.cpp -SOURCE MmfDevSoundAdaptationBody.cpp -SOURCE MmfHwDeviceStub.cpp -SOURCE ToneGenerator.cpp -SOURCE DevSoundUtility.cpp -SOURCE TonePlayCompleteTimer.cpp +SOURCE mmfdevsoundadaptation.cpp +SOURCE mmfdevsoundadaptationbody.cpp +SOURCE mmfhwdevicestub.cpp +SOURCE tonegenerator.cpp +SOURCE devsoundutility.cpp +SOURCE toneplaycompletetimer.cpp USERINCLUDE ../inc USERINCLUDE ../../inc -START RESOURCE FixedSequence.rss +START RESOURCE fixedsequence.rss TARGETPATH Resource/DevSound HEADER END @@ -65,7 +65,7 @@ LIBRARY ErrorConcealmentIntfcCI.lib LIBRARY SpeechEncoderConfigCI.lib -deffile MmfDevSoundAdaptation.def +deffile mmfdevsoundadaptation.def nostrictdef // End of File diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/group/bld.inf --- a/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -25,4 +25,4 @@ ../data/sample1.wav /Epoc32/winscw/c/sample1.wav PRJ_MMPFILES -./MmfDevSoundAdaptation.mmp +./mmfdevsoundadaptation.mmp diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/src/DevSoundUtility.cpp --- a/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/src/DevSoundUtility.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/src/DevSoundUtility.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -25,7 +25,7 @@ #include #include //needed for CleanupResetAndDestroyPushL() #include -#include "DevSoundUtility.h" +#include "devsoundutility.h" _LIT(KFixedSequenceResourceFile, "Z:\\Resource\\DevSound\\FixedSequence.rsc"); diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/src/MmfDevSoundAdaptation.cpp --- a/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/src/MmfDevSoundAdaptation.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/src/MmfDevSoundAdaptation.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -18,8 +18,8 @@ // INCLUDE FILES -#include -#include "MmfDevSoundAdaptationBody.h" +#include +#include "mmfdevsoundadaptationbody.h" // ============================ MEMBER FUNCTIONS =============================== diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/src/MmfDevSoundAdaptationBody.cpp --- a/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/src/MmfDevSoundAdaptationBody.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/src/MmfDevSoundAdaptationBody.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -20,29 +20,29 @@ #include #include -#include "G711DecoderIntfc.h" -#include "G729DecoderIntfc.h" -#include "IlbcDecoderIntfc.h" -#include "G711EncoderIntfc.h" -#include "G729EncoderIntfc.h" -#include "IlbcEncoderIntfc.h" -#include "ErrorConcealmentIntfc.h" -#include "SpeechEncoderConfig.h" +#include "g711decoderintfc.h" +#include "g729decoderintfc.h" +#include "ilbcdecoderintfc.h" +#include "g711encoderintfc.h" +#include "g729encoderintfc.h" +#include "ilbcencoderintfc.h" +#include "errorconcealmentintfc.h" +#include "speechencoderconfig.h" -#include "AudioInputMessageTypes.h" -#include "AudioOutputMessageTypes.h" +#include "audioinputmessagetypes.h" +#include "audiooutputmessagetypes.h" //#include "AudioResourceMessageTypes.h" -#include "AudioInputCI.h" -#include "AudioOutputCI.h" -#include "G711DecoderIntfcCI.h" -#include "G729DecoderIntfcCI.h" -#include "IlbcDecoderIntfcCI.h" -#include "G711EncoderIntfcCI.h" -#include "G729EncoderIntfcCI.h" -#include "IlbcEncoderIntfcCI.h" -#include "ErrorConcealmentIntfcCI.h" -#include "SpeechEncoderConfigCI.h" +#include "audioinputci.h" +#include "audiooutputci.h" +#include "g711decoderintfcci.h" +#include "g729decoderintfcci.h" +#include "ilbcdecoderintfcci.h" +#include "g711encoderintfcci.h" +#include "g729encoderintfcci.h" +#include "ilbcencoderintfcci.h" +#include "errorconcealmentintfcci.h" +#include "speechencoderconfigci.h" //#include //#include @@ -64,9 +64,9 @@ //#include //#include -#include "MmfDevSoundAdaptationBody.h" -#include "MmfHwDeviceStub.h" -#include "TonePlayCompleteTimer.h" +#include "mmfdevsoundadaptationbody.h" +#include "mmfhwdevicestub.h" +#include "toneplaycompletetimer.h" // CONSTANTS diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/src/MmfDevSoundAdaptationBody.h --- a/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/src/MmfDevSoundAdaptationBody.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/src/MmfDevSoundAdaptationBody.h Tue Feb 02 00:01:22 2010 +0200 @@ -23,10 +23,10 @@ // INCLUDES #include #include -#include +#include //#include -#include "ToneGenerator.h" -#include "DevSoundUtility.h" +#include "tonegenerator.h" +#include "devsoundutility.h" // CONSTANTS diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/src/MmfHwDeviceStub.cpp --- a/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/src/MmfHwDeviceStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/src/MmfHwDeviceStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include "MmfHwDeviceStub.h" +#include "mmfhwdevicestub.h" #ifdef _DEBUG #include "e32debug.h" diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/src/ToneGenerator.cpp --- a/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/src/ToneGenerator.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/src/ToneGenerator.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -20,7 +20,7 @@ // INCLUDE FILES -#include "ToneGenerator.h" +#include "tonegenerator.h" #include #include diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/src/TonePlayCompleteTimer.cpp --- a/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/src/TonePlayCompleteTimer.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/src/TonePlayCompleteTimer.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -18,8 +18,8 @@ // INCLUDE FILES -#include "MmfDevSoundAdaptationBody.h" -#include "TonePlayCompleteTimer.h" +#include "mmfdevsoundadaptationbody.h" +#include "toneplaycompletetimer.h" #ifdef _DEBUG #include "e32debug.h" diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/Group/RestrictedAudioOutputCIStub.mmp --- a/audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/Group/RestrictedAudioOutputCIStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/Group/RestrictedAudioOutputCIStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: Audio Stubs - -* Version : %version: bh1mmcf#2.1.8 % +* Version : %version: bh1mmcf#2.1.7 % * */ @@ -29,7 +29,7 @@ SOURCEPATH ../src -SOURCE RestrictedAudioOutputCIStub.cpp +SOURCE restrictedaudiooutputcistub.cpp USERINCLUDE ../inc USERINCLUDE ../../inc diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/Group/bld.inf --- a/audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/Group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/Group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -22,6 +22,6 @@ PRJ_EXPORTS PRJ_MMPFILES -RestrictedAudioOutputCIStub.mmp +restrictedaudiooutputcistub.mmp // End of File \ No newline at end of file diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/inc/RestrictedAudioOutputCIStub.h --- a/audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/inc/RestrictedAudioOutputCIStub.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/inc/RestrictedAudioOutputCIStub.h Tue Feb 02 00:01:22 2010 +0200 @@ -24,8 +24,8 @@ #ifndef RESTRICTEDAUDIOOUTPUTCI_H #define RESTRICTEDAUDIOOUTPUTCI_H -#include -#include +#include +#include # class CMMFDevSound; diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/src/RestrictedAudioOutputCIStub.cpp --- a/audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/src/RestrictedAudioOutputCIStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/src/RestrictedAudioOutputCIStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -20,8 +20,8 @@ #include // Needed for RDebug Prints #endif #include -#include "RestrictedAudioOutputCIStub.h" -#include +#include "restrictedaudiooutputcistub.h" +#include // ----------------------------------------------------------------------------- // CRestrictedAudioOutput::NewL diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/fmradiotunercontrolstub/Group/FMRadioTunerControlStub.mmp --- a/audiostubs/fmradiotunercontrolstub/Group/FMRadioTunerControlStub.mmp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/fmradiotunercontrolstub/Group/FMRadioTunerControlStub.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -24,10 +24,10 @@ UID 0x1000008d 0x2000C0C0 VENDORID VID_DEFAULT -SOURCEPATH ../Src -SOURCE FMRadioTunerControlStub.cpp +SOURCEPATH ../src +SOURCE fmradiotunercontrolstub.cpp -USERINCLUDE ../Src +USERINCLUDE ../src OS_LAYER_SYSTEMINCLUDE diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/fmradiotunercontrolstub/Group/bld.inf --- a/audiostubs/fmradiotunercontrolstub/Group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/fmradiotunercontrolstub/Group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -24,7 +24,7 @@ PRJ_MMPFILES -FMRadioTunerControlStub.mmp +fmradiotunercontrolstub.mmp // End of File \ No newline at end of file diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/fmradiotunercontrolstub/Src/FMRadioTunerControlStub.cpp --- a/audiostubs/fmradiotunercontrolstub/Src/FMRadioTunerControlStub.cpp Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/fmradiotunercontrolstub/Src/FMRadioTunerControlStub.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include -#include "FMRadioTunerControlStub.h" +#include "fmradiotunercontrolstub.h" // CONSTANTS const TInt KReqTunerOn = 1; diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/fmradiotunercontrolstub/Src/FMRadioTunerControlStub.h --- a/audiostubs/fmradiotunercontrolstub/Src/FMRadioTunerControlStub.h Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/fmradiotunercontrolstub/Src/FMRadioTunerControlStub.h Tue Feb 02 00:01:22 2010 +0200 @@ -23,8 +23,8 @@ // INCLUDES #include -#include -#include +#include +#include // FORWARD DECLARATIONS class CTuner; diff -r ffb8e2ddd8dc -r f935d51494d1 audiostubs/group/bld.inf --- a/audiostubs/group/bld.inf Mon Jan 18 20:06:52 2010 +0200 +++ b/audiostubs/group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -27,6 +27,6 @@ #include "../devsoundextensions_stubs/group/bld.inf" //FM Radio Tuner Control -#include "../fmradiotunercontrolstub/Group/bld.inf" +#include "../fmradiotunercontrolstub/group/bld.inf" // End of File diff -r ffb8e2ddd8dc -r f935d51494d1 systemswstubs/hwrmhapticsstubplugin/data/2001CB6D.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemswstubs/hwrmhapticsstubplugin/data/2001CB6D.rss Tue Feb 02 00:01:22 2010 +0200 @@ -0,0 +1,51 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Haptics (adaptation) stub plugin ECom resource file +* +*/ + + +#include "registryinfov2.rh" + +// Declares info for implementations +RESOURCE REGISTRY_INFO SA_HAPTICS_ADAPTATION + { + resource_format_version = RESOURCE_FORMAT_VERSION_2; + dll_uid = 0x2001CB6D; // Haptics adaptation DLL UID + interfaces = + { + INTERFACE_INFO + { + interface_uid = 0x2001CBE4; // KCHWRMHapticsPluginServiceInterfaceUid + implementations = + { + // Haptics adaptation implementation + IMPLEMENTATION_INFO + { + implementation_uid = 0x2001CB6E; // Haptics Adaptation Plugin Implementation UID + version_no = 1; + display_name = "Haptics Stub plugin"; + default_data = "EHWRMLogicalActuatorAny"; + opaque_data = ""; + rom_only = 0; + } + }; + } + }; + } + +// End of File + + + diff -r ffb8e2ddd8dc -r f935d51494d1 systemswstubs/hwrmhapticsstubplugin/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemswstubs/hwrmhapticsstubplugin/group/bld.inf Tue Feb 02 00:01:22 2010 +0200 @@ -0,0 +1,30 @@ +/* +* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Haptics adaptation stub plugin bld file +* +*/ + + +#include + +PRJ_PLATFORMS +DEFAULT + +PRJ_EXPORTS + +PRJ_MMPFILES +../group/hwrmhapticsstubplugin.mmp + + +// End of File diff -r ffb8e2ddd8dc -r f935d51494d1 systemswstubs/hwrmhapticsstubplugin/group/hwrmhapticsstubplugin.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemswstubs/hwrmhapticsstubplugin/group/hwrmhapticsstubplugin.mmp Tue Feb 02 00:01:22 2010 +0200 @@ -0,0 +1,50 @@ +/* +* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Haptics (adaptation) stub plugin project definition file +* +*/ + + +#include + +TARGET hapticsadaptation.dll +TARGETTYPE PLUGIN + +UID 0x10009D8D 0x2001CB6D + +VENDORID VID_DEFAULT + +CAPABILITY CAP_ECOM_PLUGIN + +SOURCEPATH ../src +SOURCE proxy.cpp +SOURCE hwrmhapticsstubplugin.cpp +SOURCE hwrmhapticsstubpluginidleresponder.cpp + +START RESOURCE ../data/2001CB6D.rss +TARGET hapticsadaptation.rsc +END + +USERINCLUDE ../inc + +OS_LAYER_SYSTEMINCLUDE +SYSTEMINCLUDE /epoc32/include/ecom + +LIBRARY euser.lib +LIBRARY ecom.lib +LIBRARY estor.lib +LIBRARY hwrmhapticspluginservice.lib + +LANG SC + diff -r ffb8e2ddd8dc -r f935d51494d1 systemswstubs/hwrmhapticsstubplugin/inc/hwrmhapticsstubplugin.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemswstubs/hwrmhapticsstubplugin/inc/hwrmhapticsstubplugin.h Tue Feb 02 00:01:22 2010 +0200 @@ -0,0 +1,137 @@ +/* +* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Haptics test (adaptation) plugin header file. +* +*/ + + +#ifndef __HWRMHAPTICSSTUBPLUGIN_H_ +#define __HWRMHAPTICSSTUBPLUGIN_H_ + +#include +#include "hwrmhapticsstubpluginidleresponder.h" + +/** + * Haptics stub plugin. + * Stub implementation of Haptics adaptation ECom plugin for clean build(s). + * + * @since Series S60 5.1 + */ +class CHWRMHapticsStubPlugin : public CHWRMHapticsPluginService + { +public: + /** + * Static method for instantiating stub plugin objects used by + * ECom framework. + * + * @aCallback Haptics plugin callback instance. + * @return Pointer to a new CHWRMHapticsStubPlugin instance. + */ + static CHWRMHapticsStubPlugin* NewL( + MHWRMHapticsPluginCallback* aCallback ); + + /** + * Destructor + */ + virtual ~CHWRMHapticsStubPlugin(); + + /** + * Method to invoke a particular command in the plugin. + * Dummy implementation of the CHWRMHapticsPluginService::ProcessCommandL + * abstract interface method. + * + * @see CHWRMHapticsPluginService + */ + virtual void ProcessCommandL( TInt aCommandId, + TUint8 aTransId, + TDesC8& aData ); + + /** + * Method to cancel a particular command. + * Dummy implementation the CHWRMHapticsPluginService::CancelCommandL + * abstract interface method. + * + * @see CHWRMHapticsPluginService + */ + virtual void CancelCommandL( TUint8 aTransId, + TInt aCommandId ); + + + /** + * The actual response generation method (called from idle responder + * object) + * + * @param aTransId Transaction Id of the command for which the response + * generation is requested. + * @param aData Pointer to the data received in command (based on + * which the command-specific response is generated). + */ + void GenerateResponseL( TUint8 aTransId, + TUint8* aData ); + + /** + * Static method that CIdle calls as callback to remove "spent" responder + * objects from their pointer array + * + * @param aObjectPtr Pointer to the CHWRMHapticsStubPlugin object that + * started the CIdle runner whose RunL calls this + * method as callback. + * @return TInt Always returns KErrNone. Required by + * CIdle( TCallBack ). + */ + static TInt CollectGarbageIdle( TAny* aObjectPtr ); + + /** + * Method that does the actual garbage collection of spent responder + * objects + */ + void CollectGarbage(); + +private: + + /** + * Constructor. + * + * @aCallback Haptics plugin callback instance. + */ + CHWRMHapticsStubPlugin( MHWRMHapticsPluginCallback* aCallback ); + + /** + * Two-phase construction ConstructL + */ + void ConstructL(); + + /** + * Method for removing a specific responder object from internal + * RPointerArray + * + * @param aTransId Transaction Id of the responder that is to be removed. + */ + void RemoveResponder( TUint8 aTransId ); + +private: // data + + /** + * Array of pointers to running idle responder objects + */ + RPointerArray iResponders; + + /** + * CIdle object through which the responders are cleaned (kind of garbage + * collection) + */ + CIdle *iIdle; + }; + +#endif // __HWRMHAPTICSSTUBPLUGIN_H_ diff -r ffb8e2ddd8dc -r f935d51494d1 systemswstubs/hwrmhapticsstubplugin/inc/hwrmhapticsstubpluginidleresponder.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemswstubs/hwrmhapticsstubplugin/inc/hwrmhapticsstubpluginidleresponder.h Tue Feb 02 00:01:22 2010 +0200 @@ -0,0 +1,130 @@ +/* +* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Haptics test (adaptation) plugin idle responder header file. +* +*/ + + +#ifndef __HWRMHAPTICSSTUBPLUGINIDLERESPONDER_H_ +#define __HWRMHAPTICSSTUBPLUGINIDLERESPONDER_H_ + +#include + +class CHWRMHapticsStubPlugin; + +/** + * Haptics stub plugin idle responder. + * Class that initiates response generation after embedded + * CIdle AO gets runtime. + * + * @since Series S60 5.1 + */ +class CHWRMHapticsStubPluginIdleResponder : public CBase + { +public: + /** + * Static method for instantiating stub plugin objects used by + * ECom framework. + * + * @param aPlugin Pointer to the stub plugin object that calls + * this instantiation method. + * @param aTransId Transaction Id of the command (that is to be + * responded when the embedded CIdle object is + * scheduled to run). + * @param aDataPacket Pointer to the received command data. + * @return Pointer to a new instance of idle responder. + */ + static CHWRMHapticsStubPluginIdleResponder* NewL( + CHWRMHapticsStubPlugin* aPlugin, + TUint8 aTransId, + TUint8* aDataPacket ); + + /** + * Destructor + */ + virtual ~CHWRMHapticsStubPluginIdleResponder(); + + /** + * Response generation method (called as callback from CIdle) + * + * @param aSelf TAny pointer to the object that started the CIdle + * whose callback method this is. + * @return TInt Always returns KErrNone. Required by CIdle(TCallBack). + */ + static TInt GenerateResponse( TAny* aSelf ); + + /** + * The actual response generation method. + */ + void GenerateResponseL(); + + /** + * Getter for transId + * + * @return TUint8 The transaction Id. + */ + TUint8 TransId() const; + + /** + * Getter for 'active' state + * + * @return TBool True iff the embedded CIdle AO is currently active. + */ + TBool Active() const; + +private: + + /** + * Constructor + * + * @param aPlugin See the above NewL method. + * @param aTransId See the above NewL method. + * @param aDataPacket See the above NewL method. + */ + CHWRMHapticsStubPluginIdleResponder( + CHWRMHapticsStubPlugin* aPlugin, + TUint8 aTransId, + TUint8* aDataPacket ); + + /** + * Two-phase construction ConstructL + */ + void ConstructL(); + +private: // data + + /** + * CIdle active object (through which response generation is done) + */ + CIdle* iIdle; + + /** + * Pointer to the stub plugin object that created this idle responder + * and through which the actual response to stub client (i.e., to + * HapticsPluginManager) is sent. + */ + CHWRMHapticsStubPlugin* iPlugin; + + /** + * Transaction Id (of the received command) + */ + TUint8 iTransId; + + /** + * Pointer to raw command data (not owned) + */ + TUint8* iDataPacket; + }; + +#endif // __HWRMHAPTICSSTUBPLUGINIDLERESPONDER_H_ diff -r ffb8e2ddd8dc -r f935d51494d1 systemswstubs/hwrmhapticsstubplugin/src/hwrmhapticsstubplugin.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemswstubs/hwrmhapticsstubplugin/src/hwrmhapticsstubplugin.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -0,0 +1,612 @@ +/* +* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Haptics test (adaptation) plugin implementation. +* +*/ + + +#include +#include +#include "hwrmhapticsstubplugin.h" + +// --------------------------------------------------------------------------- +// Static instantiation method. +// --------------------------------------------------------------------------- +// +CHWRMHapticsStubPlugin* CHWRMHapticsStubPlugin::NewL( + MHWRMHapticsPluginCallback* aCallback ) + { + CHWRMHapticsStubPlugin* self = + new ( ELeave ) CHWRMHapticsStubPlugin( aCallback ); + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop( self ); + return self; + } + +// --------------------------------------------------------------------------- +// Destructor +// --------------------------------------------------------------------------- +// +CHWRMHapticsStubPlugin::~CHWRMHapticsStubPlugin() + { + iResponders.ResetAndDestroy(); + + if ( iIdle ) + { + iIdle->Cancel(); + delete iIdle; + } + } + +// --------------------------------------------------------------------------- +// Implementation of ProcessCommandL. Creates an idle responder and appends it +// to the array of idle responders. (Later then, when the responder gets +// runtime, it will initiate the response generation). +// --------------------------------------------------------------------------- +// +void CHWRMHapticsStubPlugin::ProcessCommandL( TInt aCommandId, + TUint8 aTransId, + TDesC8& aData ) + { + if ( aCommandId != HWRMHapticsCommand::EHapticsCmdId || + aData.Size() < 2 ) // minimum length check + { + User::Leave( KErrBadDescriptor ); + } + + TUint8* dataPtr = const_cast( aData.Ptr() ); + + if ( !dataPtr ) + { + User::Leave( KErrBadDescriptor ); + } + + CHWRMHapticsStubPluginIdleResponder* responder = + CHWRMHapticsStubPluginIdleResponder::NewL( this, aTransId, dataPtr ); + CleanupStack::PushL( responder ); + iResponders.AppendL( responder ); + CleanupStack::Pop ( responder ); + } + +// --------------------------------------------------------------------------- +// Implementation of CancelCommandL. Just removes the corresponding idle +// responder. +// --------------------------------------------------------------------------- +// +void CHWRMHapticsStubPlugin::CancelCommandL( TUint8 aTransId, + TInt /* aCommandId */ ) + { + RemoveResponder( aTransId ); + } + + +// --------------------------------------------------------------------------- +// Method that does the actual response generation towards the issuer of +// command i.e., the HapticsPluginManager +// --------------------------------------------------------------------------- +// +void CHWRMHapticsStubPlugin::GenerateResponseL( TUint8 aTransId, + TUint8* aData ) + { + // Hardcoded responses generated based on the command code (first 2 bytes + // of the aData data packet, but since at the moment the 2nd byte is + // always 0x00, we just use the 1st one) + TUint8 command = aData[0]; + + TBuf8 binRespData; + binRespData.SetLength( KHWRMHapticsRespMaxSize ); + + TInt i( 0 ); + // For each command the response data's first two bytes are copy of + // the received command code (first 2 bytes of aData). + + binRespData[i++] = aData[0]; // command code bits 0..7 + binRespData[i++] = aData[1]; // command code bits 8..15 + + switch ( command ) + { + case 0x00: // API version query + { + // Response to API version query contains: + // 1 byte major version number + // 1 byte minor version number + // 2 bytes for build version + binRespData[i++] = 0x02; // major version + binRespData[i++] = 0x00; // minor version + binRespData[i++] = 0x53; // build version bits 0..7 + binRespData[i++] = 0x04; // build version bits 8..15 + break; + } + + case 0x01: // Initialize + case 0x02: // Terminate + case 0x06: // Modify basis effect + case 0x07: // Stop effect + case 0x08: // Stop all effects + case 0x0B: // Reset debug buffer + case 0x0C: // Stop designed bridge + case 0x13: // Close device + case 0x14: // Start designed bridge + case 0x16: // Play streaming sample + case 0x18: // Destroy streaming effect + case 0x19: // Pause playing effect + case 0x1A: // Resume playing effect + case 0x1E: // Modify magsweep effect + case 0x1F: // Modify periodic effect + { + // For these commands the response only contains status byte + // (set to 0x00 ("Success") in this stub). + binRespData[i++] = 0x00; // status + break; + } + + case 0x03: // Play basis effect + case 0x04: // Play IVT effect (with IVT data) + case 0x05: // Play IVT effect (without IVT data) + case 0x17: // Create streaming effect + case 0x1C: // Play magsweep effect + case 0x1D: // Play periodic effect + { + // The response consists of status byte (0x00) and 4-byte long + // effectHandle (here hardcoded as 0x01000000) + binRespData[i++] = 0x00; // status + binRespData[i++] = 0x01; // effectHandle bits 0..7 + binRespData[i++] = 0x00; // effectHandle bits 8..15 + binRespData[i++] = 0x00; // effectHandle bits 16..23 + binRespData[i++] = 0x00; // effectHandle bits 24..31 + break; + } + + case 0x09: // Get device capabilities + { + // The response consists of status byte (0x00), 4-byte long + // capability type (copied from the received command (bytes + // 7..10)), 1-byte capability value type (copied from the + // received command (byte 2), 1-byte size byte and "size" bytes + // long value + binRespData[i++] = 0x00; // status + binRespData[i++] = aData[7]; // capability type bits 0..7 + binRespData[i++] = aData[8]; // capability type bits 8..15 + binRespData[i++] = aData[9]; // capability type bits 16..23 + binRespData[i++] = aData[10]; // capability type bits 24..31 + binRespData[i++] = aData[2]; // capability value type + // The size and value depend on what exactly is being queried + // Note: Currently only the lowest (0..7) bytes of capability + // type have meaning, thus the switch case below is + // simplified.. + // Note: Since all values, except device name, are actually 32-bit + // integers, their size is always 4. + TUint8 capabilityType = aData[7]; + switch ( capabilityType ) + { + case 0: // device category + { + binRespData[i++] = 0x04; // size + binRespData[i++] = 0x02; + binRespData[i++] = 0x00; + binRespData[i++] = 0x00; + binRespData[i++] = 0x00; // value - virtual device + break; + } + case 1: // max nested repeats + case 2: // num of actuators + case 4: // num of effect slots + case 6: // min period + { + binRespData[i++] = 0x04; // size + binRespData[i++] = 0x01; + binRespData[i++] = 0x00; + binRespData[i++] = 0x00; + binRespData[i++] = 0x00; // value - 0x1 + break; + } + case 3: // actuator type + { + binRespData[i++] = 0x04; // size + binRespData[i++] = 0x00; + binRespData[i++] = 0x00; + binRespData[i++] = 0x00; + binRespData[i++] = 0x00; // value - ERM actuator + break; + } + case 5: // supported styles + { + binRespData[i++] = 0x04; // size + binRespData[i++] = 0x07; + binRespData[i++] = 0x00; + binRespData[i++] = 0x00; + binRespData[i++] = 0x00; // value - all styles + break; + } + case 7: // max period + case 8: // max effect duration + case 11: // max envelope time + case 13: // max IVT file size (tethered) + case 14: // max IVT file size + { + binRespData[i++] = 0x04; // size + binRespData[i++] = 0xFF; + binRespData[i++] = 0xFF; + binRespData[i++] = 0x00; // + binRespData[i++] = 0x00; // value => 0xFFFF. + break; + } + case 9: // supported effects + { + binRespData[i++] = 0x04; // size + binRespData[i++] = 0x07; + binRespData[i++] = 0x00; + binRespData[i++] = 0x00; + binRespData[i++] = 0x00; // value - mag|per|timeline + break; + } + case 10: // device name + { + binRespData[i++] = 0x04; // size + binRespData[i++] = 0x52; // value - byte 1, ascii "S" + binRespData[i++] = 0x53; // value - byte 2, ascii "T" + binRespData[i++] = 0x54; // value - byte 3, ascii "U" + binRespData[i++] = 0x42; // value - byte 4, ascoo "B" + break; + } + case 12: // API version number + { + binRespData[i++] = 0x04; // size + binRespData[i++] = 0x02; + binRespData[i++] = 0x00; + binRespData[i++] = 0x00; + binRespData[i++] = 0x00; // value - API version + // Note: same as major version in + // specific API version query + // 0x2 + break; + } + default: + { + // Here status byte changed to -6 (0xFA) + // ("incompatible capability type") + binRespData[2] = 0xFA; // status (re-assigned) + binRespData[i++] = 0x00; // value size set to zero + break; + } + } // inner switch ends + break; + } + + case 0x0A: // Get debug buffer + { + // The response consists of status byte (0x00) and 2 bytes + // indicating the buffer size followed by the buffer itself. + // Here buffer size zero is used => thus this only consists of + // 3 bytes + // FFS: This may have to be changed if the zero-length is not ok. + binRespData[i++] = 0x00; // status + binRespData[i++] = 0x00; // buffer size bits 0..7 + binRespData[i++] = 0x00; // buffer size bits 8..15 + break; + } + + case 0x0D: // Get device state + { + // The response consists of status byte (0x00) and 4 bytes that + // indicate the device state (the bytes used here mean + // "device attached to the system") + binRespData[i++] = 0x00; // status + binRespData[i++] = 0x01; // device state bits 0..7 + binRespData[i++] = 0x00; // device state bits 8..15 + binRespData[i++] = 0x00; // device state bits 16..23 + binRespData[i++] = 0x00; // device state bits 24..31 + break; + } + + case 0x0E: // Set kernel param + { + // The response consists of status byte (0x00) and 2 bytes that + // are the kernel param Id's copied from the received command + // (bytes 6 and 7) + binRespData[i++] = 0x00; // status + binRespData[i++] = aData[6]; // kernel param Id bits 0..7 + binRespData[i++] = aData[7]; // kernel param Id bits 8..15 + break; + } + + case 0x0F: // Get kernel param + { + // The response consists of status byte (0x00), 2 bytes that are + // the kernel param Id's copied from the received command + // (bytes 6&7) and two bytes for (here dummy 0x00) values + binRespData[i++] = 0x00; // status + binRespData[i++] = aData[6]; // kernel param Id bits 0..7 + binRespData[i++] = aData[7]; // kernel param Id bits 8..15 + binRespData[i++] = 0x00; // kernel param value bits 0..7 + binRespData[i++] = 0x00; // kernel param value bits 8..15 + break; + } + + case 0x10: // Set device property + { + // The response consists of status byte (0x00), 4 bytes indicating + // the property type (copied from the received command's bytes + // 6..9) and 1 byte indicating the property value type (copied + // from the received command's byte 10). + binRespData[i++] = 0x00; // status + binRespData[i++] = aData[6]; // property type bits 0..7 + binRespData[i++] = aData[7]; // property type bits 8..15 + binRespData[i++] = aData[8]; // property type bits 16..23 + binRespData[i++] = aData[9]; // property type bits 24..31 + binRespData[i++] = aData[10]; // property value type + break; + } + + case 0x11: // Get device property + { + // The response consists of 1-byte status (0x00), 4-byte long + // property type (copied from the received command bytes 7..10), + // 1-byte property value type (copied from the received command + // byte 2), 1-byte size byte and "size" bytes long value part + binRespData[i++] = 0x00; // status + binRespData[i++] = aData[7]; // property type bits 0..7 + binRespData[i++] = aData[8]; // property type bits 8..15 + binRespData[i++] = aData[9]; // property type bits 16..23 + binRespData[i++] = aData[10]; // property type bits 24..31 + binRespData[i++] = aData[2]; // property value type + // The size and value depend on what exactly is being queried + // Note: Currently only the lowest (0..7) bytes of capability type + // have meaning, thus the switch case below is simplified + TUint8 propertyType = aData[7]; + switch ( propertyType ) + { + case 0: + // license key.. not feasible as GET device property type + { + // re-assign the status + binRespData[2] = 0xF9; // status - incompatible property + // type + binRespData[i++] = 0x00; // value size == 0 (=> no value) + break; + } + case 1: // priority + { + binRespData[i++] = 0x04; // size (32-bit integer takes 4 + // bytes) + binRespData[i++] = 0x00; + binRespData[i++] = 0x00; + binRespData[i++] = 0x00; + binRespData[i++] = 0x00; // value - 0x0 is lowest priority + break; + } + case 2: // disable effects + { + binRespData[i++] = 0x04; // size + binRespData[i++] = 0x00; + binRespData[i++] = 0x00; + binRespData[i++] = 0x00; + binRespData[i++] = 0x00; // value - 0x0 means not disabled + break; + } + case 3: // strength + case 4: // master strength + { + binRespData[i++] = 0x04; // size + binRespData[i++] = 0xFF; + binRespData[i++] = 0xFF; + binRespData[i++] = 0x00; + binRespData[i++] = 0x00; // => value 0xFFFF + break; + } + default: + { + // Pehaps it's best to change the status byte to -7 (0xF9) + // ("incompatible property type") + binRespData[2] = 0xF9; // status (re-assigned) + binRespData[i++] = 0x00; // value size, set to zero + break; + } + } // inner switch ends + break; + } + + case 0x12: // Open device + { + // The response consists of status byte (0x00) and 4-byte long + // deviceHandle (here hardcoded as 0x01000000) + binRespData[i++] = 0x00; // status + binRespData[i++] = 0x01; // deviceHandle bits 0..7 + binRespData[i++] = 0x00; // deviceHandle bits 8..15 + binRespData[i++] = 0x00; // deviceHandle bits 16..23 + binRespData[i++] = 0x00; // deviceHandle bits 24..31 + break; + } + + case 0x15: // Device count + { + // The response only contains the device count (here value == 1) + binRespData[i++] = 0x01; + break; + } + + case 0x1B: // Get effect state + { + // The response consists of status byte (0x00) and one byte effect + // state (0x00 used here meaning "Not playing") + binRespData[i++] = 0x00; // status + binRespData[i++] = 0x00; // effect state + break; + } + + case 0x20: // Load IVT data + { + // The response consists of status byte (0x00) and 4-byte long + // fileHandle (here hardcoded as 0x01000000) + binRespData[i++] = 0x00; // status + binRespData[i++] = 0x01; // fileHandle bits 0..7 + binRespData[i++] = 0x00; // fileHandle bits 8..15 + binRespData[i++] = 0x00; // fileHandle bits 16..23 + binRespData[i++] = 0x00; // fileHandle bits 24..31 + break; + } + + case 0x30: // Get license key + { + binRespData[i++] = 0x00; // status + binRespData[i++] = 0x20; // size + for( TInt n=0; n<0x20; ) + { + binRespData[i++] = 0x53; // S + n++; + binRespData[i++] = 0x54; // T + n++; + binRespData[i++] = 0x55; // U + n++; + binRespData[i++] = 0x42; // B + n++; + } + break; + } + + case 0xFF: // Protocol version query + { + // Response to Protocol version query contains: + // 1 byte minor version number + // 1 byte major version number + binRespData[i++] = 0x00; // minor version + binRespData[i++] = 0x03; // major version + break; + } + + default: + { + // Unknown command.. + break; + } + } // switch ends + + // set the lenght of the raw response data + binRespData.SetLength( i ); + + // create Haptics response data. This is done by externalizing + // (with RDesWriteStream whose sink is the Haptics response data) + TInt32 respDataErr( KErrNone ); + CHWRMHapticsRespData* respData = + CHWRMHapticsRespData::NewLC( respDataErr, binRespData ); + HWRMHapticsCommand::RHWRMHapticsRespData resp; + resp.CreateL( KHWRMHapticsRespMaxSize ); + CleanupClosePushL( resp ); + RDesWriteStream streamWriter( resp ); + CleanupClosePushL( streamWriter ); + streamWriter << *respData; + // This commits to stream's sink (i.e., to 'resp') + CleanupStack::PopAndDestroy( &streamWriter ); + + // Call the ProcessResponseL of the HapticsPluginManager + // object that created this stub plugin instance. + iResponseCallback->ProcessResponseL + ( HWRMHapticsCommand::EHapticsCmdId, aTransId, resp ); + + CleanupStack::PopAndDestroy( &resp ); + CleanupStack::PopAndDestroy( respData ); + // Order garbage collection of "spent" responder(s), if not already + // waiting for scheduling + if ( !iIdle->IsActive() ) + { + iIdle->Start( TCallBack ( CollectGarbageIdle, this ) ); + } + } + +// --------------------------------------------------------------------------- +// Static method called as CIdle TCallBack in order to remove obsolete +// responder from the array of responder pointers +// --------------------------------------------------------------------------- +// +TInt CHWRMHapticsStubPlugin::CollectGarbageIdle( TAny* aObjectPtr ) + { + CHWRMHapticsStubPlugin* self = + reinterpret_cast( aObjectPtr ); + if ( self ) + { + self->CollectGarbage(); + } + return KErrNone; + } + +// --------------------------------------------------------------------------- +// Removes all responders that have finished their work from iResponders array +// --------------------------------------------------------------------------- +// +void CHWRMHapticsStubPlugin::CollectGarbage() + { + for( TInt i( 0 ); i < iResponders.Count(); ) + { + if ( iResponders[i]->Active() ) + { + ++i; // skip this, it's still active.. + } + else + { + delete iResponders[i]; + iResponders.Remove( i ); + // note: array index i is not incremented as in the next round + // it already is the position of next item.. + // obviously the iResponders.Count() will be then one less + // than in this round. + } + } + } + +// --------------------------------------------------------------------------- +// Constructor +// --------------------------------------------------------------------------- +// +CHWRMHapticsStubPlugin::CHWRMHapticsStubPlugin( + MHWRMHapticsPluginCallback* aCallback ) + { + // set callback to baseclass' member variable + iResponseCallback = aCallback; + } + +// --------------------------------------------------------------------------- +// Two-phase construction ConstructL +// --------------------------------------------------------------------------- +// +void CHWRMHapticsStubPlugin::ConstructL() + { + iIdle = CIdle::NewL( CActive::EPriorityIdle ); + + // inform haptics of the plugin state + iResponseCallback->PluginEnabled( EHWRMLogicalActuatorAny, ETrue ); + iResponseCallback->PluginEnabled( EHWRMLogicalActuatorDevice, ETrue ); + } + +// --------------------------------------------------------------------------- +// Removes a specific responder (based on transId) from iResponders array +// --------------------------------------------------------------------------- +// +void CHWRMHapticsStubPlugin::RemoveResponder( TUint8 aTransId ) + { + TInt count( iResponders.Count() ); + + for( TInt i( 0 ); i < count; ++i ) + { + if ( iResponders[i]->TransId() == aTransId ) + { + delete iResponders[i]; + iResponders.Remove( i ); + break; + } + } + } + +// end of file + diff -r ffb8e2ddd8dc -r f935d51494d1 systemswstubs/hwrmhapticsstubplugin/src/hwrmhapticsstubpluginidleresponder.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemswstubs/hwrmhapticsstubplugin/src/hwrmhapticsstubpluginidleresponder.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -0,0 +1,132 @@ +/* +* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Haptics test (adaptation) plugin idle responder +* implementation. +* +*/ + + +#include "hwrmhapticsstubplugin.h" +#include "hwrmhapticsstubpluginidleresponder.h" + +// --------------------------------------------------------------------------- +// Static instantiation method. +// --------------------------------------------------------------------------- +// +CHWRMHapticsStubPluginIdleResponder* + CHWRMHapticsStubPluginIdleResponder::NewL( + CHWRMHapticsStubPlugin* aPlugin, + TUint8 aTransId, + TUint8* aDataPacket) + { + CHWRMHapticsStubPluginIdleResponder* self = + new ( ELeave ) CHWRMHapticsStubPluginIdleResponder( aPlugin, + aTransId, + aDataPacket ); + + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop( self ); + return self; + } + + +// --------------------------------------------------------------------------- +// Destructor +// --------------------------------------------------------------------------- +// +CHWRMHapticsStubPluginIdleResponder::~CHWRMHapticsStubPluginIdleResponder() + { + if ( iIdle ) + { + iIdle->Cancel(); + delete iIdle; + } + } + +// --------------------------------------------------------------------------- +// Method for starting response generation from CIdle callback +// This is used as TCallBack object in CIdle AO. +// --------------------------------------------------------------------------- +// +TInt CHWRMHapticsStubPluginIdleResponder::GenerateResponse( TAny* aSelf ) + { + CHWRMHapticsStubPluginIdleResponder* self = + reinterpret_cast( aSelf ); + if ( self ) + { + TRAP_IGNORE( self->GenerateResponseL() ); + } + return KErrNone; + } + +// --------------------------------------------------------------------------- +// Method that does the actual response generation towards the issuer of +// command i.e., the HapticsPluginManager +// --------------------------------------------------------------------------- +// +void CHWRMHapticsStubPluginIdleResponder::GenerateResponseL() + { + if ( iPlugin ) + { + iPlugin->GenerateResponseL( iTransId, iDataPacket ); + } + } + +// --------------------------------------------------------------------------- +// Getter for iTransId +// --------------------------------------------------------------------------- +// +TUint8 CHWRMHapticsStubPluginIdleResponder::TransId() const + { + return iTransId; + } + +// --------------------------------------------------------------------------- +// Method for enquiring whether the contained CIdle AO is active or not +// --------------------------------------------------------------------------- +// +TBool CHWRMHapticsStubPluginIdleResponder::Active() const + { + return ( iIdle && iIdle->IsActive() ); + } + +// --------------------------------------------------------------------------- +// Constructor +// --------------------------------------------------------------------------- +// +CHWRMHapticsStubPluginIdleResponder::CHWRMHapticsStubPluginIdleResponder( + CHWRMHapticsStubPlugin* aPlugin, + TUint8 aTransId, + TUint8* aDataPacket ) + : iPlugin( aPlugin ), + iTransId ( aTransId ), + iDataPacket ( aDataPacket ) + { + // empty + } + +// --------------------------------------------------------------------------- +// Two-phase construction ConstructL +// --------------------------------------------------------------------------- +// +void CHWRMHapticsStubPluginIdleResponder::ConstructL() + { + // Create and start the CIdle AO + iIdle = CIdle::NewL( CActive::EPriorityLow ); + iIdle->Start( TCallBack( GenerateResponse, this ) ); + } + +// end of file + diff -r ffb8e2ddd8dc -r f935d51494d1 systemswstubs/hwrmhapticsstubplugin/src/proxy.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemswstubs/hwrmhapticsstubplugin/src/proxy.cpp Tue Feb 02 00:01:22 2010 +0200 @@ -0,0 +1,42 @@ +/* +* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Haptics adaptation stub plugin ECom implementation proxy definition file +* +*/ + + +#include +#include + +#include "hwrmhapticsstubplugin.h" + +/** + * Mapping of the interface implementation UIDs to implementation factory + * functions + */ +const TImplementationProxy ImplementationTable[] = + { + IMPLEMENTATION_PROXY_ENTRY( 0x2001CB6E, CHWRMHapticsStubPlugin::NewL ) + }; + +/** + * Exported proxy for instantiation method resolution. + */ +EXPORT_C const TImplementationProxy* ImplementationGroupProxy( + TInt& aTableCount ) + { + aTableCount = + sizeof( ImplementationTable ) / sizeof( TImplementationProxy ); + return ImplementationTable; + }