--- a/devsound/devsoundrefplugin/group/bld.inf Fri Jul 09 12:53:09 2010 +0100
+++ b/devsound/devsoundrefplugin/group/bld.inf Fri Jul 09 13:09:11 2010 +0100
@@ -46,6 +46,9 @@
../mmpfiles/server/MmfAudioPolicyProxy.mmp
../mmpfiles/platsec/server/mmfaudiopolicy.mmp
#endif
+
+//Audio Tone Controller
+../mmpfiles/controller/MmfAudioToneController.mmp
//Sw Codec Wrapper
../mmpfiles/swcodecwrapper/mmfswaudiodevice.mmp
@@ -57,11 +60,3 @@
//audio 'software' hw device plugins
../mmpfiles/plugin/mmfAudioHwDevices.mmp
../mmpfiles/plugin/Gsm610HwDevices.mmp
-
-PRJ_TESTMMPFILES
-
-//Audio Test Tone Controller
-../mmpfiles/controller/MmfAudioToneController.mmp
-
-PRJ_TESTEXPORTS
-mmfaudiotonetestcontroller.iby /epoc32/rom/include/
\ No newline at end of file
--- a/devsound/devsoundrefplugin/group/devsound_refplugin.iby Fri Jul 09 12:53:09 2010 +0100
+++ b/devsound/devsoundrefplugin/group/devsound_refplugin.iby Fri Jul 09 13:09:11 2010 +0100
@@ -38,6 +38,10 @@
#endif // SYMBIAN_MULTIMEDIA_A3FDEVSOUND
+
+// Audio Tone Controller dll
+ECOM_PLUGIN(mmfaudiotonecontroller.dll,101f7d95.rsc)
+
//sw codec wrapper dll
file=ABI_DIR\BUILD_DIR\MMFSwCodecWrapper.dll System\Libs\MMFSwCodecWrapper.dll
file=ABI_DIR\BUILD_DIR\mmfswaudiodevice.dll System\Libs\mmfswaudiodevice.dll
--- a/devsound/devsoundrefplugin/group/mmfaudiotonetestcontroller.iby Fri Jul 09 12:53:09 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-// Copyright (c) 2006-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:
-//
-
-#ifndef MMFAUDIOTONETESTCONTROLLER.IBY
-#define MMFAUDIOTONETESTCONTROLLER.IBY
-
-ECOM_PLUGIN(mmfaudiotonetestcontroller.dll,2002C398.rsc)
-
-#endif //MMFAUDIOTONETESTCONTROLLER.IBY
-
--- a/devsound/devsoundrefplugin/mmpfiles/controller/MmfAudioToneController.mmp Fri Jul 09 12:53:09 2010 +0100
+++ b/devsound/devsoundrefplugin/mmpfiles/controller/MmfAudioToneController.mmp Fri Jul 09 13:09:11 2010 +0100
@@ -19,13 +19,13 @@
@file
*/
-target mmfaudiotonetestcontroller.dll
+target mmfaudiotonecontroller.dll
CAPABILITY ALL -TCB
targettype plugin
UNPAGED
// ECom Dll recognition UID followed by the unique UID for this dll
-UID 0x10009D8D 0x2002C398
+UID 0x10009D8D 0x101F7D95
VENDORID 0x70000001
SOURCEPATH ../../src/controller/audio
@@ -48,8 +48,8 @@
#endif //__OMAP__
-start resource 2002C398.rss
-target mmfaudiotonetestcontroller.rsc
+start resource 101F7D95.rss
+target mmfaudiotonecontroller.rsc
end
LIBRARY euser.lib
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devsound/devsoundrefplugin/src/controller/audio/101F7D95.rss Fri Jul 09 13:09:11 2010 +0100
@@ -0,0 +1,60 @@
+// Copyright (c) 2003-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:
+// Copied from... Registry file for the Example Interface Implementation Collection
+//
+//
+
+#include <ecom/registryinfo.rh>
+#include <mmf/plugin/mmfplugininterfaceuids.hrh>
+#include "MmfAudioToneController.hrh"
+
+RESOURCE REGISTRY_INFO theInfo
+ {
+ dll_uid = 0x101F7D95;
+ interfaces =
+ {
+ INTERFACE_INFO
+ {
+ interface_uid = KMmfUidPluginInterfaceController ;
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = KMmfUidControllerAudioTone ;
+ version_no = 1;
+ display_name = "Symbian Audio Tone controller";
+ default_data = "?";
+ opaque_data = "<s>Symbian<n>yes<i>0x101F5D07<p>0x101FFA00";//<n>yes indicates controller has no url handling capability.
+ }
+ };
+ },
+ INTERFACE_INFO
+ {
+ interface_uid = KMmfUidToneSequenceFormatInterface;
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = KMmfUidToneSequenceFormatRead ;
+ version_no = 1;
+ display_name = "Tone Sequence Play Format";
+ default_data = "?";
+ opaque_data = "<s>Symbian<i>0x101F5D07<e>.sqn<h>SQNC";
+ }
+ };
+ }
+
+ };
+ }
+
--- a/devsound/devsoundrefplugin/src/controller/audio/2002C398.rss Fri Jul 09 12:53:09 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-// Copyright (c) 2003-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:
-// Copied from... Registry file for the Example Interface Implementation Collection
-//
-//
-
-#include <ecom/registryinfo.rh>
-#include <mmf/plugin/mmfplugininterfaceuids.hrh>
-#include "MmfAudioToneController.hrh"
-
-RESOURCE REGISTRY_INFO theInfo
- {
- dll_uid = 0x2002C398;
- interfaces =
- {
- INTERFACE_INFO
- {
- interface_uid = KMmfUidPluginInterfaceController ;
- implementations =
- {
- IMPLEMENTATION_INFO
- {
- implementation_uid = KMmfUidControllerAudioTone ;
- version_no = 1;
- display_name = "Symbian Audio Tone Test controller";
- default_data = "?";
- opaque_data = "<s>Symbian<n>yes<i>0x101F5D07<p>0x101FFA00";//<n>yes indicates controller has no url handling capability.
- }
- };
- },
- INTERFACE_INFO
- {
- interface_uid = KMmfUidToneSequenceFormatInterface;
- implementations =
- {
- IMPLEMENTATION_INFO
- {
- implementation_uid = KMmfUidToneSequenceFormatRead ;
- version_no = 1;
- display_name = "Tone Sequence Play Format";
- default_data = "?";
- opaque_data = "<s>Symbian<i>0x101F5D07<e>.sqn<h>SQNC";
- }
- };
- }
-
- };
- }
-
--- a/group/bld.inf Fri Jul 09 12:53:09 2010 +0100
+++ b/group/bld.inf Fri Jul 09 13:09:11 2010 +0100
@@ -29,6 +29,8 @@
#include "../mm_pub/group/bld.inf"
#include "../devsoundextensions/group/bld.inf"
#include "../mdfdevvideoextensions/group/bld.inf"
+#include "../frametable_stub/group/bld.inf"
+#include "../eaacplusutil_stub/group/bld.inf"
--- a/imagingandcamerafws/imagingfws/ImageProcessor/bwins/imageprocessor.def Fri Jul 09 12:53:09 2010 +0100
+++ b/imagingandcamerafws/imagingfws/ImageProcessor/bwins/imageprocessor.def Fri Jul 09 13:09:11 2010 +0100
@@ -164,6 +164,4 @@
?ZoomL@TPreview@ImageProcessor@@QBEMXZ @ 163 NONAME ; float ImageProcessor::TPreview::ZoomL(void) const
??1CImgProcessor@ImageProcessor@@UAE@XZ @ 164 NONAME ; ImageProcessor::CImgProcessor::~CImgProcessor(void)
?SetInputL@CImgProcessor@ImageProcessor@@QAEXAAVCImagePanorama@@@Z @ 165 NONAME ; void ImageProcessor::CImgProcessor::SetInputL(class CImagePanorama &)
- ?Extension@TInputInfo@ImageProcessor@@QBEPAXVTUid@@@Z @ 166 NONAME ; void * ImageProcessor::TInputInfo::Extension(class TUid) const
- ?Extension@TOutputInfo@ImageProcessor@@QBEPAXVTUid@@@Z @ 167 NONAME ; void * ImageProcessor::TOutputInfo::Extension(class TUid) const
--- a/imagingandcamerafws/imagingfws/ImageProcessor/eabi/imageprocessor.def Fri Jul 09 12:53:09 2010 +0100
+++ b/imagingandcamerafws/imagingfws/ImageProcessor/eabi/imageprocessor.def Fri Jul 09 13:09:11 2010 +0100
@@ -168,6 +168,4 @@
_ZN14ImageProcessor13CImgProcessorD1Ev @ 167 NONAME
_ZN14ImageProcessor13CImgProcessorD2Ev @ 168 NONAME
_ZN14ImageProcessor13CImgProcessor9SetInputLER14CImagePanorama @ 169 NONAME
- _ZNK14ImageProcessor10TInputInfo9ExtensionE4TUid @ 170 NONAME
- _ZNK14ImageProcessor11TOutputInfo9ExtensionE4TUid @ 171 NONAME
--- a/imagingandcamerafws/imagingfws/ImageProcessor/inc/imageprocessorinputinfo.h Fri Jul 09 12:53:09 2010 +0100
+++ b/imagingandcamerafws/imagingfws/ImageProcessor/inc/imageprocessorinputinfo.h Fri Jul 09 13:09:11 2010 +0100
@@ -23,7 +23,6 @@
#define __IMAGE_PROCESSOR_INPUT_INFO_H__
#include <e32base.h>
-#include <gdi.h>
namespace ImageProcessor
{
--- a/imagingandcamerafws/imagingfws/ImageProcessor/src/imageprocessorinputinfo.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/imagingandcamerafws/imagingfws/ImageProcessor/src/imageprocessorinputinfo.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -135,17 +135,6 @@
return iInputInfoImpl.HasAlphaL();
}
-/**
-Retrieves access to a custom extension.
-
-@param aExtension
- The UID of the extension to be retrieved
+ }//namespace ImageProcessor
-@return Extension corresponding to the UID given as a parameter.
-*/
-EXPORT_C TAny* TInputInfo::Extension(TUid /*aExtension*/) const
- {
- return NULL;
- }
- }//namespace ImageProcessor
//EOF
--- a/imagingandcamerafws/imagingfws/ImageProcessor/src/imageprocessoroutputinfo.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/imagingandcamerafws/imagingfws/ImageProcessor/src/imageprocessoroutputinfo.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -52,17 +52,7 @@
__ASSERT_ALWAYS(iImageProcessorImpl.IsOutputSet(), User::Leave(KErrNotReady));
iOutputInfoImpl.SetSamplingL(aSampling);
}
-/**
-Retrieves access to a custom extension.
-
-@param aExtension
- The UID of the extension to be retrieved
-@return Extension corresponding to the UID given as a parameter.
-*/
-EXPORT_C TAny* TOutputInfo::Extension(TUid /*aExtension*/) const
- {
- return NULL;
- }
- }//namespace ImageProcessor
+ }//namespace ImageProcessor
+
//EOF
--- a/mdfdevvideoextensions/nga_mdf_postprocessor/src/NGAPostProcHwDevice.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mdfdevvideoextensions/nga_mdf_postprocessor/src/NGAPostProcHwDevice.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -1337,8 +1337,8 @@
User::Leave(KErrNotReady);
}
- if (aSize.iWidth < KMinVBMInputWidth
- || aSize.iHeight < KMinVBMInputHeight
+ if (aSize.iWidth <= KMinVBMInputWidth
+ || aSize.iHeight <= KMinVBMInputHeight
|| aSize.iWidth > iVBMBufferOptions.iBufferSize.iWidth
|| aSize.iHeight > iVBMBufferOptions.iBufferSize.iHeight)
{
--- a/mm_plat/audio_routing_api/inc/AudioOutput.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_plat/audio_routing_api/inc/AudioOutput.h Fri Jul 09 13:09:11 2010 +0100
@@ -25,7 +25,7 @@
#include <mdaaudiotoneplayer.h>
#include <mdaaudiooutputstream.h>
#include <midiclientutility.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
// FORWARD DECLARATIONS
class MAudioOutputObserver;
--- a/mm_plat/audio_routing_proxy_api/inc/AudioInputProxy.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_plat/audio_routing_proxy_api/inc/AudioInputProxy.h Fri Jul 09 13:09:11 2010 +0100
@@ -22,7 +22,7 @@
// INCLUDES
#include "AudioInput.h"
#include <mmf/common/mmfcontrollerframework.h>
-#include <MCustomCommand.h>
+#include <mcustomcommand.h>
// FORWARD DECLARATIONS
class CCustomCommandUtility;
class CCustomInterfaceUtility;
--- a/mm_plat/audio_routing_proxy_api/inc/AudioOutputProxy.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_plat/audio_routing_proxy_api/inc/AudioOutputProxy.h Fri Jul 09 13:09:11 2010 +0100
@@ -22,7 +22,7 @@
// INCLUDES
#include "AudioOutput.h"
#include <mmf/common/mmfcontrollerframework.h>
-#include <MCustomCommand.h>
+#include <mcustomcommand.h>
// FORWARD DECLARATIONS
class CCustomCommandUtility;
--- a/mm_plat/custom_interface_proxy_factory_api/inc/CustomInterfaceProxyFactory.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_plat/custom_interface_proxy_factory_api/inc/CustomInterfaceProxyFactory.h Fri Jul 09 13:09:11 2010 +0100
@@ -19,7 +19,7 @@
#define __CUSTOMINTERFACEPROXYFACTORY_H
#include <e32std.h>
-#include <MCustomCommand.h>
+#include <mcustomcommand.h>
#include <CustomInterfaceUtility.h>
class CCustomInterfaceProxyFactory
--- a/mm_plat/custom_interface_utility_api/inc/CustomCommandUtility.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_plat/custom_interface_utility_api/inc/CustomCommandUtility.h Fri Jul 09 13:09:11 2010 +0100
@@ -20,7 +20,7 @@
#define __CUSTOMCOMMANDUTILITY_H
#include <e32base.h>
-#include <MCustomCommand.h>
+#include <mcustomcommand.h>
//#include "CustomCommandTypes.h"
--- a/mm_plat/custom_interface_utility_api/inc/CustomInterfaceUtility.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_plat/custom_interface_utility_api/inc/CustomInterfaceUtility.h Fri Jul 09 13:09:11 2010 +0100
@@ -19,7 +19,7 @@
#define __CUSTOMINTERFACEUTILITY_H
#include <e32base.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
//#include "CustomCommandTypes.h"
#include <CustomCommandUtility.h>
class CProxyCustomInterfaceUtility;
--- a/mm_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/group/RestrictedAOTestClass.mmp Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/group/RestrictedAOTestClass.mmp Fri Jul 09 13:09:11 2010 +0100
@@ -61,7 +61,7 @@
LIBRARY CustomInterfaceUtility.lib
LIBRARY CustomCommandUtility.lib
-LIBRARY RestrictedAudioOutputProxy.lib
+LIBRARY ConfigurationComponentsFactory.lib
LIBRARY RestrictedAudioOutput.lib
LIBRARY MmfDevSound.lib
--- a/mm_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/inc/RestrictedAOTestClass.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/inc/RestrictedAOTestClass.h Fri Jul 09 13:09:11 2010 +0100
@@ -30,6 +30,7 @@
#include <e32cons.h>
#include <customInterfaceUtility.h>
#include <SoundDevice.h>
+#include <ConfigurationComponentsFactory.h>
#include <RestrictedAudioOutput.h>
@@ -314,6 +315,7 @@
// reference to TestModuleIf
CTestModuleIf& iTestModuleIf;
+ CConfigurationComponentsFactory* iFactory;
CMMFDevSound* iDevSound;
CRestrictedAudioOutput* iRestrictedAudioOutput;
--- a/mm_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/src/RestrictedAOTestClassBlocks.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/src/RestrictedAOTestClassBlocks.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -21,7 +21,6 @@
#include <e32svr.h>
#include <StifParser.h>
#include <Stiftestinterface.h>
-#include <RestrictedAudioOutputProxy.h>
#include "RestrictedAOTestClass.h"
#include "debug.h"
@@ -104,6 +103,12 @@
delete iDevSound;
iDevSound = NULL;
}
+
+ if (iFactory)
+ {
+ delete iFactory;
+ iFactory = NULL;
+ }
REComSession::FinalClose();
}
@@ -123,8 +128,8 @@
// First string is the function name used in TestScripter script file.
// Second is the actual implementation member function.
- ENTRY( "CreateFactory", CRestrictedAOTestClass::CreateFactory ),
- ENTRY( "CreateRestrictedAO", CRestrictedAOTestClass::CreateRestrictedAO ),
+ ENTRY( "CreateFactory", CRestrictedAOTestClass::CreateFactory ),
+ ENTRY( "CreateRestrictedAO", CRestrictedAOTestClass::CreateRestrictedAO ),
ENTRY( "AppendAllowedOutput", CRestrictedAOTestClass::AppendAllowedOutput ),
ENTRY( "RemoveAllowedOutput", CRestrictedAOTestClass::RemoveAllowedOutput ),
ENTRY( "GetAllowedOutputCount", CRestrictedAOTestClass::GetAllowedOutputCount ),
@@ -764,7 +769,10 @@
iLog->Log(_L("CRestrictedAOTestClass::CreateFactory"));
TInt error = KErrNone;
- TRAP(error, iDevSound = CMMFDevSound::NewL()) ;
+ error = CConfigurationComponentsFactory::CreateFactoryL(iFactory);
+
+ if (error == KErrNone)
+ TRAP(error, iDevSound = CMMFDevSound::NewL()) ;
// AddExpectedEvent(EInitializeComplete, KMediumTimeout);
return error;
@@ -781,9 +789,9 @@
iLog->Log(_L("CRestrictedAOTestClass::CreateRestrictedAO"));
TInt error = KErrNone;
- if (iDevSound != NULL)
+ if (iFactory != NULL && iDevSound != NULL)
{
- TRAP(error, iRestrictedAudioOutput = CRestrictedAudioOutputProxy::NewL(*iDevSound));
+ error = iFactory->CreateRestrictedAudioOutput(*iDevSound, iRestrictedAudioOutput);
}
else
{
--- a/mm_pub/audio_effects_api/inc/AudioEqualizerBase.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/AudioEqualizerBase.h Fri Jul 09 13:09:11 2010 +0100
@@ -24,7 +24,7 @@
#include <e32base.h>
#include <AudioEffectBase.h>
#include <AudioEqualizerData.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
const TUid KUidAudioEqualizerEffect = {0x1020382A};
--- a/mm_pub/audio_effects_api/inc/BassBoostBase.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/BassBoostBase.h Fri Jul 09 13:09:11 2010 +0100
@@ -24,7 +24,7 @@
#include <e32base.h>
#include <AudioEffectBase.h>
#include <BassBoostData.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
const TUid KUidBassBoostEffect = {0x10203827};
--- a/mm_pub/audio_effects_api/inc/DistanceAttenuationBase.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/DistanceAttenuationBase.h Fri Jul 09 13:09:11 2010 +0100
@@ -24,7 +24,7 @@
#include <e32base.h>
#include <AudioEffectBase.h>
#include <DistanceAttenuationData.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
const TUid KUidDistanceAttenuationEffect = {0x1020382C};
--- a/mm_pub/audio_effects_api/inc/DopplerBase.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/DopplerBase.h Fri Jul 09 13:09:11 2010 +0100
@@ -25,7 +25,7 @@
#include <e32base.h>
#include <AudioEffectBase.h>
#include <DopplerData.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
// CLASS DECLARATION
--- a/mm_pub/audio_effects_api/inc/EnvironmentalReverbBase.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/EnvironmentalReverbBase.h Fri Jul 09 13:09:11 2010 +0100
@@ -24,7 +24,7 @@
#include <e32base.h>
#include <AudioEffectBase.h>
#include <EnvironmentalReverbData.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
const TUid KUidEnvironmentalReverbEffect = {0x10203837};
--- a/mm_pub/audio_effects_api/inc/ListenerDopplerBase.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/ListenerDopplerBase.h Fri Jul 09 13:09:11 2010 +0100
@@ -23,7 +23,7 @@
#include <e32base.h>
#include <DopplerBase.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
const TUid KUidListenerDopplerEffect = {0x10207B16};
--- a/mm_pub/audio_effects_api/inc/ListenerLocationBase.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/ListenerLocationBase.h Fri Jul 09 13:09:11 2010 +0100
@@ -23,7 +23,7 @@
#include <e32base.h>
#include <LocationBase.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
const TUid KUidListenerLocationEffect = {0x1020382D};
--- a/mm_pub/audio_effects_api/inc/ListenerOrientationBase.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/ListenerOrientationBase.h Fri Jul 09 13:09:11 2010 +0100
@@ -23,7 +23,7 @@
#include <e32base.h>
#include <OrientationBase.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
const TUid KUidListenerOrientationEffect = {0x1020382E};
--- a/mm_pub/audio_effects_api/inc/LoudnessBase.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/LoudnessBase.h Fri Jul 09 13:09:11 2010 +0100
@@ -24,7 +24,7 @@
#include <e32base.h>
#include <AudioEffectBase.h>
#include <LoudnessData.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
const TUid KUidLoudnessEffect = {0x10207AA8};
--- a/mm_pub/audio_effects_api/inc/OrientationBase.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/OrientationBase.h Fri Jul 09 13:09:11 2010 +0100
@@ -25,7 +25,7 @@
#include <e32base.h>
#include <AudioEffectBase.h>
#include <OrientationData.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
// CLASS DECLARATION
--- a/mm_pub/audio_effects_api/inc/RoomLevelBase.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/RoomLevelBase.h Fri Jul 09 13:09:11 2010 +0100
@@ -24,7 +24,7 @@
#include <e32base.h>
#include <AudioEffectBase.h>
#include <RoomLevelData.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
const TUid KUidRoomLevelEffect = {0x10207B3C};
--- a/mm_pub/audio_effects_api/inc/SourceDopplerBase.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/SourceDopplerBase.h Fri Jul 09 13:09:11 2010 +0100
@@ -23,7 +23,7 @@
#include <e32base.h>
#include <DopplerBase.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
const TUid KUidSourceDopplerEffect = {0x10207B15};
--- a/mm_pub/audio_effects_api/inc/SourceLocationBase.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/SourceLocationBase.h Fri Jul 09 13:09:11 2010 +0100
@@ -23,7 +23,7 @@
#include <e32base.h>
#include <LocationBase.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
const TUid KUidSourceLocationEffect = {0x10203835};
--- a/mm_pub/audio_effects_api/inc/SourceOrientationBase.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/SourceOrientationBase.h Fri Jul 09 13:09:11 2010 +0100
@@ -23,7 +23,7 @@
#include <e32base.h>
#include <OrientationBase.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
const TUid KUidSourceOrientationEffect = {0x10203834};
--- a/mm_pub/audio_effects_api/inc/StereoWideningBase.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/StereoWideningBase.h Fri Jul 09 13:09:11 2010 +0100
@@ -24,7 +24,7 @@
#include <e32base.h>
#include <AudioEffectBase.h>
#include <StereoWideningData.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
const TUid KUidStereoWideningEffect = {0x10203836};
--- a/mm_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/DRMAudioPlay_core.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mm_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/DRMAudioPlay_core.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -21,6 +21,7 @@
#include <caf.h>
#include <caf/supplier.h>
#include <caf/importfile.h>
+#include <Oma2Agent.h>
#include <BAUTILS.H>
using namespace ContentAccess;
@@ -33,9 +34,6 @@
const TInt CDRMAudioPlay::KDefaultPlayDelay = 3000000;
const TInt CDRMAudioPlay::KDefaultStopOpenPlayDelay = 1000000;
const TInt CDRMAudioPlay::KDefaultReportDelay = 500000;
-
- // Taken from Oma2Agent.h
- _LIT8(KOma1XmlRoContentType, "application/vnd.oma.drm.rights+xml");
//Cases
const TInt CDRMAudioPlay::KCaseImplementationInformation = 1001;
--- a/mmlibs/mmfw/Codecs/Src/Gsm610CodecCommon/gsm610fr.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/Codecs/Src/Gsm610CodecCommon/gsm610fr.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -22,7 +22,7 @@
// a pointer codec object - have been added to some original routines.
// - Global tables are now const C++ tables in tables.h header file.
// - VAD and DTX modules have been removed from the original routines.
-// - Due to error in GNU tool chain all array indexes of type [i-1] in
+// - Due to bug in GNU tool chain all array indexes of type [i-1] in
// rpeltp.cpp have been removed and changed to [j] type.
// - multr, L_add, L_mac from basicop.cpp inlined
// INCLUDES
--- a/mmlibs/mmfw/Codecs/Src/Gsm610CodecCommon/rpeltp.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/Codecs/Src/Gsm610CodecCommon/rpeltp.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -802,7 +802,7 @@
L_result = 0;
for (k = 0; k <= 39; k++)
L_result = L_mac( L_result, wt[k], aEncoder->dp[k-lambda+120] );
- /* Borland C++ 3.1 error if -3 (386-instructions) are used.
+ /* Borland C++ 3.1 Bug if -3 (386-instructions) are used.
** The code makes error (compared to (L_result > L_max)
** comparison. The problem disapears if the result of L_sub
** is stored to variable, e.g.
--- a/mmlibs/mmfw/MIDI/src/midiclientutilitybody.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/MIDI/src/midiclientutilitybody.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -909,7 +909,7 @@
}
else
{
- // xxx - what do we do when we don't understand the error type?
+ // FIXME - what do we do when we don't understand the error type?
}
}
--- a/mmlibs/mmfw/MMPFiles/plugin_common/MmfAudioController.mmp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/MMPFiles/plugin_common/MmfAudioController.mmp Fri Jul 09 13:09:11 2010 +0100
@@ -19,13 +19,13 @@
@file
*/
-target mmfaudiowavtestcontroller.dll
+target mmfaudiocontroller.dll
CAPABILITY ALL -TCB
targettype plugin
UNPAGED
// ECom Dll recognition UID followed by the unique UID for this dll
-UID 0x10009D8D 0x2002C397
+UID 0x10009D8D 0x101F55BF
VENDORID 0x70000001
SOURCEPATH ../../src/Plugin/Controller/Audio
@@ -36,8 +36,8 @@
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-start resource 2002C397.rss
-target mmfaudiowavtestcontroller.rsc
+start resource 101F55BF.rss
+target mmfaudiocontroller.rsc
end
LIBRARY euser.lib
--- a/mmlibs/mmfw/group/bld.inf Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/group/bld.inf Fri Jul 09 13:09:11 2010 +0100
@@ -217,6 +217,7 @@
//plugin
../MMPFiles/plugin_common/MmfStdSourceAndSinkPlugin.mmp
+../MMPFiles/plugin_common/MmfAudioController.mmp //replaces wav controller
../MMPFiles/plugin_common/MMFLinearAudioCodecs.mmp
../MMPFiles/plugin_common/Gsm610.mmp
../MMPFiles/plugin_common/mmfaudiooutput.mmp
@@ -233,8 +234,3 @@
// Effects
#include "../Effect/group/Effect.inf"
-PRJ_TESTMMPFILES
-../MMPFiles/plugin_common/MmfAudioController.mmp //test wav controller
-
-PRJ_TESTEXPORTS
-../inc/mmfaudiowavtestcontroller.iby /epoc32/rom/include/mmfaudiowavtestcontroller.iby
--- a/mmlibs/mmfw/group/release.txt Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/group/release.txt Fri Jul 09 13:09:11 2010 +0100
@@ -6,7 +6,7 @@
</Description>
<Status>
-- This is release note for release of MultimediaFramework to Symbian.
+- This is release note for release of MultimediaFramework from Nile to Symbian.
- Release Date (planned):
- Release Date (actual):
@@ -31,7 +31,7 @@
Files which have been added to Continuus and files which
have been deleted:
-New Files added by Dallas:
+New Files added by Nokia Dallas:
\Include\
MdaAudioOutputStream.h
--- a/mmlibs/mmfw/inc/mmf.iby Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/inc/mmf.iby Fri Jul 09 13:09:11 2010 +0100
@@ -47,6 +47,7 @@
//RESOURCES
ECOM_PLUGIN(gsm610.dll,101f504a.rsc)
ECOM_PLUGIN(audiocodecs.dll,101f51d8.rsc)
+ECOM_PLUGIN(mmfaudiocontroller.dll,101f55bf.rsc)
ECOM_PLUGIN(mmfstdsourceandsinkplugin.dll,101f53ae.rsc)
ECOM_PLUGIN(mmfaudioinput.dll,101f53ba.rsc)
ECOM_PLUGIN(mmfaudiooutput.dll,101f53b8.rsc)
--- a/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfcontrollerframework.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfcontrollerframework.h Fri Jul 09 13:09:11 2010 +0100
@@ -394,7 +394,7 @@
TMMFMessageDestination iDestination;
/**
- Defines know about object completion state.
+ Defines whether this object has yet to be completed.
*/
TBool iAmCompleted;
};
--- a/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfcontrollerframeworkclasses.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfcontrollerframeworkclasses.h Fri Jul 09 13:09:11 2010 +0100
@@ -164,7 +164,7 @@
This method may leave with one of the system-wide error codes.
@param aMessage
- The message will be completed when an event occurs.
+ The message to be completed when an event occurs.
@return A pointer to the newly created event receiver.
@@ -196,14 +196,14 @@
Constructor.
@param aMessage
- The message will be completed when an event occurs.
+ The message to be completed when an event occurs.
@since 7.0s
*/
CMMFEventReceiver(const TMMFMessage& aMessage);
private:
/**
- The message will be completed when an event occurs.
+ The message to be completed when an event occurs.
*/
TMMFMessage iMessage;
};
@@ -429,7 +429,7 @@
@param aMessage
The request to be handled.
- @return ETrue if the message will be completed now, EFalse if the message will be completed
+ @return ETrue if the message is to be completed now, EFalse if the message will be completed
later.
*/
TBool ReceiveEventsL(TMMFMessage& aMessage);
@@ -442,7 +442,7 @@
@param aMessage
The request to be handled.
- @return ETrue if the message will be completed now, EFalse if the message will be completed later.
+ @return ETrue if the message is to be completed now, EFalse if the message will be completed later.
*/
TBool CancelReceiveEvents(TMMFMessage& aMessage);
@@ -454,7 +454,7 @@
@param aMessage
The request to be handled.
- @return ETrue if the message will be completed now, EFalse if the message will be completed later.
+ @return ETrue if the message is to be completed now, EFalse if the message will be completed later.
*/
TBool LoadControllerL(TMMFMessage& aMessage);
private:
--- a/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfdrmcustomcommands.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfdrmcustomcommands.h Fri Jul 09 13:09:11 2010 +0100
@@ -18,7 +18,7 @@
#include <e32base.h>
-#include <mmf/common/mmcaf.h>
+#include "mmf/common/mmcaf.h"
#include <mmf/common/mmfstandardcustomcommands.h>
#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
--- a/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfdrmcustomcommandsenum.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfdrmcustomcommandsenum.h Fri Jul 09 13:09:11 2010 +0100
@@ -18,7 +18,7 @@
#include <e32base.h>
-#include <mmf/common/mmcaf.h>
+#include "mmf/common/mmcaf.h"
#include <mmf/common/mmfstandardcustomcommands.h>
/**
--- a/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfdurationinfocustomcommands.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfdurationinfocustomcommands.h Fri Jul 09 13:09:11 2010 +0100
@@ -19,7 +19,7 @@
#ifdef SYMBIAN_CAF_V2
#include <e32base.h>
-#include <mmf/common/mmcaf.h>
+#include "mmf/common/mmcaf.h"
#include <mmf/common/mmfstandardcustomcommands.h>
--- a/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfstandardcustomcommands.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfstandardcustomcommands.h Fri Jul 09 13:09:11 2010 +0100
@@ -18,7 +18,7 @@
#include <mmf/common/mmfcontroller.h>
#include <mmf/common/mmfvideo.h>
-#include <mmf/common/mmcaf.h>
+#include "mmf/common/mmcaf.h"
class CMMFVideoFrameMessage;
class CFbsBitmap;
--- a/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfstandardcustomcommandsimpl.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/inc/mmf/ControllerFramework/mmfstandardcustomcommandsimpl.h Fri Jul 09 13:09:11 2010 +0100
@@ -18,7 +18,7 @@
#include <mmf/common/mmfcontroller.h>
#include <mmf/common/mmfvideo.h>
-#include <mmf/common/mmcaf.h>
+#include "mmf/common/mmcaf.h"
class CMMFVideoFrameMessage;
class CFbsBitmap;
--- a/mmlibs/mmfw/inc/mmf/server/MmfFile.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/inc/mmf/server/MmfFile.h Fri Jul 09 13:09:11 2010 +0100
@@ -20,7 +20,7 @@
#include <mmf/server/mmfclip.h>
#include <mmf/server/mmfdatabuffer.h>
-#include <mmf/common/mmcaf.h>
+#include "mmf/common/mmcaf.h"
class CReadWriteRequest;
class CTransferBufferCopy;
--- a/mmlibs/mmfw/inc/mmf/server/mmfdatapath2.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/inc/mmf/server/mmfdatapath2.h Fri Jul 09 13:09:11 2010 +0100
@@ -115,7 +115,7 @@
TTimeIntervalMicroSeconds iTrailingSilenceLeftToPlay;
/**
- The time left for the play will be completed in a particular repeat
+ The time left for the play to be completed in a particular repeat
*/
TTimeIntervalMicroSeconds iTimeLeftToPlayComplete;
--- a/mmlibs/mmfw/inc/mmfaudiowavtestcontroller.iby Fri Jul 09 12:53:09 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-// Copyright (c) 2006-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:
-//
-
-#ifndef MMFAUDIOWAVTESTCONTROLLER.IBY
-#define MMFAUDIOWAVTESTCONTROLLER.IBY
-
-ECOM_PLUGIN(mmfaudiowavtestcontroller.dll,2002C397.rsc)
-
-#endif //MMFAUDIOWAVTESTCONTROLLER.IBY
-
--- a/mmlibs/mmfw/src/Client/Audio/mmfclientaudioplayer.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/src/Client/Audio/mmfclientaudioplayer.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -1981,7 +1981,7 @@
MMMFDRMCustomCommand* CMMFMdaAudioPlayerUtility::GetDRMCustomCommand()
{
- // XXX: check controller supports MMMFDRMCustomCommandImplementor
+ // TODO: check controller supports MMMFDRMCustomCommandImplementor
if (iDRMCustomCommands.IsSupported())
{
return static_cast<MMMFDRMCustomCommand*>(&iDRMCustomCommands);
--- a/mmlibs/mmfw/src/Client/Audio/mmfclientaudiorecorder.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/src/Client/Audio/mmfclientaudiorecorder.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -1530,7 +1530,7 @@
* ConvertDescriptor
* aParam aDescriptor
* This method converts a TDesC8 to a TDes8
-* and is here to fix an interface error
+* and is here to fix an interface bug
*
**/
void CMMFMdaAudioRecorderUtility::ConvertDescriptor(const TDesC8& aDescriptor )
--- a/mmlibs/mmfw/src/Client/Audio/mmfclienttoneplayer.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/src/Client/Audio/mmfclienttoneplayer.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -860,7 +860,7 @@
void CMMFMdaAudioToneUtility::CancelPrepare()
{
- // xxx - do we need to cancel the callback? What if the callback is actually calling back another error? Probably best not to cancel...
+ // FIXME - do we need to cancel the callback? What if the callback is actually calling back another error? Probably best not to cancel...
delete iToneConfig;
iToneConfig = NULL;
--- a/mmlibs/mmfw/src/Client/Video/mediaclientvideodisplaybody.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/src/Client/Video/mediaclientvideodisplaybody.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -945,7 +945,7 @@
else if (aWindowData.iAutoScaleType == EAutoScaleNone)
{
// for non-square pixels, reduce one dimension
- // XXX other option is to enlarge in the other dimension
+ // TBD other option is to enlarge in the other dimension
if(pixelAspectRatio > 1)
{
inputHeight /= pixelAspectRatio;
--- a/mmlibs/mmfw/src/Client/Video/mmfclientvideoplayerbody.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/src/Client/Video/mmfclientvideoplayerbody.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -1007,7 +1007,7 @@
MMMFDRMCustomCommand* CVideoPlayerUtility::CBody::GetDRMCustomCommand()
{
- // XXX: check controller supports MMMFDRMCustomCommandImplementor
+ // TODO: check controller supports MMMFDRMCustomCommandImplementor
TInt error = iDRMCustomCommands.EvaluateIntent(ContentAccess::EPeek);
if (error==KErrNone)
{
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/src/Plugin/Controller/Audio/101F55BF.rss Fri Jul 09 13:09:11 2010 +0100
@@ -0,0 +1,44 @@
+// Copyright (c) 2002-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:
+// Copied from... Registry file for the Example Interface Implementation Collection
+//
+//
+
+#include <ecom/registryinfo.rh>
+#include <mmf/plugin/mmfplugininterfaceuids.hrh>
+#include <mmf/plugin/mmfcontrollerimplementationuids.hrh>
+
+RESOURCE REGISTRY_INFO theInfo
+ {
+ dll_uid = 0x101F55BF;
+ interfaces =
+ {
+ INTERFACE_INFO
+ {
+ interface_uid = KMmfUidPluginInterfaceController ;
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = KMmfUidControllerAudio ;
+ version_no = 1;
+ display_name = "Symbian Audio controller";
+ default_data = "?";
+ opaque_data = "<s>Symbian<n>yes<i>0x101F5D07<d>";//All format support comes from Format Plugins //<n>yes indicates controller has no url handling capability.
+ }
+ };
+ }
+ };
+ }
+
--- a/mmlibs/mmfw/src/Plugin/Controller/Audio/2002C397.rss Fri Jul 09 12:53:09 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-// Copyright (c) 2002-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:
-// Copied from... Registry file for the Example Interface Implementation Collection
-//
-//
-
-#include <ecom/registryinfo.rh>
-#include <mmf/plugin/mmfplugininterfaceuids.hrh>
-#include <mmf/plugin/mmfcontrollerimplementationuids.hrh>
-
-RESOURCE REGISTRY_INFO theInfo
- {
- dll_uid = 0x2002C397;
- interfaces =
- {
- INTERFACE_INFO
- {
- interface_uid = KMmfUidPluginInterfaceController ;
- implementations =
- {
- IMPLEMENTATION_INFO
- {
- implementation_uid = KMmfUidControllerAudio ;
- version_no = 1;
- display_name = "Symbian Audio Wav Test controller";
- default_data = "?";
- opaque_data = "<s>Symbian<n>yes<i>0x101F5D07<d>";//All format support comes from Format Plugins //<n>yes indicates controller has no url handling capability.
- }
- };
- }
- };
- }
-
--- a/mmlibs/mmfw/src/Plugin/StdSourceAndSink/FileAccess.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/src/Plugin/StdSourceAndSink/FileAccess.h Fri Jul 09 13:09:11 2010 +0100
@@ -18,7 +18,7 @@
#include <caf/content.h>
#include <caf/data.h>
-#include <mmf/common/mmcaf.h>
+#include "mmf/common/mmcaf.h"
// Abstract class providing generic file access
class MGenericFile
@@ -130,9 +130,8 @@
HBufC* iFilePath;
ContentAccess::CData* iData;
- RFile iLegacyFile;
- RFile64 iFile64; //For defect EASA-84ZC6J
- TBool iLegacyFileOpen;
+ RFile iLegacyFile;
+ TBool iLegacyFileOpen;
};
--- a/mmlibs/mmfw/src/Plugin/StdSourceAndSink/Mmffile.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/src/Plugin/StdSourceAndSink/Mmffile.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -211,7 +211,7 @@
}
else
{
-// XXX If the UID is unknown we should reject, but currently
+// TODO If the UID is unknown we should reject, but currently
// code also used for older calls that just supply filename.
// User::Leave(KErrNotSupported);
}
--- a/mmlibs/mmfw/src/Plugin/StdSourceAndSink/fileaccess.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/src/Plugin/StdSourceAndSink/fileaccess.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -14,7 +14,6 @@
//
#include <f32file.h>
-#include <f32file64.h>
#include <e32std.h>
#include <caf/attribute.h>
#include <caf/bitset.h>
@@ -148,10 +147,9 @@
CContentFile::~CContentFile()
{
delete iData;
-
- iLegacyFile.Close();
- iFile64.Close(); //For defect EASA-84ZC6J
-
+
+ if (iLegacyFileOpen)
+ iLegacyFile.Close();
delete iFilePath;
}
@@ -271,35 +269,12 @@
RFile& CContentFile::FileL()
{
if (!iLegacyFileOpen)
- {//For defect EASA-84ZC6J
- TInt error = iLegacyFile.Open(*iSession, *iFilePath, EFileRead | EFileStream | EFileShareReadersOrWriters);
- if ( error == KErrTooBig )
- {
- User::LeaveIfError(iFile64.Open(*iSession, *iFilePath, EFileRead | EFileStream | EFileShareReadersOrWriters));
- iLegacyFileOpen = ETrue;
- return iFile64;
- }
-
- else if (error == KErrNone)
- {
- iLegacyFileOpen = ETrue;
- return iLegacyFile;
- }
-
- else
- {
- User::Leave(error);
- }
+ {
+ User::LeaveIfError(iLegacyFile.Open(*iSession, *iFilePath, EFileRead | EFileStream | EFileShareReadersOrWriters));
+ iLegacyFileOpen = ETrue;
}
- if(iLegacyFile.SubSessionHandle())
- {
- return iLegacyFile;
- }
- else
- {
- return iFile64;
- }
-}
+ return iLegacyFile;
+ }
TInt CContentFile::Data(CData*& aData)
{
--- a/mmlibs/mmfw/src/utils/audioutils/rateconvert.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/src/utils/audioutils/rateconvert.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -219,7 +219,7 @@
TInt rawValue = aBufferLength;
ASSERT(iFromRate < iToRate); // should not be called otherwise
// upsample - will generate more data. use floats to avoid extra round error
- rawValue = TInt(rawValue * TReal(iToRate) / TReal(iFromRate) + 0.5) + 4*sizeof(TInt16); // add some buffer extra buffer
+ rawValue = TInt(rawValue * TReal(iToRate) / TReal(iFromRate) + 0.5) + 4*sizeof(TInt16); // add some fudge factor just in case
rawValue = NextPowerUp(rawValue); // when upscaling always give nice power
return rawValue;
}
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/OpenFileByHandle7805.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/OpenFileByHandle7805.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -59,7 +59,7 @@
TInt failCount = 1;
TBool completed = EFalse;
- iAllocTestStepResult = EPass; // XXX check?? assume pass
+ iAllocTestStepResult = EPass; // TODO check?? assume pass
TBool reachedEnd = EFalse; // Note: declare outside loop to help with debugging
aPlayer->UseSharedHeap(); //-Enable UseSharedHeap to test controller alloc failures
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/OpenFileByHandle7806.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/OpenFileByHandle7806.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -57,7 +57,7 @@
TInt failCount = 1;
TBool completed = EFalse;
- iAllocTestStepResult = EPass; // XXX check?? assume pass
+ iAllocTestStepResult = EPass; // TODO check?? assume pass
TBool reachedEnd = EFalse; // Note: declare outside loop to help with debugging
for(;;)
{
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/OpenFileByHandle7908.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/OpenFileByHandle7908.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -67,7 +67,7 @@
TInt failCount = 0;//total fail count for all the steps = sum of fail counts in each step
TInt stepFailCount; //fail count in each step
- TVerdict iAllocTestStepResult = EPass; // XXX check?? assume pass
+ TVerdict iAllocTestStepResult = EPass; // TODO check?? assume pass
err = PerformTestStep(1, stepFailCount);
failCount += stepFailCount;
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/TestConverter.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/TestConverter.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -177,7 +177,7 @@
INFO_PRINTF1( _L("Convert CMdaAudioConvertUtility"));
CActiveScheduler::Start();
- // XXX Improve test. e.g. check that a valid AU file is written
+ // TODO Improve test. e.g. check that a valid AU file is written
if(iError == KErrNone)
{
ret = EPass;
@@ -192,7 +192,7 @@
{
CActiveScheduler::Start();
- // XXX Improve test. e.g. check that a valid AU file is written
+ // TODO Improve test. e.g. check that a valid AU file is written
if(iError == KErrNone)
{
ret = EPass;
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/TestPlayerUtils.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/TestPlayerUtils.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -1423,7 +1423,7 @@
INFO_PRINTF2( _L("Volume: Max Volume = %d"),iVolume);
//on device & emulator KMaxVolume have different values
- //if(iVolume != KMaxVolume) // XXX: how to cross ref. this appears to be random values at the moment
+ //if(iVolume != KMaxVolume) // TODO: how to cross ref. this appears to be random values at the moment
// {
// INFO_PRINTF3( _L("Expected volume: %d, received volume : %d"),
// KMaxVolume, iVolume);
@@ -2111,8 +2111,8 @@
// what code should/might look like.
//CMdaAudioType* type = aPlayer->TypeL();
- // CMdaAudioType class not complete:
- // XXX check data returned is valid???
+ // CMdaAudioType class incomplete:
+ // TODO check data returned is valid???
return ret;
}
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/TestRecorder.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/TestRecorder.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -1303,7 +1303,7 @@
TUint sampleRate = recUtil->DestinationSampleRateL();
TUint bitRate = recUtil->DestinationBitRateL();
- //xxx work around for GSM which returns zero as the bit rate because internally
+ // hack for GSM which returns zero as the bit rate because internally
// BitsPerSample is zero
if (bitRate==0)
{
@@ -5698,7 +5698,7 @@
}
- //xxx try cotinuing playing and get positions while playing if there is more time.
+ //try cotinuing playing and get positions while playing if there is more time. TBD
INFO_PRINTF1(_L("finished with this test step"));
// test steps return a result
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/Ctlfrm/TSI_MmfCtlfrmNeg.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/Ctlfrm/TSI_MmfCtlfrmNeg.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -278,7 +278,7 @@
TVerdict RTestMmfCtlfrmI0513::DoTestStepL()
{
- //XXX : we may have problems here. the only controller we have is the
+ // *** TODO : we may have problems here. the only controller we have is the
// Audio Controller and this does not yet support removal of sources/sinks,
// whether it's playing or not...
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideoplayer.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideoplayer.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -1819,7 +1819,7 @@
TInt failCount = 1;
TBool completed = EFalse;
- iAllocTestStepResult = EPass; // XXX check?? assume pass
+ iAllocTestStepResult = EPass; // TODO check?? assume pass
TBool reachedEnd = EFalse; // Note: declare outside loop to help with debugging
for(;;)
{
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideorecorder.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideorecorder.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -1628,7 +1628,7 @@
TInt failCount = 1;
TBool completed = EFalse;
- iAllocTestStepResult = EPass; // XXX check?? assume pass
+ iAllocTestStepResult = EPass; // TODO check?? assume pass
TBool reachedEnd = EFalse; // Note: declare outside loop to help with debugging
for(;;)
{
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/tsi_mmf_vclntavi_stepbase.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/tsi_mmf_vclntavi_stepbase.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -491,7 +491,7 @@
iWindow->SetRequiredDisplayMode(EColor16MA); // Need to use alpha.
iWindow->SetSizeErr(iScreen->SizeInPixels());
- // XXX: This will not be needed when surfaces are displayed above the window background colour.
+ // TODO: This will not be needed when surfaces are displayed above the window background colour.
iWindow->SetBackgroundColor(TRgb(0x000000, 0)); // use transparent black as the background colour.
iWindow->BeginRedraw();
iWindow->EndRedraw();
--- a/mmlibs/mmfw/tsrc/mmfunittest/AFMT/TSU_MMF_AFMT.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/AFMT/TSU_MMF_AFMT.h Fri Jul 09 13:09:11 2010 +0100
@@ -191,7 +191,7 @@
void CreateEncodeObjectL(TBool aIsFile, const TDesC& aFilename, TInt aUid);
//from MAsyncEventHandler
- virtual TInt SendEventToClient(const TMMFEvent& /*aEvent*/) {return KErrNone;}//XXX - can we do better here?
+ virtual TInt SendEventToClient(const TMMFEvent& /*aEvent*/) {return KErrNone;}//FIXME - can we do better here?
protected:
--- a/mmlibs/mmfw/tsrc/mmfunittest/AFMT/TSU_MMF_AFMT_TestSteps.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/AFMT/TSU_MMF_AFMT_TestSteps.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -1566,7 +1566,7 @@
User::Leave(KErrCorrupt); //should never get here
}
- // pretty sure the process is not completed but we do not care since
+ // pretty sure the process is incomplete but we do not care since
// we are interested in writing one good buffer of data to the sink
CleanupStack::Pop(dstBuffer);
--- a/mmlibs/mmfw/tsrc/mmfunittest/AFMT/TestDataSource/TSU_MMF_AFMT_TestDataSource.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/AFMT/TestDataSource/TSU_MMF_AFMT_TestDataSource.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -91,7 +91,7 @@
return NULL;
}
- //XXX optimal source buffer size creation may depend on the sink buffer & vice versa
+ //[TBD] optimal source buffer size creation may depend on the sink buffer & vice versa
CMMFBuffer* MMFTestDataSource::CreateSourceBufferL(TMediaId aMediaId, CMMFBuffer& /*aSinkBuffer*/, TBool &aReference)
{
return CreateSourceBufferL(aMediaId, aReference);
--- a/mmlibs/mmfw/tsrc/mmfunittest/AFMT/TestDataSource/TSU_MMF_AFMT_TestDataSource.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/AFMT/TestDataSource/TSU_MMF_AFMT_TestDataSource.h Fri Jul 09 13:09:11 2010 +0100
@@ -55,7 +55,7 @@
virtual TBool CanCreateSourceBuffer();
virtual CMMFBuffer* CreateSourceBufferL(TMediaId /*aMediaId*/, TBool &aReference);
- //XXX optimal source buffer size creation may depend on the sink buffer & vice versa
+ //[TBD] optimal source buffer size creation may depend on the sink buffer & vice versa
virtual CMMFBuffer* CreateSourceBufferL(TMediaId aMediaId, CMMFBuffer& /*aSinkBuffer*/, TBool &aReference);
virtual TInt SourceThreadLogon(MAsyncEventHandler& /*aEventHandler*/);
--- a/mmlibs/mmfw/tsrc/mmfunittest/Actrl/TestStepActrlPlay.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/Actrl/TestStepActrlPlay.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -187,7 +187,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -287,7 +287,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -436,7 +436,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -600,7 +600,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -768,7 +768,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1041,7 +1041,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
--- a/mmlibs/mmfw/tsrc/mmfunittest/Actrl/TestStepActrlRecord.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/Actrl/TestStepActrlRecord.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -225,7 +225,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -364,7 +364,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -579,7 +579,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -700,7 +700,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -829,7 +829,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -999,7 +999,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1338,7 +1338,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1425,7 +1425,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1659,7 +1659,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
--- a/mmlibs/mmfw/tsrc/mmfunittest/Actrl/TestStepController.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/Actrl/TestStepController.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -212,7 +212,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -367,7 +367,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -524,7 +524,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -585,7 +585,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
--- a/mmlibs/mmfw/tsrc/mmfunittest/Actrl/TestStepsGetSet.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/Actrl/TestStepsGetSet.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -132,7 +132,7 @@
}
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is an error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -274,7 +274,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -383,7 +383,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -474,7 +474,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -575,7 +575,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -682,7 +682,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -820,7 +820,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -923,7 +923,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1001,7 +1001,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1131,7 +1131,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1228,7 +1228,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1322,7 +1322,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1456,7 +1456,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1595,7 +1595,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1737,7 +1737,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1866,7 +1866,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -1958,7 +1958,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -2045,7 +2045,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -2159,7 +2159,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -2348,7 +2348,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -2480,7 +2480,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -2584,7 +2584,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -2721,7 +2721,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -2850,7 +2850,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
--- a/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/TestInterface/TSU_MMF_DEVSOUND_TestInterface.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/TestInterface/TSU_MMF_DEVSOUND_TestInterface.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -195,7 +195,7 @@
void CMMF_TSU_DEVSOUND_TestInterfaceMux::DoCancel()
{
- // XXX - do we need to send a cancel message to the DeMux plugin?
+ // TODO - do we need to send a cancel message to the DeMux plugin?
if (iClientStatus->Int() == KRequestPending)
{
User::RequestComplete(iClientStatus, KErrCancel);
--- a/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/TestInterface1/TSU_MMF_DEVSOUND_TestInterface1.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/TestInterface1/TSU_MMF_DEVSOUND_TestInterface1.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -196,7 +196,7 @@
void CMMF_TSU_DEVSOUND_TestInterface1Mux::DoCancel()
{
- // XXX - do we need to send a cancel message to the DeMux plugin?
+ // TODO - do we need to send a cancel message to the DeMux plugin?
if (iClientStatus->Int() == KRequestPending)
{
User::RequestComplete(iClientStatus, KErrCancel);
--- a/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/src/TSU_MMF_DEVSOUND_STEP.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/src/TSU_MMF_DEVSOUND_STEP.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -11182,7 +11182,7 @@
{
iBuffer->SetLastBuffer (ETrue);
}
- INFO_PRINTF1(_L("CMMFDevSound::PlayData")); //XXX tidy up
+ INFO_PRINTF1(_L("CMMFDevSound::PlayData")); //todo tidy up
iMMFDevSound->PlayData();
}
else if ((aDevSoundEvent == EEventTimerComplete) && (aError == KErrNone))
--- a/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/MidiTestCntrl/Ts_cmmfmiditestcontroller.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/MidiTestCntrl/Ts_cmmfmiditestcontroller.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -148,8 +148,7 @@
{
}
-
-void CMMFMidiTestController::ResetL() //XXX - replacement for RemoveSourceSink()
+void CMMFMidiTestController::ResetL() //FIXME - replacement for RemoveSourceSink()
{
}
--- a/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/MidiTestCntrl/Ts_cmmfmiditestcontroller.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/MidiTestCntrl/Ts_cmmfmiditestcontroller.h Fri Jul 09 13:09:11 2010 +0100
@@ -48,7 +48,7 @@
virtual void RemoveDataSourceL(MDataSource& aDataSource);
virtual void RemoveDataSinkL(MDataSink& aDataSink);
virtual void RemoveSourceSinkL();
- virtual void ResetL();//XXX - replacement for RemoveSourceSink()
+ virtual void ResetL();//FIXME - replacement for RemoveSourceSink()
virtual void PrimeL();
virtual void PlayL();
virtual void PauseL();
--- a/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/TSU_MMFMIDICLNT.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/TSU_MMFMIDICLNT.h Fri Jul 09 13:09:11 2010 +0100
@@ -40,7 +40,7 @@
#include <midiclientutility.h>
#include <mmf/common/mmfcontrollerframework.h>
-// Uncomment this line for Jet-stream project
+// Uncomment this line for Jetstream project
//#define JETSTREAM_TESTS 1
class CTestSuite ;
--- a/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/TestMidiClientUtility.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/TestMidiClientUtility.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -962,7 +962,7 @@
break;
case ETestBeatsHighOutOfRange:
expErr = KErrArgument;
- //microBeatsPerMinute = 1000001*1000000; XXX overflow warning
+ //microBeatsPerMinute = 1000001*1000000; FIXME overflow warning
microBeatsPerMinute = 1000001;
break;
default:
@@ -1342,8 +1342,8 @@
return EInconclusive;
}
- //TRAPD(err, TDesC8 mimeType = aMidi->MimeTypeL());//XXX: TDesC8 mimeType has to be define above
- TRAPD(err, aMidi->MimeTypeL());//XXX: TDesC8 mimeType has to be define above
+ //TRAPD(err, TDesC8 mimeType = aMidi->MimeTypeL());//FIXME: TDesC8 mimeType has to be define above
+ TRAPD(err, aMidi->MimeTypeL());//FIXME: TDesC8 mimeType has to be define above
if (expErr != err)
{
ERR_PRINTF3(_L("MimeTypeL gave error %d (expected %d)"),err, expErr);
@@ -1772,7 +1772,7 @@
break;
case ETestUnsupported:
- // XXX : values defined as unsupported?
+ // TODO : values defined as unsupported?
mipEntry1.iChannel = 0;
mipEntry1.iMIPValue = 0;
mipEntry2.iChannel = 0;
@@ -1783,7 +1783,7 @@
break;
case ETestCorrupt:
- // XXX : values defined as corrupt?
+ // TODO : values defined as corrupt?
mipEntry1.iChannel = -1;
mipEntry1.iMIPValue = -1;
mipEntry2.iChannel = -1;
@@ -3055,7 +3055,7 @@
// we modify the test spec to go with this?
case ETestOutOfRange:
expErr = KErrArgument;
- //repeats = 9999; // ** XXX : max. range of repeats?
+ //repeats = 9999; // ** TBD : max. range of repeats?
repeats = -1;
silentTime = 1000000;
break;
@@ -4005,7 +4005,7 @@
const TDesC8* ptrInstrument = &KNullDesC8;
const TDesC8* ptrBadInstrument = &KNullDesC8;
- // XXX::When we have a MIDI instrument / controller load the instrument
+ // TODO::When we have a MIDI instrument / controller load the instrument
// into the descriptor here.
// expected results
--- a/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/TestStepMidiClntAllocFailNew.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/TestStepMidiClntAllocFailNew.h Fri Jul 09 13:09:11 2010 +0100
@@ -20,7 +20,7 @@
/**
*
- * XXX
+ * FIXME
*
* @lib ""
*
Binary file mmlibs/mmfw/tsrc/mmfunittest/Recogniser/Data/common/readme.rtf has changed
--- a/mmlibs/mmfw/tsrc/mmfunittest/SwCodecDevices/TSU_MMF_ACOD_BASE.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/SwCodecDevices/TSU_MMF_ACOD_BASE.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -139,7 +139,7 @@
aFilename.Append(KPCM16ToPCM16BComparisonFile);
break;
- //xxx GK
+ //[< Fix Me GK ]
//case KMMFUidHwDevicePCM16toPCMU16B ://KMMFUidHwDevicePCM16toPCMU16B:
// aFilename.Copy(KComparisonFilesDir);
// aFilename.Append(KPCM16ToPCMU16BComparisonFile);
--- a/mmlibs/mmfw/tsrc/mmfunittest/SwCodecDevices/TSU_MMF_SWCODECDEVICES.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/SwCodecDevices/TSU_MMF_SWCODECDEVICES.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -136,7 +136,7 @@
const TInt srcBufferSize = theEncode.SourceBufferSize();
const TInt sinkBufferSize = theEncode.SinkBufferSize();
const TInt codedBufferSize = 76*4* KNumFramesInABuffer; // number of coded buffers * size of coded buffer 63*2
- iNumCodedFrames = KNumFramesInABuffer; //XXX claculate these constants soon <GK>
+ iNumCodedFrames = KNumFramesInABuffer; // claculate these constants soon <TODO GK>
iScratchData = CMMFDescriptorBuffer::NewL( codedBufferSize);
@@ -845,7 +845,7 @@
const TInt srcBufferSize = theCodec.SourceBufferSize();
const TInt sinkBufferSize = theCodec.SinkBufferSize();
const TInt codedBufferSize = 76*4* KNumFramesInABuffer; // number of coded buffers * size of coded buffer 63*2
- iNumCodedFrames = KNumFramesInABuffer; //XXX claculate these constants soon <GK>
+ iNumCodedFrames = KNumFramesInABuffer; // claculate these constants soon <TODO GK>
iScratchData = CMMFDescriptorBuffer::NewL( codedBufferSize);
--- a/mmlibs/mmfw/tsrc/mmfunittest/VCLNT/TSU_MMF_VCLNT_01/TestStepVidPlayerDrm.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/VCLNT/TSU_MMF_VCLNT_01/TestStepVidPlayerDrm.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -26,7 +26,7 @@
//
// Literals
//
-//_LIT(KConfigFile, "video.ini"); // config file for this test - XXX use script to load video.ini
+//_LIT(KConfigFile, "video.ini"); // config file for this test - TODO use script to load video.ini
_LIT(KSectionDrm, "SectionDRM"); // video.ini section
_LIT(KEntryFileRights, "VideoContent"); // video.ini filename entry
_LIT(KEntryFileNoRights, "VideoContentNoRights"); // video.ini filename entry
@@ -442,7 +442,7 @@
iFile.Close();
iFs.Close();
- UnloadConfig(); // XXX use script to load video.ini
+ UnloadConfig(); // TODO use script to load video.ini
// Destroy the scheduler
return CTestStepUnitMMFVidClient::DoTestStepPostambleL();
--- a/mmlibs/mmfw/tsrc/mmfunittest/VCLNT/TSU_MMF_VCLNT_01/TestStepVidRecorderManip.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/VCLNT/TSU_MMF_VCLNT_01/TestStepVidRecorderManip.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -699,7 +699,7 @@
// TInt err;
// err = KErrNone; // EABI warning removal
- // do the priority test. XXX
+ // do the priority test. TBD
delete iRecorder;
iRecorder = NULL;
@@ -2392,7 +2392,7 @@
if (err != KErrNone)
return EFail;
- // XXX
+ // TBD
//RArray<TFourCC> vidTypes;
//TRAP(err, GetSupportedAudioTypesL(vidTypes) );
//else if (err != KErrNone)
--- a/mmlibs/mmfw/tsrc/mmfunittest/VCLNT/TS_CMMFVideoTestController/Ts_cmmfvideotestcontroller.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/VCLNT/TS_CMMFVideoTestController/Ts_cmmfvideotestcontroller.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -318,7 +318,7 @@
User::Leave(KErrNotSupported);
}
-void CMMFTestController::ResetL() //XXX - replacement for RemoveSourceSink()
+void CMMFTestController::ResetL() //FIXME - replacement for RemoveSourceSink()
{
_LIT8(KFuncText, "ResetL Called");
iMemFunctionText = KFuncText;
@@ -703,7 +703,7 @@
if (aRampDuration.Int64() == 10)
{
- // XXX, check it's the correct value
+ // FIXME, check it's the correct value
}
}
@@ -714,7 +714,7 @@
if (aBalance == 10)
{
- //XXX, check it's the correct value
+ //FIXME, check it's the correct value
}
}
@@ -762,7 +762,7 @@
if (aBalance == 8)
{
- // XXX, check it's the correct value
+ // FIXME, check it's the correct value
}
}
--- a/mmlibs/mmfw/tsrc/mmfunittest/VCLNT/TS_CMMFVideoTestController/Ts_cmmfvideotestcontroller.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/VCLNT/TS_CMMFVideoTestController/Ts_cmmfvideotestcontroller.h Fri Jul 09 13:09:11 2010 +0100
@@ -124,7 +124,7 @@
virtual void RemoveDataSourceL(MDataSource& aDataSource);
virtual void RemoveDataSinkL(MDataSink& aDataSink);
virtual void RemoveSourceSinkL();
- virtual void ResetL();//XXX - replacement for RemoveSourceSink()
+ virtual void ResetL();//FIXME - replacement for RemoveSourceSink()
virtual void PrimeL();
virtual void PlayL();
virtual void PauseL();
--- a/mmlibs/mmfw/tsrc/mmfunittest/VCLNT/TS_VideoInput/MmfVideoInput.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/VCLNT/TS_VideoInput/MmfVideoInput.h Fri Jul 09 13:09:11 2010 +0100
@@ -87,11 +87,11 @@
virtual void BufferEmptiedL(CMMFBuffer* aBuffer); //called by MDataSink to pass back emptied buffer to the source
virtual TBool CanCreateSourceBuffer();
virtual CMMFBuffer* CreateSourceBufferL(TMediaId /*aMediaId*/);
- //XXX optimal source buffer size creation may depend on the sink buffer & vice versa
+ //[TBD] optimal source buffer size creation may depend on the sink buffer & vice versa
virtual CMMFBuffer* CreateSourceBufferL(TMediaId aMediaId, CMMFBuffer& /*aSinkBuffer*/)
{return CreateSourceBufferL(aMediaId);};
virtual CMMFBuffer* CreateSourceBufferL(TMediaId /*aMediaId*/, TBool &aReference);
- //XXX optimal source buffer size creation may depend on the sink buffer & vice versa
+ //[TBD] optimal source buffer size creation may depend on the sink buffer & vice versa
virtual CMMFBuffer* CreateSourceBufferL(TMediaId aMediaId, CMMFBuffer& /*aSinkBuffer*/, TBool &aReference)
{return CreateSourceBufferL(aMediaId, aReference);};
virtual TInt SourceThreadLogon(MAsyncEventHandler& aEventHandler);
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TESTSTEPRecorderVARIOUS.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TESTSTEPRecorderVARIOUS.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -44,7 +44,7 @@
#include "mmfclientaudiorecorder.h"
#include "../../ctlfrm/TS_Codes.h"
-_LIT(KAudioControllerName,"Symbian Audio Wav Test controller");
+_LIT(KAudioControllerName,"Symbian Audio controller");
//
//
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepAudInStream.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepAudInStream.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -2708,7 +2708,7 @@
void CTestStepAudInStreamTestReqStop::KickoffTestL()
{
- INFO_PRINTF1(_L("DEF095804 CMdaAudioInputStream loses not complete buffers from DevSound"));
+ INFO_PRINTF1(_L("DEF095804 CMdaAudioInputStream loses incomplete buffers from DevSound"));
INFO_PRINTF1(_L("Calls RequestStop to ensure no data is lost."));
CTestStepAudInStreamAsyncTestStep::KickoffTestL();
@@ -2822,7 +2822,7 @@
void CTestStepAudInStreamTestReqStopThenStop::KickoffTestL()
{
- INFO_PRINTF1(_L("DEF095804 CMdaAudioInputStream loses not complete buffers from DevSound"));
+ INFO_PRINTF1(_L("DEF095804 CMdaAudioInputStream loses incomplete buffers from DevSound"));
INFO_PRINTF1(_L("Calls RequestStop then Stop to ensure correct operation."));
CTestStepAudInStreamAsyncTestStep::KickoffTestL();
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepAudOutStream.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepAudOutStream.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -1790,7 +1790,7 @@
else
iTestStepResult = EPass;
- //xxx try cotinuing playing and get positions while playing if there is more time.
+ //try cotinuing playing and get positions while playing if there is more time. TBD
INFO_PRINTF1(_L("finished with this test step"));
// test steps return a result
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepConvertVarious.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepConvertVarious.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -43,7 +43,7 @@
#include "mmfclientaudioplayer.h"
#include "../../ctlfrm/TS_Codes.h"
-_LIT(KAudioControllerName,"Symbian Audio Wav Test controller");
+_LIT(KAudioControllerName,"Symbian Audio controller");
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepPlayerRepeats.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepPlayerRepeats.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -192,7 +192,7 @@
iPlayer->SetRepeats(0, TTimeIntervalMicroSeconds(0) );
// use the following line to check that test silence > KMaxTInt is supported
- // removed because it will take > 35 minutes
+ // commented out because it will take > 35 minutes
// iPlayer->SetRepeats(1, TTimeIntervalMicroSeconds(TInt64(KMaxTInt) + 10000000));
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepPlayerVarious.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepPlayerVarious.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -45,7 +45,7 @@
#include "mmfclientaudioplayer.h"
#include "../../ctlfrm/TS_Codes.h"
-_LIT(KAudioControllerName,"Symbian Audio Wav Test controller");
+_LIT(KAudioControllerName,"Symbian Audio controller");
// --------------------------------------------
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepRecorderCrop.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepRecorderCrop.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -67,7 +67,7 @@
// Orig duration = 1000120 Us, 90% = 900108 Us; @8KHz, 16bits, 1 channel = 14400 bytes (aligned to sample)
const TInt KExpectedCropSize1 = 14400 + 44;
-// Second crop - original duration is still taken from source (known error) = 10000120 Us.
+// Second crop - original duration is still taken from source (known bug) = 10000120 Us.
//Therefore crop point = 40% of 10000120 Us = 400048 Us.
//Crop from begining to 400048Us with @8KHz, 16bits, 1 channel = 6400 bytes (aligned to sample).
//New file = KExpectedCropSize1 - 6400 = 8046
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepRecorderRepeats.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepRecorderRepeats.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -187,7 +187,7 @@
TVerdict CTestStepRecorderRepeats::DoTestStepL()
{
// use the following test to check that test silence > KMaxTInt is supported
- // removed because it will take > 35 minutes
+ // commented out because it will take > 35 minutes
/*
iRecorder = CMMFMdaAudioRecorderUtility::NewL(*this);
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepUnitMMFAudClient.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepUnitMMFAudClient.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -174,7 +174,7 @@
delete iScheduler ;
iScheduler = NULL;
- // XXX: determine whether this is reasonable: allow ECOM, et al to shut down properly
+ // FIXME: determine whether this is reasonable: allow ECOM, et al to shut down properly
// it is rather horrible, but it may not be an issue at all (just a side affect of the whole
// EXE test bed structure
User::After(1000000);
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestSuiteUnitMMFAudClient.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestSuiteUnitMMFAudClient.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -491,7 +491,7 @@
AddTestStepL(CTestStepAudInStreamTestBitrate::NewL());
// Test Stop procedures of InputStream
- // DEF095804 CMdaAudioInputStream loses not complete buffers from DevSound
+ // DEF095804 CMdaAudioInputStream loses incomplete buffers from DevSound
AddTestStepL(CTestStepAudInStreamTestReqStop::NewL(this));
AddTestStepL(CTestStepAudInStreamTestReqStopThenStop::NewL(this));
//PDEF121312:CMMFMdaAudioInputStream::BufferToBeEmptied() might delete an invalid pointer
--- a/mmlibs/mmfw/tsrc/mmfunittest/avictrl/tsu_mmf_avictrl_testsuite.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/avictrl/tsu_mmf_avictrl_testsuite.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -116,7 +116,7 @@
AddTestStepL( new(ELeave) RTestStepAviCtrlPlayInvalid(_L("MM-MMF-AVICTRL-U-0018-HP"), _L("SectionPlayer"), _L("invalid"), KAviPlayControllerUid));
AddTestStepL( new(ELeave) RTestStepAviCtrlNotAudioEnabled(_L("MM-MMF-AVICTRL-U-0019-HP"), _L("SectionPlayer"), _L("video_only"), KAviPlayControllerUid));
AddTestStepL( new(ELeave) RTestStepAviCtrlDirectScreenAccess(_L("MM-MMF-AVICTRL-U-0020-HP"), _L("SectionPlayer"), _L("video_only"), KAviPlayControllerUid));
- // XXX: MM-MMF-AVICTRL-U-0021-HP identifier is duplicated, should be fixed
+ // TODO: MM-MMF-AVICTRL-U-0021-HP identifier is duplicated, should be fixed
AddTestStepL( new(ELeave) RTestStepAviCtrlSetPlayWindow(_L("MM-MMF-AVICTRL-U-0021-HP"), _L("SectionPlayer"), _L("video_only"), KAviPlayControllerUid));
// NOTE: More PlayController test steps follow at the bottom...
--- a/mmlibs/mmfw/tsrc/mmfunittest/avictrl/tsu_mmf_avictrlplay.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/avictrl/tsu_mmf_avictrlplay.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -2318,7 +2318,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -2430,7 +2430,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
@@ -2531,7 +2531,7 @@
//[ ensure the controller is unloaded so that it does
// not interfere with the following test ]
- // There is error in this code and the stop followed by reset
+ // There is a bug in this code and the stop followed by reset
// ensure the controller resources are released.
iController.Stop();
iController.Reset();
--- a/mmlibs/mmfw/tsrc/mmfunittest/basecl/TSU_BASECL_TestSrcSink/TSU_MMF_BASECL_TestSrcSink.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/basecl/TSU_BASECL_TestSrcSink/TSU_MMF_BASECL_TestSrcSink.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -400,7 +400,7 @@
if (buf)
{
- //XXX Remove this line when DP EInitializeSink state has been removed
+ //FIXME Remove this line when DP EInitializeSink state has been removed
//This is still present in the dataPath and may remain in for Typhoon
//Probably won't be removed till Jetstream
if ((buf->FrameNumber() == 0) && (buf->Data().Length() == 0))
--- a/mmlibs/mmfw/tsrc/mmfunittest/basecl/TSU_MMF_BASECL_DataPath.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/basecl/TSU_MMF_BASECL_DataPath.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -216,8 +216,8 @@
delete iTestAsyncEventHandler;
delete iActiveScheduler;
-// xxx free ecom resources This should fix EFail on test 200
-// this line is currently removed as the ECom fix is in mainline
+// free ecom resources This should fix EFail on test 200
+// this line is currently commented out as the ECom fix is in mainline
// but not yet in a hurricane build
// REComSession::FinalClose();
--- a/mmlibs/mmfw/tsrc/mmfunittest/basecl/TSU_MMF_BASECL_TransferBuffers.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/basecl/TSU_MMF_BASECL_TransferBuffers.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -956,9 +956,9 @@
delete mmfTransferBuffer;
- /*XXX This test does not use the full heap count test
+ /* This test does not use the full heap count test
* this should not matter as a CMMFTransferBuffer NewL() only makes a single heap allocation
- * I could not get the full test working - see commented below
+ * I could not get the full test working - see commented out below
* but the problem was with the transfer buffer tester client/server -not
* with the CMMFTransfeBuffer alloction - which I could not get to work */
--- a/mmlibs/mmfw/tsrc/mmfunittest/ctlfrm/TS_CMMFTestController/Ts_cmmftestcontroller.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/ctlfrm/TS_CMMFTestController/Ts_cmmftestcontroller.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -101,7 +101,7 @@
AddCustomCommandParserL(*audConParser);
CleanupStack::Pop();//audConParser
-/*XXX - need to put this back in when the video custom commands have stabilised.
+/*FIXME - need to put this back in when the video custom commands have stabilised.
CMMFVideoControllerCustomCommandParser* vidConParser = CMMFVideoControllerCustomCommandParser::NewL(*this);
CleanupStack::PushL(vidConParser);
AddCustomCommandParserL(*vidConParser);
@@ -215,7 +215,7 @@
iMemFunctionText = KFuncText;
}
-void CMMFTestController::ResetL() //XXX - replacement for RemoveSourceSink()
+void CMMFTestController::ResetL() //FIXME - replacement for RemoveSourceSink()
{
_LIT8(KFuncText, "ResetL Called");
iMemFunctionText = KFuncText;
@@ -370,7 +370,7 @@
if (aQuality == 1)
{
- // XXX, Check it's the correct value.
+ // FIXME, Check it's the correct value.
}
return 1;
@@ -398,7 +398,7 @@
if (aVolume == 1)
{
- //XXX, check it's the correct value
+ //FIXME, check it's the correct value
}
}
@@ -426,7 +426,7 @@
if (aRampDuration.Int64() == 10)
{
- // XXX, check it's the correct value
+ // FIXME, check it's the correct value
}
}
@@ -437,7 +437,7 @@
if (aBalance == 10)
{
- //XXX, check it's the correct value
+ //FIXME, check it's the correct value
}
}
@@ -461,7 +461,7 @@
if (aGain == 1)
{
- // XXX, check it's the correct value
+ // FIXME, check it's the correct value
}
}
@@ -488,7 +488,7 @@
if (aBalance == 8)
{
- // XXX, check it's the correct value
+ // FIXME, check it's the correct value
}
}
@@ -511,7 +511,7 @@
if ((aStart.Int64() == 1) || (aEnd.Int64() == 10))
{
- // XXX, check it's the correct value
+ // FIXME, check it's the correct value
}
}
@@ -546,7 +546,7 @@
if (aMaxDuration.Int64() == 10)
{
- // XXX, check it's the correct value
+ // FIXME, check it's the correct value
}
}
@@ -557,7 +557,7 @@
if (aMaxSize == 10)
{
- // XXX, check it's the correct value
+ // FIXME, check it's the correct value
}
}
@@ -568,7 +568,7 @@
if (aToEnd)
{
- // XXX, check it's the correct value
+ // FIXME, check it's the correct value
}
}
@@ -580,7 +580,7 @@
_LIT(KName, "A ENTRY");
if (aNewEntry.Name() == KName)
{
- // XXX, check it's the correct value
+ // FIXME, check it's the correct value
}
}
@@ -591,7 +591,7 @@
if (aIndex == 8)
{
- // XXX, check it's the correct value
+ // FIXME, check it's the correct value
}
}
@@ -601,13 +601,13 @@
iMemFunctionText = KFuncText;
if (aIndex == 8)
{
- // XXX, check it's the correct value
+ // FIXME, check it's the correct value
}
_LIT(KName, "A New ENTRY");
if (aNewEntry.Name() == KName)
{
- // XXX, check it's the correct value
+ // FIXME, check it's the correct value
}
}
@@ -935,7 +935,7 @@
if (aFramesPerSecond == 5.00)
{
- // XXX, Check it's the correct value.
+ // FIXME, Check it's the correct value.
}
}
@@ -946,7 +946,7 @@
if (aFramesPerSecond == 5.00)
{
- // XXX, Check it's the correct value.
+ // FIXME, Check it's the correct value.
}
}
@@ -957,7 +957,7 @@
if (aFrameNumber == 5)
{
- // XXX, Check it's the correct value.
+ // FIXME, Check it's the correct value.
}
}
@@ -968,7 +968,7 @@
if (aVideoDimension.Width() == 10)
{
- // XXX, Check it's the correct value.
+ // FIXME, Check it's the correct value.
}
}
@@ -979,7 +979,7 @@
if (aWindowRect.Width() == 10)
{
- // XXX, Check it's the correct value.
+ // FIXME, Check it's the correct value.
}
}
@@ -992,7 +992,7 @@
_LIT(KName, "A New Entry");
if (aNewEntry.Name() == KName)
{
- // XXX, Check it's the correct value.
+ // FIXME, Check it's the correct value.
}
}
@@ -1003,7 +1003,7 @@
if (aIndex == 2)
{
- // XXX, Check it's the correct value.
+ // FIXME, Check it's the correct value.
}
}
@@ -1014,13 +1014,13 @@
if (aIndex == 2)
{
- // XXX, Check it's the correct value.
+ // FIXME, Check it's the correct value.
}
_LIT(KName, "A New Entry");
if (aNewEntry.Name() == KName)
{
- // XXX, Check it's the correct value.
+ // FIXME, Check it's the correct value.
}
}
--- a/mmlibs/mmfw/tsrc/mmfunittest/ctlfrm/TS_CMMFTestController/Ts_cmmftestcontroller.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/ctlfrm/TS_CMMFTestController/Ts_cmmftestcontroller.h Fri Jul 09 13:09:11 2010 +0100
@@ -92,8 +92,7 @@
#ifdef SYMBIAN_BUILD_GCE
, public MMMFVideoPlaySurfaceSupportCustomCommandImplementor //,
#endif // SYMBIAN_BUILD_GCE
- //public MMMFVideoControllerCustomCommandImplementor
- //XXX - these custom commands are changing...
+ //public MMMFVideoControllerCustomCommandImplementor FIXME - these custom commands are changing...
#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
, public MMMFVideoPlaySubtitleSupportCustomCommandImplementor
#endif // SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
@@ -108,7 +107,7 @@
virtual void RemoveDataSourceL(MDataSource& aDataSource);
virtual void RemoveDataSinkL(MDataSink& aDataSink);
virtual void RemoveSourceSinkL();
- virtual void ResetL();//XXX - replacement for RemoveSourceSink()
+ virtual void ResetL();//FIXME - replacement for RemoveSourceSink()
virtual void PrimeL();
virtual void PlayL();
virtual void PauseL();
--- a/mmlibs/mmfw/tsrc/mmfunittest/ctlfrm/mp3/MmfMP3Format/101F7D99.rss Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/ctlfrm/mp3/MmfMP3Format/101F7D99.rss Fri Jul 09 13:09:11 2010 +0100
@@ -73,7 +73,7 @@
default_data = "?"; //Preferred Controller
// KUidMediaTypeAudio = 0x101F5D07
- // match by header & extension - for testing
+ // match by header & extension - for Calimero testing
// (need to report a wav mime type so that it gets picked up by the audio app)
// opaque_data = "<s>Symbian<i>0x101f5d07<e>.mp3<h>ID3?????????<h>RIFF????WAVE<m>audio/wav<m>audio/x-wav";
--- a/mmlibs/mmfw/tsrc/mmfunittest/srssnk/TSU_MMF_SRSSNK.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/srssnk/TSU_MMF_SRSSNK.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -5919,8 +5919,8 @@
// Test valid uid, invalid descriptor.
- // Note using a thread ID of 0 behaves differently on streaming so this
- // test has been removed.
+ // Note using a thread ID of 0 behaves differently on Jetstream so this
+ // test has been commented out.
// configDes().iDesThreadId = 0;
// TNewSourceTestStep testStep5(KUidMmfDescriptorSource, configDes);
@@ -5928,7 +5928,7 @@
// Test invalid (sink) uid.
// Note that ECom has no way of validating that Uids are of the correct type,
- // so this test is removed. (It causes an unhandled exception)
+ // so this test is commented out. (It causes an unhandled exception)
// TNewSourceTestStep testStep6(KUidMmfDescriptorSink, configDes);
// DoTest(testStep6, _L("Construct descriptor source"), KErrNotFound);
@@ -6099,7 +6099,7 @@
// Test invalid (source) uid.
// Note that ECom has no way of validating that Uids are of the correct type,
- // so this test is removed. (It causes an unhandled exception)
+ // so this test is commented out. (It causes an unhandled exception)
// TNewSinkTestStep testStep6(KUidMmfDescriptorSource, configDes);
// DoTest(testStep6, _L("Construct descriptor sink"), KErrNotFound);
@@ -10629,7 +10629,7 @@
// Test that the audio source is initialised correctly.
CMMFAudioInput* sourceAudioInput = STATIC_CAST(CMMFAudioInput*, source);
- // XXX These fns. go bang after construction. This is not good.
+ // [TBD] These fns. go bang after construction. This is not good.
// They are ok, provided we have logged on and called SourcePrimeL().
#ifndef SYMBIAN_MULTIMEDIA_A3FDEVSOUND
if (sourceAudioInput->SoundDevice().Volume() != 0)
@@ -10940,8 +10940,8 @@
TAudioInputFillBuffer2TestStep testStep3(source, validBuffer, dummySink);
DoTest(testStep3, _L("Audio Input: FillBufferL"), KErrNone,expectedAllocs);
- // XXX Valid fill buffer. (Make multiple requests at once)
- // removed below lines because the audio input currently doesn't support multiple requests.
+ // Valid fill buffer. (Make multiple requests at once)
+ // Commented out because the audio input currently doesn't support multiple requests.
// TAudioInputFillBuffer3TestStep testStep4(source, validBuffer, dummySink);
// DoTest(testStep4, _L("Audio Input: FillBufferL"), KErrNone);
@@ -10956,8 +10956,8 @@
TAudioInputFillBuffer5TestStep testStep6(validBuffer, dummySink);
DoTest(testStep6, _L("Audio Input: FillBufferL"), KErrNone);
- // xxx Valid fill buffer. (Make multiple requests at once)
- // removed below lines because the audio input currently doesn't support multiple requests.
+ // Valid fill buffer. (Make multiple requests at once)
+ // Commented out because the audio input currently doesn't support multiple requests.
// TAudioInputFillBuffer6TestStep testStep7(validBuffer, dummySink);
// DoTest(testStep7, _L("Audio Input: FillBufferL"), KErrNone);
@@ -11412,8 +11412,8 @@
TAudioOutputEmptyBuffer2TestStep testStep3(sink, validBuffer, dummySource);
DoTest(testStep3, _L("Audio Output: EmptyBufferL"), KErrNone, KDevSoundAllocs);
- // xxx Valid empty buffer. (Make multiple requests at once)
- // removed below lines because the audio output currently doesn't support multiple requests.
+ // Valid empty buffer. (Make multiple requests at once)
+ // Commented out because the audio output currently doesn't support multiple requests.
// TAudioOutputFillBuffer3TestStep testStep4(sink, validBuffer, dummySource);
// DoTest(testStep4, _L("Audio Output: EmptyBufferL"), KErrNone);
@@ -11435,8 +11435,8 @@
// TAudioOutputEmptyBuffer5TestStep testStep6(validBuffer, dummySource, *realFormat);
// DoTest(testStep6, _L("Audio Output: EmptyBufferL"), KErrNone, 0);
- // xxx Valid empty buffer. (Make multiple requests at once)
- // removed below lines because the audio output currently doesn't support multiple requests.
+ // Valid empty buffer. (Make multiple requests at once)
+ // Commented out because the audio output currently doesn't support multiple requests.
// TAudioOutputEmptyBuffer6TestStep testStep7(validBuffer, dummySource);
// DoTest(testStep7, _L("Audio Output: EmptyBufferL"), KErrNone);
--- a/mmlibs/mmfw/tsrc/mmfunittest/swcdwrap/TSU_MMF_SWCDWRAP_StepStartDecode.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/swcdwrap/TSU_MMF_SWCDWRAP_StepStartDecode.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -145,7 +145,7 @@
TVerdict CTestStep_MMF_SWCDWRAP_U_0010::DoTestStepL( void )
/**
* Use case: N/A
- * Use Start() to play one not completed buffer synchronously
+ * Use Start() to play one incomplete buffer synchronously
* buffer size < codec buffer size
* @test Req. under test REQ1931.2
*/
@@ -257,7 +257,7 @@
TVerdict CTestStep_MMF_SWCDWRAP_U_0012::DoTestStepL( void )
/**
* Use case: N/A
- * Use Start() to play five complete and 1 not completed buffers synchronously
+ * Use Start() to play five complete and 1 incomplete buffers synchronously
* @test Req. under test REQ1931.2
*/
{
@@ -280,7 +280,7 @@
verdict = EFail;
}
if (iHwDeviceObserver->NumberOfBuffersObserved() != 6)
- {//expected 6 buffers 5 complete + 1 not completed buffer
+ {//expected 6 buffers 5 complete + 1 incomplete buffer
INFO_PRINTF1(_L("incorrect number of buffers"));
verdict = EFail;
}
@@ -1142,7 +1142,7 @@
TVerdict CTestStep_MMF_SWCDWRAP_U_0040::DoTestStepL( void )
/**
* Use case: N/A
- * Use Start() to play one not completed buffer synchronously using 2:1 codec
+ * Use Start() to play one incomplete buffer synchronously using 2:1 codec
* buffer size < codec buffer size
* @test Req. under test REQ1931.2
*/
@@ -1254,7 +1254,7 @@
TVerdict CTestStep_MMF_SWCDWRAP_U_0042::DoTestStepL( void )
/**
* Use case: N/A
- * Use Start() to play five complete and 1 not completed buffers synchronously using 2:1 codec
+ * Use Start() to play five complete and 1 incomplete buffers synchronously using 2:1 codec
* buffer size < codec buffer size
* @test Req. under test REQ1931.2
*/
@@ -1278,7 +1278,7 @@
verdict = EFail;
}
if (iHwDeviceObserver->NumberOfBuffersObserved() != 6)
- {//expected 6 buffers 5 complete + 1 not completed buffer
+ {//expected 6 buffers 5 complete + 1 incomplete buffer
INFO_PRINTF1(_L("incorrect number of buffers"));
verdict = EFail;
}
--- a/mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/agents/tsi_mvs_agents_stepbase.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/agents/tsi_mvs_agents_stepbase.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -1123,7 +1123,7 @@
iWindow->SetRequiredDisplayMode(EColor16MA);
iWindow->SetSizeErr(iScreen->SizeInPixels());
- // XXX - this forcing of transparency may not be needed, as there is
+ // TODO - this forcing of transparency may not be needed, as there is
// a defect in the graphics component right now
// force the transparency change to take place
iWindow->SetBackgroundColor(TRgb(0x000000, 0));
@@ -1249,7 +1249,7 @@
// surface
iWindow->SetRequiredDisplayMode(EColor16MA);
- // XXX - this forcing of transparency may not be needed, as there is
+ // TODO - this forcing of transparency may not be needed, as there is
// a defect in the graphics component right now
// force the transparency change to take place
iWindow->SetBackgroundColor(TRgb(0x000000, 0));
@@ -1609,7 +1609,7 @@
// surface
iWindow->SetRequiredDisplayMode(EColor16MA);
- // XXX - this forcing of transparency may not be needed, as there is
+ // TODO - this forcing of transparency may not be needed, as there is
// a defect in the graphics component right now
// force the transparency change to take place
iWindow->SetBackgroundColor(TRgb(0x000000, 0));
--- a/mmlibs/mmutilitylib/group/multimedia_common.mrp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmlibs/mmutilitylib/group/multimedia_common.mrp Fri Jul 09 13:09:11 2010 +0100
@@ -1,18 +1,6 @@
#multimedia_common.mrp
#
-# Copyright (c) 2004-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:
+#Copyright (c) 2005-2009 Symbian Ltd. All rights reserved.
#
component multimedia_common
--- a/mmplugins/imagingplugins/codecs/GifCodec/README006.txt Fri Jul 09 12:53:09 2010 +0100
+++ b/mmplugins/imagingplugins/codecs/GifCodec/README006.txt Fri Jul 09 13:09:11 2010 +0100
@@ -1,18 +1,3 @@
-// Copyright (c) 2004-2010 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:
-//
-
The Independent JPEG Group's JPEG software
==========================================
--- a/mmplugins/imagingplugins/codecs/JPEGCodec/README006.txt Fri Jul 09 12:53:09 2010 +0100
+++ b/mmplugins/imagingplugins/codecs/JPEGCodec/README006.txt Fri Jul 09 13:09:11 2010 +0100
@@ -1,18 +1,3 @@
-// Copyright (c) 2004-2010 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:
-//
-
The Independent JPEG Group's JPEG software
==========================================
--- a/mmplugins/mmfwplugins/src/Plugin/Format/MmfWAVFormat/mmfwavformat.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmplugins/mmfwplugins/src/Plugin/Format/MmfWAVFormat/mmfwavformat.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -843,7 +843,7 @@
// To avoid behavior break for now we do this only for Gsm610
// If the RIFF chunk data size is greater than the file size and
- // it is not a new file, then the file must be corrupted or not a complete file.
+ // it is not a new file, then the file must be incomplete/corrupted.
//
if ( (iFourCC == KMMFFourCCCodeGSM610) && (iRiffChunkLength > fileSize) && (iBuffer->Data().Size() != 0) )
{
--- a/mmtestenv/mmtestfw/Source/TestFrameworkServer/ServerConsole.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmtestenv/mmtestfw/Source/TestFrameworkServer/ServerConsole.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -48,6 +48,8 @@
*/
CServerConsole::~CServerConsole()
{
+ Cancel();
+ delete iConsoleReader;
delete iWindowName;
delete iInstructions;
delete iConsole;
@@ -62,7 +64,9 @@
*
*/
CServerConsole::CServerConsole()
+ :CActive(EPriorityHigh)
{
+ CActiveScheduler::Add(this);
}
/**
@@ -80,6 +84,7 @@
{
iWindowName = aName.AllocL();
iConsole = Console::NewL(*iWindowName, TSize(KConsFullScreen,KConsFullScreen));
+ iConsoleReader = CConsoleReader::NewL(*iConsole);
}
/**
@@ -119,3 +124,190 @@
iConsole->Write(*iInstructions);
}
+/**
+ *
+ * Starts the console reader listening for input.
+ *
+ * @param "MConsoleReader& aReader"
+ * The console reader.
+ *
+ * @xxxx
+ *
+ */
+void CServerConsole::Read(MConsoleReader& aReader)
+ {
+ iConsoleReader->DoRead(aReader);
+ }
+
+/**
+ *
+ * Stops the console reader listening for input.
+ *
+ *
+ * @xxxx
+ *
+ */
+void CServerConsole::ReadCancel()
+ {
+ iConsoleReader->Cancel();
+ }
+
+/**
+ *
+ * RunL method for active object CServerConsole.
+ *
+ * @xxxx
+ *
+ */
+void CServerConsole::RunL()
+ {
+ User::LeaveIfError(iStatus.Int());
+ TBool reading = iConsoleReader->IsActive();
+ iConsoleReader->Cancel();
+
+ //listen for key input if we were before...
+ if (reading)
+ iConsoleReader->DoRead();
+ }
+
+/**
+ *
+ * DoCancel method for active object CServerConsole.
+ *
+ * @xxxx
+ *
+ */
+void CServerConsole::DoCancel()
+ {
+ ReadCancel();
+ }
+
+/**
+ *
+ * Error handler for active object CServerConsole.
+ * (Currently a stub)
+ *
+ * @param "TInt aError"
+ * The error code
+ *
+ * @return "TInt"
+ * The error code
+ *
+ * @xxxx
+ *
+ */
+TInt CServerConsole::RunError(TInt aError)
+ {
+ return aError;
+ }
+
+
+
+/**
+ *
+ * Static constructor for CConsoleReader.
+ *
+ * @param "CConsoleBase& aConsole"
+ * The console we are to read
+ *
+ * @return "CConsoleReader*"
+ * The constructed CConsoleReader
+ *
+ * @xxxx
+ *
+ */
+CConsoleReader* CConsoleReader::NewL(CConsoleBase& aConsole)
+ {
+ CConsoleReader* s = new(ELeave) CConsoleReader(aConsole);
+ return s;
+ }
+
+/**
+ *
+ * First-phase constructor for CConsoleReader.
+ * Adds itself to the Active Scheduler.
+ *
+ * @param "CConsoleBase& aConsole"
+ * console to read from
+ *
+ * @xxxx
+ *
+ */
+CConsoleReader::CConsoleReader(CConsoleBase& aConsole) :
+ CActive(EPriorityUserInput),
+ iConsole(aConsole)
+ {
+ CActiveScheduler::Add(this);
+ }
+
+/**
+ *
+ * Destructor for CConsoleReader.
+ *
+ * @xxxx
+ *
+ */
+CConsoleReader::~CConsoleReader()
+ {
+ Cancel();
+ }
+
+/**
+ *
+ * DoRead method for active object CConsoleReader;
+ * sets client and starts reading
+ *
+ * @param "MConsoleReader& aClient"
+ * client MConsoleReader (which will process the input)
+ *
+ * @xxxx
+ *
+ */
+void CConsoleReader::DoRead(MConsoleReader& aClient)
+ {
+ iClient = &aClient;
+ DoRead();
+ }
+
+/**
+ *
+ * DoRead method for active object CConsoleReader;
+ * starts reading from current client
+ *
+ * @xxxx
+ *
+ */
+void CConsoleReader::DoRead()
+ {
+ iConsole.Read(iStatus);
+ SetActive();
+ }
+
+/**
+ *
+ * RunL method for active object CConsoleReader;
+ * fetches a keystroke and sends it to its client for processing.
+ *
+ * @xxxx
+ *
+ */
+void CConsoleReader::RunL()
+ {
+ iKeyStroke = iConsole.KeyCode();
+ if (iStatus.Int())
+ iClient->Error(iStatus.Int());
+ else
+ iClient->InputReceived(iKeyStroke);
+ }
+
+/**
+ *
+ * DoCancel method for active object CConsoleReader
+ *
+ * @xxxx
+ *
+ */
+void CConsoleReader::DoCancel()
+ {
+ iConsole.ReadCancel();
+ }
--- a/mmtestenv/mmtestfw/Source/TestFrameworkServer/ServerConsole.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mmtestenv/mmtestfw/Source/TestFrameworkServer/ServerConsole.h Fri Jul 09 13:09:11 2010 +0100
@@ -24,19 +24,90 @@
/**
*
+ * Console reader mixin class.
+ * Any main program or class using a CServerConsole
+ * should implement this class.
+ *
+ * @xxxx
+ *
+ */
+class MConsoleReader
+ {
+public:
+/**
+ *
+ * Processes a received keystroke.
+ *
+ * @param "TKeyCode aKeystroke"
+ * The received keystroke.
+ *
+ * @xxxx
+ *
+ */
+ virtual void InputReceived(TKeyCode aKeystroke) = 0;
+/**
+ *
+ * Handles console reader errors.
+ *
+ * @param "TInt aError"
+ * The error code.
+ *
+ * @xxxx
+ *
+ */
+ virtual void Error(TInt aError) = 0;
+ };
+
+/**
+ *
+ * Keystroke reader for CServerConsole.
+ *
+ *
+ * @xxxx
+ *
+ */
+class CConsoleReader : public CActive
+ {
+public:
+ static CConsoleReader* NewL(CConsoleBase& aConsole);
+ ~CConsoleReader();
+ void DoRead(MConsoleReader& aClient);
+ void DoRead();//keeping same client as before
+ void RunL();
+
+protected:
+ void DoCancel();
+
+private:
+ CConsoleReader(CConsoleBase& aConsole);
+
+private:
+ MConsoleReader* iClient;
+ CConsoleBase& iConsole;
+ TKeyCode iKeyStroke;
+ };
+
+/**
+ *
* Active console for test input.
* To be used where manual control of testing is required
*
* @xxxx
*
*/
-class CServerConsole : public CBase
+class CServerConsole : public CActive
{
public:
static CServerConsole* NewL(const TDesC& aName);
~CServerConsole();
void SetInstructionsL(const TDesC& aInstructions);
+ void Read(MConsoleReader& aReader);
+ void ReadCancel();
+
+ void RunL();
+ void DoCancel();
+ TInt RunError(TInt aError);
// accessor
CConsoleBase* Console() const;
@@ -50,6 +121,7 @@
TRectBuf iWindow;
HBufC* iWindowName;
HBufC* iInstructions;
+ CConsoleReader* iConsoleReader;
};
#endif // __SERVERCONSOLE_H__
--- a/mmtestenv/mmtestfw/Source/TestFrameworkServer/TestFrameworkServer.cpp Fri Jul 09 12:53:09 2010 +0100
+++ b/mmtestenv/mmtestfw/Source/TestFrameworkServer/TestFrameworkServer.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -222,6 +222,9 @@
if (aLogMode & ELogConsoleFull)
iLogMode |= ELogConsoleFull;
+
+ iConsole->Read(*this);
+
}
}
@@ -356,6 +359,42 @@
/**
*
+ * process key input from console.
+ *
+ * @param "TKeyCode aKeystroke"
+ * The keystroke
+ *
+ * @xxxx
+ *
+ */
+void CTestFrameworkServer::InputReceived(TKeyCode aKeystroke)
+ {
+ // store it
+ iInputKey = STATIC_CAST(TInt, aKeystroke);
+
+ // key not processed as yet - pending implementation of async request from client
+
+ //read from console again
+ iConsole->Read(*this);
+ }
+
+/**
+ *
+ * Display general error.
+ *
+ * @param "TInt aError"
+ * The error code
+ *
+ * @xxxx
+ *
+ */
+void CTestFrameworkServer::Error(TInt)
+ {
+ // stubbed; undefined input keys can be safely discarded
+ }
+
+/**
+ *
* Default window constructor (no owner)
*
* @xxxx
--- a/mmtestenv/mmtestfw/Source/TestFrameworkServer/TestFrameworkServer.h Fri Jul 09 12:53:09 2010 +0100
+++ b/mmtestenv/mmtestfw/Source/TestFrameworkServer/TestFrameworkServer.h Fri Jul 09 13:09:11 2010 +0100
@@ -84,7 +84,7 @@
* @xxxx
*
*/
-class CTestFrameworkServer : public CMmfIpcServer
+class CTestFrameworkServer : public CMmfIpcServer, public MConsoleReader
{
public:
//construct / destruct
@@ -102,6 +102,10 @@
void AddInputWindowL(CTestFrameworkServerSession* aOwner);
void RemoveWindow(CTestFrameworkServerSession* aOwner);
+ //from MConsoleReader
+ void InputReceived(TKeyCode aKeystroke);
+ void Error(TInt aError);
+
private:
CTestFrameworkServer();
void ConstructL();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmtestenv/mmtestfwunittest/MMPFiles/TSU_MmTsth21.mmp Fri Jul 09 13:09:11 2010 +0100
@@ -0,0 +1,59 @@
+// Copyright (c) 2002-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:
+// Unit testing for MM Test Framework - 21 (ServerConsole)
+//
+//
+
+// Typhoon / Hurricane build :- comment out these lines
+// MACRO __MMF_JETSTREAM__
+// #define _MMF_JETSTREAM_MMP
+
+// Macro used to patch out E32Dll etc. in source files being tested
+MACRO __TSU_TESTFRAMEWORK__
+
+TARGET tsu_mmtsth21.dll
+CAPABILITY ALL -TCB
+TARGETTYPE dll
+UID 0x1000008d 0x101f4608
+VENDORID 0x70000001
+
+// unit test code
+
+SOURCEPATH ../src
+SOURCE tsu_mmtsth21/TSU_MmTsthSuite21.cpp
+SOURCE tsu_mmtsth21/TSU_MmTsthStep21.cpp
+SOURCE tsu_mmtsth21/TSU_MmTsth21.cpp
+
+// code to be tested
+
+SOURCE ../../mmtestfw/Source/TestFrameworkServer/ServerConsole.cpp
+
+// required stubs
+
+
+USERINCLUDE ../src/tsu_mmtsth21
+USERINCLUDE ../../mmtestfw/Source
+USERINCLUDE ../../mmtestfw/Source/TestFrameworkServer
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+LIBRARY euser.lib
+
+// required TestFramework libraries
+
+LIBRARY testframeworkclient.lib
+
+
+
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmtestenv/mmtestfwunittest/bwins/TSU_MMTSTH21U.DEF Fri Jul 09 13:09:11 2010 +0100
@@ -0,0 +1,3 @@
+EXPORTS
+ ?NewTSUMmTsthSuite21L@@YAPAVCTSUMmTsthSuite21@@XZ @ 1 NONAME ; class CTSUMmTsthSuite21 * __cdecl NewTSUMmTsthSuite21L(void)
+
--- a/mmtestenv/mmtestfwunittest/eabi/TSU_MmTsth20U.DEF Fri Jul 09 12:53:09 2010 +0100
+++ b/mmtestenv/mmtestfwunittest/eabi/TSU_MmTsth20U.DEF Fri Jul 09 13:09:11 2010 +0100
@@ -1,19 +1,21 @@
EXPORTS
_Z20NewTSUMmTsthSuite20Lv @ 1 NONAME
_ZTI11CFileLogger @ 2 NONAME ; #<TI>#
- _ZTI14CServerConsole @ 3 NONAME ; #<TI>#
- _ZTI16RTestMmTsthU2001 @ 4 NONAME ; #<TI>#
- _ZTI16RTestMmTsthU2002 @ 5 NONAME ; #<TI>#
- _ZTI17CTSUMmTsthSuite20 @ 6 NONAME ; #<TI>#
- _ZTI20CTestFrameworkServer @ 7 NONAME ; #<TI>#
- _ZTI27CTestFrameworkServerSession @ 8 NONAME ; #<TI>#
- _ZTI28CTestFrameworkServerShutdown @ 9 NONAME ; #<TI>#
- _ZTV11CFileLogger @ 10 NONAME ; #<VT>#
- _ZTV14CServerConsole @ 11 NONAME ; #<VT>#
- _ZTV16RTestMmTsthU2001 @ 12 NONAME ; #<VT>#
- _ZTV16RTestMmTsthU2002 @ 13 NONAME ; #<VT>#
- _ZTV17CTSUMmTsthSuite20 @ 14 NONAME ; #<VT>#
- _ZTV20CTestFrameworkServer @ 15 NONAME ; #<VT>#
- _ZTV27CTestFrameworkServerSession @ 16 NONAME ; #<VT>#
- _ZTV28CTestFrameworkServerShutdown @ 17 NONAME ; #<VT>#
+ _ZTI14CConsoleReader @ 3 NONAME ; #<TI>#
+ _ZTI14CServerConsole @ 4 NONAME ; #<TI>#
+ _ZTI16RTestMmTsthU2001 @ 5 NONAME ; #<TI>#
+ _ZTI16RTestMmTsthU2002 @ 6 NONAME ; #<TI>#
+ _ZTI17CTSUMmTsthSuite20 @ 7 NONAME ; #<TI>#
+ _ZTI20CTestFrameworkServer @ 8 NONAME ; #<TI>#
+ _ZTI27CTestFrameworkServerSession @ 9 NONAME ; #<TI>#
+ _ZTI28CTestFrameworkServerShutdown @ 10 NONAME ; #<TI>#
+ _ZTV11CFileLogger @ 11 NONAME ; #<VT>#
+ _ZTV14CConsoleReader @ 12 NONAME ; #<VT>#
+ _ZTV14CServerConsole @ 13 NONAME ; #<VT>#
+ _ZTV16RTestMmTsthU2001 @ 14 NONAME ; #<VT>#
+ _ZTV16RTestMmTsthU2002 @ 15 NONAME ; #<VT>#
+ _ZTV17CTSUMmTsthSuite20 @ 16 NONAME ; #<VT>#
+ _ZTV20CTestFrameworkServer @ 17 NONAME ; #<VT>#
+ _ZTV27CTestFrameworkServerSession @ 18 NONAME ; #<VT>#
+ _ZTV28CTestFrameworkServerShutdown @ 19 NONAME ; #<VT>#
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmtestenv/mmtestfwunittest/eabi/TSU_MmTsth21U.DEF Fri Jul 09 13:09:11 2010 +0100
@@ -0,0 +1,13 @@
+EXPORTS
+ _Z20NewTSUMmTsthSuite21Lv @ 1 NONAME
+ _ZTI14CConsoleReader @ 2 NONAME ; #<TI>#
+ _ZTI14CServerConsole @ 3 NONAME ; #<TI>#
+ _ZTI16RTSUMmTsthStep21 @ 4 NONAME ; #<TI>#
+ _ZTI16RTestMmTsthU2101 @ 5 NONAME ; #<TI>#
+ _ZTI17CTSUMmTsthSuite21 @ 6 NONAME ; #<TI>#
+ _ZTV14CConsoleReader @ 7 NONAME ; #<VT>#
+ _ZTV14CServerConsole @ 8 NONAME ; #<VT>#
+ _ZTV16RTSUMmTsthStep21 @ 9 NONAME ; #<VT>#
+ _ZTV16RTestMmTsthU2101 @ 10 NONAME ; #<VT>#
+ _ZTV17CTSUMmTsthSuite21 @ 11 NONAME ; #<VT>#
+
--- a/mmtestenv/mmtestfwunittest/group/TSU_TestFramework.iby Fri Jul 09 12:53:09 2010 +0100
+++ b/mmtestenv/mmtestfwunittest/group/TSU_TestFramework.iby Fri Jul 09 13:09:11 2010 +0100
@@ -32,6 +32,7 @@
file=ABI_DIR\BUILD_DIR\TSU_MmTsth12.DLL System\Libs\TSU_MmTsth12.DLL
file=ABI_DIR\BUILD_DIR\TSU_MmTsth13.DLL System\Libs\TSU_MmTsth13.DLL
file=ABI_DIR\BUILD_DIR\TSU_MmTsth20.DLL System\Libs\TSU_MmTsth20.DLL
+file=ABI_DIR\BUILD_DIR\TSU_MmTsth21.DLL System\Libs\TSU_MmTsth21.DLL
file=ABI_DIR\BUILD_DIR\TSU_MmTsth22.DLL System\Libs\TSU_MmTsth22.DLL
data=EPOCROOT##epoc32\data\c\TestFramework.script \TestFramework.script
@@ -44,6 +45,7 @@
data=EPOCROOT##epoc32\data\c\TSU_MmTsth12.script \TSU_MmTsth12.script
data=EPOCROOT##epoc32\data\c\TSU_MmTsth13.script \TSU_MmTsth13.script
data=EPOCROOT##epoc32\data\c\TSU_MmTsth20.script \TSU_MmTsth20.script
+data=EPOCROOT##epoc32\data\c\TSU_MmTsth21.script \TSU_MmTsth21.script
data=EPOCROOT##epoc32\data\c\TSU_MmTsth22.script \TSU_MmTsth22.script
data=EPOCROOT##epoc32\data\c\TSU_MmTsth02_dummy.script \TSU_MmTsth02_dummy.script
--- a/mmtestenv/mmtestfwunittest/group/bld.inf Fri Jul 09 12:53:09 2010 +0100
+++ b/mmtestenv/mmtestfwunittest/group/bld.inf Fri Jul 09 13:09:11 2010 +0100
@@ -30,6 +30,7 @@
../MMPFiles/TSU_MmTsth12.mmp
../MMPFiles/TSU_MmTsth13.mmp
../MMPFiles/TSU_MmTsth20.mmp
+../MMPFiles/TSU_MmTsth21.mmp
../MMPFiles/TSU_MmTsth22.mmp
PRJ_TESTEXPORTS
@@ -53,6 +54,7 @@
../scriptFiles/TSU_MmTsth12.script c:/tsu_mmtsth12.script
../scriptFiles/TSU_MmTsth13.script c:/tsu_mmtsth13.script
../scriptFiles/TSU_MmTsth20.script c:/tsu_mmtsth20.script
+../scriptFiles/TSU_MmTsth21.script c:/tsu_mmtsth21.script
../scriptFiles/TSU_MmTsth22.script c:/tsu_mmtsth22.script
// extra files
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmtestenv/mmtestfwunittest/scriptFiles/TSU_MmTsth21.script Fri Jul 09 13:09:11 2010 +0100
@@ -0,0 +1,26 @@
+// Copyright (c) 2002-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:
+//
+
+PRINT Unit Testing for Test Framework - ServerConsole
+//
+PRINT
+//
+LOAD_SUITE TSU_MmTsth21.dll
+//
+//! @SYMTestCaseID MM-TSTH-U-2101
+
+RUN_TEST_STEP 10000 TSU_MmTsth21 MM-TSTH-U-2101
+TEST_COMPLETE
+//
\ No newline at end of file
--- a/mmtestenv/mmtestfwunittest/scriptFiles/TestFramework.script Fri Jul 09 12:53:09 2010 +0100
+++ b/mmtestenv/mmtestfwunittest/scriptFiles/TestFramework.script Fri Jul 09 13:09:11 2010 +0100
@@ -33,4 +33,6 @@
//
RUN_SCRIPT TSU_MmTsth20
//
+RUN_SCRIPT TSU_MmTsth21
+//
RUN_SCRIPT TSU_MmTsth22
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmtestenv/mmtestfwunittest/src/tsu_mmtsth21/TSU_MmTsth21.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -0,0 +1,100 @@
+// Copyright (c) 2002-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:
+// This file contains the test steps for Unit Test Suite 21 : ServerConsole.cpp
+//
+//
+
+// EPOC includes
+#include <e32base.h>
+
+#include <w32std.h>
+
+// Test system includes
+#include <testframework.h>
+
+// Specific includes for this test suite
+#include "TSU_MmTsthStep21.h"
+#include "TSU_MmTsthSuite21.h"
+
+// Specific includes for these test steps
+#include "TSU_MmTsth21.h"
+#include "TestFrameworkServer/ServerConsole.h"
+
+// --------------------------------------------
+
+// Unit Test Suite 21 : ServerConsole.cpp
+// Depends on : ***
+
+// Requires Active Scheduler in thread
+
+// Tests :-
+// Open Server Console
+// NB possible changes in code (anticipated : User Input)
+
+// --------------------------------------------
+// RTestMmTsthU2101
+
+RTestMmTsthU2101* RTestMmTsthU2101::NewL()
+ {
+ RTestMmTsthU2101* self = new(ELeave) RTestMmTsthU2101;
+ return self;
+ }
+
+// Each test step initialises its own name.
+RTestMmTsthU2101::RTestMmTsthU2101()
+ {
+ // store the name of this test case
+ // this is the name that is used by the script file
+ iTestStepName = _L("MM-TSTH-U-2101");
+ }
+
+// Do the test step.
+TVerdict RTestMmTsthU2101::DoTestStepL()
+ {
+ INFO_PRINTF1(_L("Unit test for ServerConsole"));
+
+ TVerdict currentVerdict = EPass;
+
+ CServerConsole* theConsole = NULL;
+ TRAPD(err, theConsole = CServerConsole::NewL(_L("CServerConsole Test")));
+ if(err != KErrNone)
+ {
+ ERR_PRINTF1(_L("CServerConsole::NewL() left"));
+ return iTestStepResult = EFail;
+ }
+
+
+ iConsole = theConsole;
+ // will only work if this test is an MConsoleReader
+ // *** NB! if we are running TestFramework in -F mode (i.e. no console output) this MAY
+ // time out.
+ iConsole->Read(*this);
+
+ // call RunL() directly - not ideal but we have to test it somehow...
+ // there is no window server so we can't simulate a keyboard event to call iConsoleReader->RunL()
+ // this may have to be rewritten if full async keyboard handling is to be implemented
+ TRAPD(err2, iConsole->RunL());
+ if(err2)
+ {
+ ERR_PRINTF2(_L("CServerConsole::RunL() left with error %d"), err2);
+ delete iConsole;
+ return iTestStepResult = EFail;
+ };
+
+ INFO_PRINTF1(_L("Returned from RunL()"));
+
+ // cleanup
+ delete iConsole;
+ return iTestStepResult = currentVerdict; // should be EPass if we've got here
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmtestenv/mmtestfwunittest/src/tsu_mmtsth21/TSU_MmTsth21.h Fri Jul 09 13:09:11 2010 +0100
@@ -0,0 +1,32 @@
+// Copyright (c) 2002-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:
+// This file contains definitions of the test step classes for TSU_MMTSTH21
+//
+//
+
+#ifndef __TSU_MMTSTH21_H__
+#define __TSU_MMTSTH21_H__
+
+
+// ServerConsole : MM-TSTH-U-2201
+class RTestMmTsthU2101 : public RTSUMmTsthStep21
+ {
+public:
+ static RTestMmTsthU2101* NewL();
+ RTestMmTsthU2101();
+ virtual TVerdict DoTestStepL();
+
+ };
+
+#endif // __TSU_MMTSTH21_H__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmtestenv/mmtestfwunittest/src/tsu_mmtsth21/TSU_MmTsthStep21.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -0,0 +1,63 @@
+// Copyright (c) 2002-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:
+//
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+#include <testframework.h>
+#include "TSU_MmTsthStep21.h"
+#include "TSU_MmTsthSuite21.h"
+
+// ------------------------------------------------
+// RTSUMmTsthStep21 : generic test step for TSU_MMTSTH21
+
+// preamble
+TVerdict RTSUMmTsthStep21::OpenL()
+ {
+ iConsole = NULL;
+
+ iScheduler = new(ELeave)CActiveScheduler;
+
+ //[install the active scheduler ]
+ CActiveScheduler::Install( iScheduler );
+
+ return iTestStepResult = EPass;
+ }
+
+// postamble
+void RTSUMmTsthStep21::Close()
+ {
+ //[ Destroy the scheduler ]
+ delete iScheduler ;
+ iScheduler = NULL;
+ }
+
+// from MConsoleReader
+// process key input from console.
+void RTSUMmTsthStep21::InputReceived(TKeyCode /* aKeystroke*/)
+ {
+ // key not processed as yet - pending implementation of async request from client
+ // we would store it as : TInt theInputKey = STATIC_CAST(TInt, aKeystroke);
+
+ //read from console again
+ iConsole->Read(*this);
+ }
+
+// Display general error.
+void RTSUMmTsthStep21::Error(TInt)
+ {
+ // stubbed; undefined input keys can be safely discarded
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmtestenv/mmtestfwunittest/src/tsu_mmtsth21/TSU_MmTsthStep21.h Fri Jul 09 13:09:11 2010 +0100
@@ -0,0 +1,47 @@
+// Copyright (c) 2002-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:
+//
+
+#ifndef __TSU_MMTSTHSTEP21_H__
+#define __TSU_MMTSTHSTEP21_H__
+
+class CTestSuite;
+class CTSUMmTsthSuite21;
+
+#include "TestFrameworkServer/TestFrameworkServer.h"
+
+// Base class for all the TSU_MMTSTH21 suite test steps
+class RTSUMmTsthStep21 : public RTestStep, public MConsoleReader
+ {
+public:
+ virtual TVerdict OpenL();
+ virtual void Close();
+
+ //from MConsoleReader
+ void InputReceived(TKeyCode aKeystroke);
+ void Error(TInt aError);
+
+protected:
+ // required to run a CServerConsole
+ CActiveScheduler* iScheduler ;
+
+ // An active console, receiving output from client messages and input from server
+ CServerConsole* iConsole;
+
+ // last keypress (will be used by a keyboard stuffer or similar)
+ TInt iInputKey;
+
+ };
+
+#endif //__TSU_MMTSTHSTEP21_H__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmtestenv/mmtestfwunittest/src/tsu_mmtsth21/TSU_MmTsthSuite21.cpp Fri Jul 09 13:09:11 2010 +0100
@@ -0,0 +1,67 @@
+// Copyright (c) 2002-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:
+//
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+#include <testframework.h>
+#include "TSU_MmTsthStep21.h"
+#include "TSU_MmTsth21.h"
+#include "TSU_MmTsthSuite21.h"
+
+
+
+
+// Create an instance of this test suite.
+// NewTSUMmTsthSuite21L is exported at ordinal 1.
+// This provides the interface to allow the Test Framework
+// to create instances of this test suite.
+EXPORT_C CTSUMmTsthSuite21* NewTSUMmTsthSuite21L()
+ {
+ CTSUMmTsthSuite21* result = new (ELeave) CTSUMmTsthSuite21;
+ CleanupStack::PushL(result);
+ result->ConstructL();
+ CleanupStack::Pop(); // result
+ return result;
+ }
+
+// destructor
+CTSUMmTsthSuite21::~CTSUMmTsthSuite21()
+ {
+ }
+
+_LIT(KTxtVersion,"0.22 (build 09-Sep-2002)");
+
+// Get test suite version.
+
+TPtrC CTSUMmTsthSuite21::GetVersion() const
+ {
+ return KTxtVersion();
+ }
+
+// Initialiser for test suite.
+// This creates all the test steps and stores them
+// inside CTestSuiteSelfTest
+void CTSUMmTsthSuite21::InitialiseL()
+ {
+
+ // store the name of this test suite
+ iSuiteName = _L("TSU_MMTSTH21");
+
+ // add test steps
+ AddTestStepL(RTestMmTsthU2101::NewL());
+
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mmtestenv/mmtestfwunittest/src/tsu_mmtsth21/TSU_MmTsthSuite21.h Fri Jul 09 13:09:11 2010 +0100
@@ -0,0 +1,31 @@
+// Copyright (c) 2002-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:
+//
+
+#ifndef __TSU_MMTSTHSUITE21_H__
+#define __TSU_MMTSTHSUITE21_H__
+
+#include <testframework.h>
+
+// base class for the TSU_MMTSTH21 suite.
+class CTSUMmTsthSuite21 : public CTestSuite
+ {
+public:
+ void InitialiseL();
+ virtual ~CTSUMmTsthSuite21();
+ TPtrC GetVersion() const;
+ };
+
+
+#endif //__TSU_MMTSTHSUITE21_H__
--- a/mmtestenv/mmtesttools/Rom/misc.iby Fri Jul 09 12:53:09 2010 +0100
+++ b/mmtestenv/mmtesttools/Rom/misc.iby Fri Jul 09 13:09:11 2010 +0100
@@ -54,8 +54,6 @@
#include <omxilcompref.iby>
#include <omxilcore.iby>
#include <avi.iby>
-#include <mmfaudiowavtestcontroller.iby>
-#include <mmfaudiotonetestcontroller.iby>
#ifdef SYMBIAN_GRAPHICS_USE_GCE
#include <videorenderer.iby>