--- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Src/AdvancedAudioDecoder.cpp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Src/AdvancedAudioDecoder.cpp Mon Mar 15 12:42:35 2010 +0200
@@ -122,7 +122,7 @@
QueueThisBuffer(aIndex); // will set iNextBuffer (current buffer) and update iSharedBufferIndex (to next buffer)
- if(aSourceSampleRate != aSWConvertSampleRate) // Sampling Rate Conversion is needed
+ if(aSourceSampleRate != aSWConvertSampleRate && !IsHwAccelerated()) // Sampling Rate Conversion is needed
{
if (!iChannelAndSampleRateConverterFactory)
{
--- a/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/DevSoundAudioOutput/Src/DevSoundAudioOutput.cpp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmfenh/advancedaudiocontroller/audiocontrollerpluginsvariant/DevSoundAudioOutput/Src/DevSoundAudioOutput.cpp Mon Mar 15 12:42:35 2010 +0200
@@ -23,6 +23,7 @@
#include <mmfpaniccodes.h>
#include <ConfigurationComponentsFactory.h>
#include <AudioOutputControlUtility.h>
+#include <S60FourCC.h>
// CONSTANTS
const TUint KSampleRate8000Hz = 8000;
@@ -329,6 +330,19 @@
}
}
+ //aac HWcodec will downsample by 2, if it is greater than 48k
+ //Hence devsound should be onfigured with that value
+ if(iSourceSampleRate > KSampleRate48000Hz && iSourceFourCC == KS60FourCCCodeEAAC && iAdvancedAudioDecoder->IsHwAccelerated())
+ {
+ TUint samplerate = iSourceSampleRate/2;
+ for (; sampleRateIndex >= 0; sampleRateIndex--)
+ {
+ if(samplerate >= supportedSR[sampleRateIndex][0])
+ {
+ break;
+ }
+ }
+ }
// find the highest sink sample rate below the source rate
for (; sampleRateIndex >= 0; sampleRateIndex--)
{
--- a/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/conf/AudioPlaybackTestModule.cfg Fri Mar 12 15:45:41 2010 +0200
+++ b/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/AudioPlaybackTestModule/conf/AudioPlaybackTestModule.cfg Mon Mar 15 12:42:35 2010 +0200
@@ -1356,7 +1356,7 @@
PlayDelay 15000000
[End_TestCase]
-// Total duration of 37s_MID_Generic.mid is 37 seconds
+// Total duration of 30s_MID_Generic.mid is 37 seconds
[TestCase]
id 155
@@ -1452,7 +1452,7 @@
[TestCase]
id 156
Title AudioPlayback.160 - Repeat PlayWindow MIDI
-SoundFile e:\testing\data\mid\37s_MID_Generic.mid
+SoundFile e:\testing\data\mid\30s_MID_Generic.mid
RepeatTimes 3
SilenceDuration 3 000 000
StartPosition 10 000 000
@@ -1551,12 +1551,12 @@
PlayDelay 20000000
[End_TestCase]
-// Total duration of 37s_MID_Generic.mid is 37 seconds
+// Total duration of 30s_MID_Generic.mid is 37 seconds
[TestCase]
id 157
Title AudioPlayback.168 - Repeat Pause PlayWindow MIDI
-SoundFile e:\testing\data\mid\37s_MID_Generic.mid
+SoundFile e:\testing\data\mid\30s_MID_Generic.mid
RepeatTimes 3
SilenceDuration 3 000 000
StartPosition 10 000 000
@@ -1728,7 +1728,7 @@
// [TestCase]
// id 158
// Title AudioPlayback.184 - Repeat PlayWindow forever MIDI
-// SoundFile e:\testing\data\mid\37s_MID_Generic.mid
+// SoundFile e:\testing\data\mid\30s_MID_Generic.mid
// RepeatTimes -2
// SilenceDuration 3 000 000
// StartPosition 10 000 000
--- a/mmfenh/enhancedmediaclient/Client/src/Components/ClientProgDLSource/ClientProgDLSource.h Fri Mar 12 15:45:41 2010 +0200
+++ b/mmfenh/enhancedmediaclient/Client/src/Components/ClientProgDLSource/ClientProgDLSource.h Mon Mar 15 12:42:35 2010 +0200
@@ -21,7 +21,7 @@
#include <e32base.h>
#include <ProgDLSource.h>
-#include <DownloadMgrClient.h>
+#include <downloadmgrclient.h>
#include <mmfcontrollerframework.h>
#include <MultimediaDataSource.h>
--- a/mmfenh/enhancedmediaclient/Client/src/Components/ClientProgDLSource/DownloadGateway.h Fri Mar 12 15:45:41 2010 +0200
+++ b/mmfenh/enhancedmediaclient/Client/src/Components/ClientProgDLSource/DownloadGateway.h Mon Mar 15 12:42:35 2010 +0200
@@ -20,7 +20,7 @@
#define DOWNLOADGATEWAY_H
#include <e32base.h>
-#include <DownloadMgrClientApiExt.h>
+#include <downloadmgrclientapiext.h>
#include <ProgDLSource.h>
namespace multimedia
--- a/mmfenh/enhancedmediaclient/Client/src/Components/StreamControl/ClientStreamControl.cpp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmfenh/enhancedmediaclient/Client/src/Components/StreamControl/ClientStreamControl.cpp Mon Mar 15 12:42:35 2010 +0200
@@ -211,12 +211,17 @@
{
TInt status(KErrNotReady);
// Get the observer from effect
- CEffectControlBase* effectBase =
+ if(&aEffect)
+ {
+ CEffectControlBase* effectBase =
dynamic_cast<CEffectControlBase*>(&aEffect);
// Remove the effect from the array
TInt index(KErrNotFound);
- index = iAssociatedEffects.Find(effectBase);
+ if(effectBase)
+ {
+ index = iAssociatedEffects.Find(effectBase);
+
if (index != KErrNotFound)
{
MControlObserver* observer;
@@ -229,9 +234,11 @@
iAssociatedEffects.Remove(index);
status = effectBase->RemovedFromStreamControl(*this);
RETURN_IF_ERROR( status );
+ }
}
-
+ }
return status;
+
}
TInt CStreamControl::AddEffect(MEffectControl& aEffect)
@@ -525,7 +532,10 @@
if (iSourceControl)
{
CSourceBase* sourcebase = dynamic_cast<CSourceBase*>(iSourceControl);
- sourcebase->ServerSourceDeleted();
+ if (sourcebase)
+ sourcebase->ServerSourceDeleted();
+ else
+ return status;
}
SetStreamState(EStreamClosed, KErrNone);
@@ -627,10 +637,13 @@
// seperate function and call function here...
// Signal the source that server side source is unloaded
+ if (iSourceControl)
+ {
CSourceBase* sourcebase =
dynamic_cast<CSourceBase*>(iSourceControl);
- sourcebase->ServerSourceDeleted();
-
+ if (sourcebase)
+ sourcebase->ServerSourceDeleted();
+ }
if (iControllerEventMonitor)
{
iControllerEventMonitor->Cancel();
@@ -666,11 +679,18 @@
// Save the uid of controller loaded.
iControllerUid = aControllerUid;
// Signal the source that server side source is loaded
- CSourceBase* sourcebase =
+ if (iSourceControl)
+ {
+ CSourceBase* sourcebase =
dynamic_cast<CSourceBase*>(iSourceControl);
- sourcebase->ServerSourceCreated( *iCMCustomCommand,
+ if (sourcebase)
+ sourcebase->ServerSourceCreated( *iCMCustomCommand,
*aSourceHandle);
-
+ else
+ {
+ SetStreamState(EStreamClosed, aError);
+ }
+ }
if (iStreamState == EStreamOpening)
{
iPrimeController = ETrue;
@@ -699,7 +719,7 @@
TInt CStreamControl::LaunchController()
{
- TInt status(KErrNone);
+ TInt status(KErrNotReady);
// KUidMediaTypeAudio need to be part of source
ConfigureControllerLoader(KUidMediaTypeAudio,
CMMFFindAndOpenController::EPlayback);
@@ -707,9 +727,25 @@
if (!iSourceControl || !iSinkControl)
return KErrNotReady;
+ CSourceBase *sourceBase=(dynamic_cast<CSourceBase*>(iSourceControl));
+ TUid sourceUID ;
- TUid sourceUID = (dynamic_cast<CSourceBase*>(iSourceControl))->GetSourceUid();
- TUid sinkUID = (dynamic_cast<CSinkBase*>(iSinkControl))->GetSinkUid();
+ if (sourceBase)
+ {
+ sourceUID = sourceBase->GetSourceUid();
+ }
+ else
+ {
+ return KErrNotReady;
+ }
+
+ CSinkBase *sinkBase=(dynamic_cast<CSinkBase*>(iSinkControl));
+ TUid sinkUID;
+
+ if(sinkBase)
+ sinkUID = sinkBase ->GetSinkUid();
+ else
+ return KErrNotReady;
if (iSourceControl->Type() == KDataBufferSourceControl)
{
@@ -755,7 +791,7 @@
HBufC8* mimeType = HBufC8::NewLC(KMaxMimeLength);
TPtr8 mimeTypePtr = mimeType->Des();
- TInt status = iSourceControl->GetMimeType(mimeTypePtr);
+ status = iSourceControl->GetMimeType(mimeTypePtr);
iFindAndOpenController->ConfigureSourceSink(
TMMFileSource(fileNamePtr,
@@ -806,7 +842,7 @@
HBufC8* mimeType = HBufC8::NewLC(KMaxMimeLength);
TPtr8 mimeTypePtr = mimeType->Des();
- TInt status = iSourceControl->GetMimeType(mimeTypePtr);
+ status = iSourceControl->GetMimeType(mimeTypePtr);
iFindAndOpenController->ConfigureSourceSink(
CMMFFindAndOpenController::TSourceSink(sourceUID,
--- a/mmfenh/enhancedmediaclient/Client/src/Components/StreamControl/ClientStreamControl.h Fri Mar 12 15:45:41 2010 +0200
+++ b/mmfenh/enhancedmediaclient/Client/src/Components/StreamControl/ClientStreamControl.h Mon Mar 15 12:42:35 2010 +0200
@@ -23,7 +23,7 @@
#include <e32base.h>
#include <StreamControl.h>
-#include <mcustominterface.h>
+#include <MCustomInterface.h>
#include <mmf/common/mmfcontroller.h>
#include "ClientUtility.h"
#include <Events.h>
--- a/mmfenh/progressivedownload/ProgressiveDownloadUtility/src/EMCPdPlayUtility.h Fri Mar 12 15:45:41 2010 +0200
+++ b/mmfenh/progressivedownload/ProgressiveDownloadUtility/src/EMCPdPlayUtility.h Mon Mar 15 12:42:35 2010 +0200
@@ -32,7 +32,7 @@
#include <mmf/common/mmcaf.h>
-#include <DownloadMgrClient.h>
+#include <downloadmgrclient.h>
#include "MAudioPdPlayUtility.h"
#include "MProgressiveDownloadUtility.h"
--- a/mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/group/TmsAudioServicesTestClass.mmp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/group/TmsAudioServicesTestClass.mmp Mon Mar 15 12:42:35 2010 +0200
@@ -38,7 +38,7 @@
MW_LAYER_SYSTEMINCLUDE
OS_LAYER_LIBC_SYSTEMINCLUDE
OS_LAYER_GLIB_SYSTEMINCLUDE
-SYSTEMINCLUDE /epoc32/include/stdapis/stlport
+OS_LAYER_STDCPP_SYSTEMINCLUDE
LIBRARY euser.lib
LIBRARY stiftestinterface.lib
--- a/mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/sis/create_sis.bat Fri Mar 12 15:45:41 2010 +0200
+++ b/mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/sis/create_sis.bat Mon Mar 15 12:42:35 2010 +0200
@@ -1,3 +1,22 @@
+cls
+@echo off
+echo.
+
+rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+rem All rights reserved.
+rem This component and the accompanying materials are made available
+rem under the terms of the License "Eclipse Public License v1.0"
+rem which accompanies this distribution, and is available
+rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+rem
+rem Initial Contributors:
+rem Nokia Corporation - initial contribution.
+rem
+rem Contributors:
+rem
+echo Description: TMS SIS package creation utility
+rem
+
del TmsAudioServicesTestClass.sis*
makesis TmsAudioServicesTestClass.pkg TmsAudioServicesTestClass.sis
signsis TmsAudioServicesTestClass.sis TmsAudioServicesTestClass.sisx rd.crt rd.key
--- a/mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/VoIPAudioServicesTestClass.mmp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/VoIPAudioServicesTestClass.mmp Mon Mar 15 12:42:35 2010 +0200
@@ -1,20 +1,19 @@
/*
-* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: voip audio service -
-*
-*/
-
+ * Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: voip audio service -
+ *
+ */
#include <platform_paths.hrh>
@@ -22,15 +21,8 @@
TARGETTYPE dll
UID 0x1000008D 0x101FB3E3
-#if defined(EKA2)
CAPABILITY ALL -TCB
-/* Remove comments and replace 0x00000000 with correct vendor id */
-// VENDORID 0x00000000
-/* Remove comments and replace 0x00000000 with correct secure id */
-// SECUREID 0x00000000
-#endif
-//TARGETPATH ?target_path
DEFFILE VoIPAudioServicesTestClass.def
SOURCEPATH ../src
@@ -39,38 +31,20 @@
SOURCE VoIPAudioServicesTestClassBlocksCallbacks.cpp
SOURCE TimeoutController.cpp
+USERINCLUDE ../inc
-USERINCLUDE ../inc
-//USERINCLUDE ../../../../inc
-//USERINCLUDE ../../../../../../inc_domain
-
-//SYSTEMINCLUDE /epoc32/include
MW_LAYER_SYSTEMINCLUDE
SYSTEMINCLUDE /epoc32/include/mmf/common
SYSTEMINCLUDE /epoc32/include/mmf/server
LIBRARY euser.lib
LIBRARY stiftestinterface.lib
-
LIBRARY Orientationbase.lib
-LIBRARY efsrv.lib // File server session for database
-//LIBRARY mmfserverbaseclasses.lib // MMF Codec - for Voice Codecs
-//LIBRARY mediaclientaudio.lib
-//LIBRARY CustomInterfaceUtility.lib
-//LIBRARY CustomCommandUtility.lib
-
-LIBRARY VoIPAudioIntfc.lib
-//LIBRARY ConfigurationComponentsFactory.lib
-//LIBRARY RestrictedAudioOutput.lib
-//LIBRARY MmfDevSound.lib
+LIBRARY efsrv.lib // File server session for database
+LIBRARY VoIPAudioIntfc.lib
LANG SC
-
-// Other possible keywords:
-
-// DOCUMENT ?file, that is not compiled, but added to MSVC project workspace (i.e. release notes)
-
SMPSAFE
// End of File
--- a/mmserv/callaudiocontrol/group/CallAudioControl.mmp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/callaudiocontrol/group/CallAudioControl.mmp Mon Mar 15 12:42:35 2010 +0200
@@ -24,7 +24,7 @@
#include <platform_paths.hrh>
#endif
-TARGET CallAudioControl.dll
+TARGET callaudiocontrol.dll
TARGETTYPE DLL
UID 0x1000008D 0x10207BD2
@@ -46,7 +46,7 @@
//SYSTEMINCLUDE /epoc32/include/CallAudioControl
LIBRARY euser.lib
-LIBRARY TelephonyAudioRouting.lib
+LIBRARY telephonyaudiorouting.lib
LIBRARY centralrepository.lib
#ifdef __SERIES60_31__
@@ -57,7 +57,7 @@
#endif
#ifndef __SERIES60_31__
-LIBRARY PhoneClient.lib // For setting mute
+LIBRARY phoneclient.lib // For setting mute
#endif
// End of file
--- a/mmserv/callaudiocontrol/group/bld.inf Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/callaudiocontrol/group/bld.inf Mon Mar 15 12:42:35 2010 +0200
@@ -27,8 +27,8 @@
PRJ_EXPORTS
-../data/CallAudioControl_Stub.sis /epoc32/data/z/system/install/CallAudioControl_Stub.sis
-../data/backup_registration.xml /epoc32/data/z/private/10207BD2/backup_registration.xml
+../data/CallAudioControl_Stub.sis /epoc32/data/z/system/install/callaudiocontrol_stub.sis
+../data/backup_registration.xml /epoc32/data/z/private/10207bd2/backup_registration.xml
#ifdef __SERIES60_31__
../rom/CallAudioControl.iby /epoc32/rom/include/CallAudioControl.iby
--- a/mmserv/radioutility/fmpresetutility/src/RadioFmPresetUtilityBody.cpp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/radioutility/fmpresetutility/src/RadioFmPresetUtilityBody.cpp Mon Mar 15 12:42:35 2010 +0200
@@ -23,7 +23,7 @@
#include "RadioFmPresetRadioSettings.h"
#include "RadioFmPresetCentralRepositoryHandler.h"
#include "RadioFmPresetCRKeys.h"
-#include <e32Property.h>
+#include <e32property.h>
--- a/mmserv/radioutility/group/bld.inf Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/radioutility/group/bld.inf Mon Mar 15 12:42:35 2010 +0200
@@ -24,7 +24,7 @@
../sis/radioutility/radioutility_stub.sis /epoc32/data/z/system/install/radioutility_stub.sis
PRJ_MMPFILES
-#include "../radioserver/group/bld.inf"
+#include "../radioserver/Group/bld.inf"
#include "../radio_utility/group/bld.inf"
#include "../fmpresetutility/group/bld.inf"
--- a/mmserv/radioutility/inc/RadioSession.h Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/radioutility/inc/RadioSession.h Mon Mar 15 12:42:35 2010 +0200
@@ -26,7 +26,7 @@
// INCLUDES
#include <mmf/common/mmfbase.h>
#include <mmf/common/mmfcontrollerframework.h>
-#include <mcustomcommand.h>
+#include <MCustomCommand.h>
#include "RadioServerData.h"
--- a/mmserv/radioutility/radio_utility/src/RadioFmTunerUtilityBody.h Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/radioutility/radio_utility/src/RadioFmTunerUtilityBody.h Mon Mar 15 12:42:35 2010 +0200
@@ -21,7 +21,7 @@
#ifndef C_RADIOFMTUENRUTILITYBODY_H
#define C_RADIOFMTUENRUTILITYBODY_H
-#include <radiofmtunerutility.h>
+#include <RadioFmTunerUtility.h>
class RRadioSession;
--- a/mmserv/radioutility/radio_utility/src/RadioMonitorBody.h Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/radioutility/radio_utility/src/RadioMonitorBody.h Mon Mar 15 12:42:35 2010 +0200
@@ -23,7 +23,7 @@
#include <e32base.h>
#include <e32property.h>
-#include <radiomonitor.h>
+#include <RadioMonitor.h>
/**
* This class encapsulates the implementation body of CRadioMonitor interface.
--- a/mmserv/radioutility/radio_utility/src/RadioPlayerUtilityBody.cpp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/radioutility/radio_utility/src/RadioPlayerUtilityBody.cpp Mon Mar 15 12:42:35 2010 +0200
@@ -16,7 +16,7 @@
*/
-#include <custominterfaceutility.h>
+#include <CustomInterfaceUtility.h>
#include "RadioServerData.h"
#include "RadioPlayerUtilityBody.h"
#include "RadioSession.h"
--- a/mmserv/radioutility/radio_utility/src/RadioPlayerUtilityBody.h Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/radioutility/radio_utility/src/RadioPlayerUtilityBody.h Mon Mar 15 12:42:35 2010 +0200
@@ -21,7 +21,7 @@
#define C_RADIOPLAYERUTILITYBODY_H
#include <RadioPlayerUtility.h>
-#include <mcustominterface.h>
+#include <MCustomInterface.h>
class RRadioSession;
--- a/mmserv/radioutility/radio_utility/src/RadioRdsUtilityBody.h Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/radioutility/radio_utility/src/RadioRdsUtilityBody.h Mon Mar 15 12:42:35 2010 +0200
@@ -20,8 +20,8 @@
#ifndef C_RADIORDSUTILITYBODY_H
#define C_RADIORDSUTILITYBODY_H
-#include <radiordsutility.h>
-#include "radioutilitybody.h"
+#include <RadioRdsUtility.h>
+#include "RadioUtilityBody.h"
class RRadioSession;
class CRadioUtility;
--- a/mmserv/radioutility/radio_utility/src/RadioUtility.cpp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/radioutility/radio_utility/src/RadioUtility.cpp Mon Mar 15 12:42:35 2010 +0200
@@ -16,7 +16,7 @@
*/
-#include "radioutilitybody.h"
+#include "RadioUtilityBody.h"
// ======== MEMBER FUNCTIONS ========
--- a/mmserv/radioutility/radioserver/Server/Src/RadioServer.cpp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/radioutility/radioserver/Server/Src/RadioServer.cpp Mon Mar 15 12:42:35 2010 +0200
@@ -20,14 +20,14 @@
// INCLUDE FILES
#include <mmf/common/mmfstandardcustomcommands.h>
#include <centralrepository.h>
-#include <coreapplicationuissdkcrkeys.h>
-#include <audiopreference.h>
+#include <CoreApplicationUIsSDKCRKeys.h>
+#include <AudioPreference.h>
#include "RadioServer.h"
#include "RadioServerSession.h"
#include "RadioServerShutdown.h"
#include "RadioServerSettings.h"
-#include "RadioServerFmTuner.h"
+#include "RadioServerFMTuner.h"
#include "RadioDebug.h"
// CONSTANTS
--- a/mmserv/radioutility/radioserver/Server/Src/RadioServer.h Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/radioutility/radioserver/Server/Src/RadioServer.h Mon Mar 15 12:42:35 2010 +0200
@@ -32,7 +32,7 @@
#endif // RD_TSP_CLIENT_MAPPER
#include "RadioServerData.h"
#include "RadioClientServer.h"
-#include "RadioServerFmTuner.h"
+#include "RadioServerFMTuner.h"
// DATA TYPES
struct TRadioMessageRequestData
--- a/mmserv/radioutility/radioserver/Server/Src/RadioServerFMTuner.cpp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/radioutility/radioserver/Server/Src/RadioServerFMTuner.cpp Mon Mar 15 12:42:35 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
-#include "RadioServerFmTuner.h"
+#include "RadioServerFMTuner.h"
#include "RadioDebug.h"
// ============================ MEMBER FUNCTIONS ===============================
--- a/mmserv/radioutility/radioserver/Server/Src/RadioServerSession.cpp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/radioutility/radioserver/Server/Src/RadioServerSession.cpp Mon Mar 15 12:42:35 2010 +0200
@@ -18,8 +18,8 @@
// INCLUDE FILES
-#include <custominterfacebuilder.h>
-#include <custominterfacecustomcommandparser.h>
+#include <CustomInterfaceBuilder.h>
+#include <CustomInterfaceCustomCommandParser.h>
#include <mmf/common/mmfcustomcommandparsermanager.h>
#include <mmf/common/mmfcontrollerframework.h>
#include <mmf/common/mmfipcserver.h>
--- a/mmserv/radioutility/radioserver/Server/Src/RadioServerSession.h Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/radioutility/radioserver/Server/Src/RadioServerSession.h Mon Mar 15 12:42:35 2010 +0200
@@ -22,7 +22,7 @@
// INCLUDES
-#include <mcustominterfacecustomcommandimplementor.h>
+#include <MCustomInterfaceCustomCommandImplementor.h>
#include "RadioServerData.h"
--- a/mmserv/thumbnailengine/Group/HXTNEEngine.mmp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/thumbnailengine/Group/HXTNEEngine.mmp Mon Mar 15 12:42:35 2010 +0200
@@ -42,7 +42,7 @@
SOURCEPATH ../TneProcessorSrc
SOURCE yuv2rgb12.cpp
-SOURCE yuv2rgb16.cpp
+SOURCE Yuv2rgb16.cpp
SOURCE yuv2rgb24.cpp
SOURCEPATH ../ImaamiSrc
@@ -59,7 +59,7 @@
SYSTEMINCLUDE /epoc32/include/mmf/common
SYSTEMINCLUDE /epoc32/include/mmf/devvideo
-USERINCLUDE ../../Inc
+USERINCLUDE ../../inc
USERINCLUDE ../TneAPIInc
USERINCLUDE ../TneProcessorInc
USERINCLUDE ../ImaamiInc
--- a/mmserv/thumbnailengine/Group/bld.inf Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/thumbnailengine/Group/bld.inf Mon Mar 15 12:42:35 2010 +0200
@@ -31,7 +31,7 @@
//
// Export stub sis file to eclipse files in the rom image
//
-../data/vtne_stub.sis /epoc32/data/z/system/install/vtne_stub.sis
+../data/vtne_stub.SIS /epoc32/data/z/system/install/vtne_stub.sis
#define HELIX_TNE_ENGINE 1
--- a/mmserv/thumbnailengine/TneAPIInc/HXTneclientservercommon.h Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/thumbnailengine/TneAPIInc/HXTneclientservercommon.h Mon Mar 15 12:42:35 2010 +0200
@@ -21,8 +21,8 @@
#define _HX_TNE_Client_Server_Common_H_
#include <e32base.h>
-#include <GDI.H>
-#include <FBS.H>
+#include <gdi.h>
+#include <fbs.h>
// server name
--- a/mmserv/tms/tmsapi/group/tmsapi.mmp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/tms/tmsapi/group/tmsapi.mmp Mon Mar 15 12:42:35 2010 +0200
@@ -30,7 +30,7 @@
MW_LAYER_SYSTEMINCLUDE
OS_LAYER_LIBC_SYSTEMINCLUDE
OS_LAYER_GLIB_SYSTEMINCLUDE
-SYSTEMINCLUDE /epoc32/include/stdapis/stlport
+OS_LAYER_STDCPP_SYSTEMINCLUDE
USERINCLUDE ../inc
USERINCLUDE ../../inc
--- a/mmserv/tms/tmscallproxy/group/tmscallproxy.mmp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/tms/tmscallproxy/group/tmscallproxy.mmp Mon Mar 15 12:42:35 2010 +0200
@@ -31,8 +31,8 @@
MW_LAYER_SYSTEMINCLUDE
OS_LAYER_LIBC_SYSTEMINCLUDE
OS_LAYER_GLIB_SYSTEMINCLUDE
+OS_LAYER_STDCPP_SYSTEMINCLUDE
SYSTEMINCLUDE /epoc32/include/mmf/common
-SYSTEMINCLUDE /epoc32/include/stdapis/stlport
USERINCLUDE ../../inc
SOURCEPATH ../src
--- a/mmserv/tms/tmscallserver/group/tmscallserver.mmp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/tms/tmscallserver/group/tmscallserver.mmp Mon Mar 15 12:42:35 2010 +0200
@@ -62,17 +62,17 @@
MW_LAYER_SYSTEMINCLUDE
OS_LAYER_LIBC_SYSTEMINCLUDE
OS_LAYER_GLIB_SYSTEMINCLUDE
-
+OS_LAYER_STDCPP_SYSTEMINCLUDE
SYSTEMINCLUDE /epoc32/include/mmf/server
SYSTEMINCLUDE /epoc32/include/mda/common
SYSTEMINCLUDE /epoc32/include/mmf/common
-SYSTEMINCLUDE /epoc32/include/stdapis/stlport
#ifdef __USE_GSTREAMER__
-SYSTEMINCLUDE /sf/mw/gstreamer/include/gstreamer
-SYSTEMINCLUDE /sf/mw/gstreamer/include/gstreamer/gst
-SYSTEMINCLUDE /sf/mw/gstreamer/include/gstreamer/gst/app
-SYSTEMINCLUDE /epoc32/include/stdapis/glib-2.0/gobject
+MW_LAYER_GSTREAMER_SYSTEMINCLUDE
+//SYSTEMINCLUDE /sf/mw/gstreamer/include/gstreamer
+//SYSTEMINCLUDE /sf/mw/gstreamer/include/gstreamer/gst
+//SYSTEMINCLUDE /sf/mw/gstreamer/include/gstreamer/gst/app
+//SYSTEMINCLUDE /epoc32/include/stdapis/glib-2.0/gobject
LIBRARY libgobject.lib
LIBRARY libgstreamer.lib
--- a/mmserv/tms/tmsfactory/group/tmsfactory.mmp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/tms/tmsfactory/group/tmsfactory.mmp Mon Mar 15 12:42:35 2010 +0200
@@ -33,7 +33,7 @@
MW_LAYER_SYSTEMINCLUDE
OS_LAYER_LIBC_SYSTEMINCLUDE
OS_LAYER_GLIB_SYSTEMINCLUDE
-SYSTEMINCLUDE /epoc32/include/stdapis/stlport
+OS_LAYER_STDCPP_SYSTEMINCLUDE
SYSTEMINCLUDE /epoc32/include/mmf/common
SOURCEPATH ../src
--- a/mmserv/tms/tmsimpl/group/tmsimpl.mmp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/tms/tmsimpl/group/tmsimpl.mmp Mon Mar 15 12:42:35 2010 +0200
@@ -34,7 +34,7 @@
MW_LAYER_SYSTEMINCLUDE
OS_LAYER_LIBC_SYSTEMINCLUDE
OS_LAYER_GLIB_SYSTEMINCLUDE
-SYSTEMINCLUDE /epoc32/include/stdapis/stlport
+OS_LAYER_STDCPP_SYSTEMINCLUDE
SYSTEMINCLUDE /epoc32/include/mmf/common
SOURCEPATH ../src
--- a/mmserv/tms/tmsproxy/group/tmsproxy.mmp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/tms/tmsproxy/group/tmsproxy.mmp Mon Mar 15 12:42:35 2010 +0200
@@ -34,7 +34,7 @@
MW_LAYER_SYSTEMINCLUDE
OS_LAYER_LIBC_SYSTEMINCLUDE
OS_LAYER_GLIB_SYSTEMINCLUDE
-SYSTEMINCLUDE /epoc32/include/stdapis/stlport
+OS_LAYER_STDCPP_SYSTEMINCLUDE
SYSTEMINCLUDE /epoc32/include/mmf/common
SYSTEMINCLUDE /epoc32/include/mda/common
SYSTEMINCLUDE /epoc32/include/mmf/server
--- a/mmserv/tms/tmsserver/group/tmsserver.mmp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/tms/tmsserver/group/tmsserver.mmp Mon Mar 15 12:42:35 2010 +0200
@@ -42,13 +42,10 @@
MW_LAYER_SYSTEMINCLUDE
OS_LAYER_LIBC_SYSTEMINCLUDE
OS_LAYER_GLIB_SYSTEMINCLUDE
-
+OS_LAYER_STDCPP_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include/mda/common
SYSTEMINCLUDE /epoc32/include/mmf/server
-SYSTEMINCLUDE /epoc32/include/mda/common
SYSTEMINCLUDE /epoc32/include/mmf/common
-SYSTEMINCLUDE /epoc32/include/platform/app
-SYSTEMINCLUDE /epoc32/include/stdapis/stlport
-SYSTEMINCLUDE /epoc32/include/stdapis/glib-2.0/gobject
LIBRARY ecom.lib
LIBRARY euser.lib
--- a/mmserv/tms/tmsutility/group/tmsutility.mmp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/tms/tmsutility/group/tmsutility.mmp Mon Mar 15 12:42:35 2010 +0200
@@ -30,7 +30,7 @@
MW_LAYER_SYSTEMINCLUDE
OS_LAYER_LIBC_SYSTEMINCLUDE
OS_LAYER_GLIB_SYSTEMINCLUDE
-SYSTEMINCLUDE /epoc32/include/stdapis/stlport
+OS_LAYER_STDCPP_SYSTEMINCLUDE
SYSTEMINCLUDE /epoc32/include/mmf/common
USERINCLUDE ../inc
--- a/mmserv/voipaudioservices/VoIPServer/group/VoIPAudioServer.mmp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/voipaudioservices/VoIPServer/group/VoIPAudioServer.mmp Mon Mar 15 12:42:35 2010 +0200
@@ -25,6 +25,7 @@
EPOCHEAPSIZE 0x20000 0x1000000 // Min 128kb, max 16Mb
CAPABILITY MultiMediaDD ReadDeviceData WriteDeviceData UserEnvironment ReadUserData WriteUserData
VENDORID VID_DEFAULT
+EPOCPROCESSPRIORITY high
SOURCEPATH ../src
--- a/mmserv/voipaudioservices/VoIPServer/inc/VoIPECallEventHandler.h Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/voipaudioservices/VoIPServer/inc/VoIPECallEventHandler.h Mon Mar 15 12:42:35 2010 +0200
@@ -21,7 +21,7 @@
// INCLUDES
#include <e32base.h>
#include <e32property.h>
-#include "voipserver.h"
+#include "VoIPServer.h"
// CLASS DECLARATION
class CVoIPECallEventHandler : public CActive
--- a/mmserv/voipaudioservices/VoIPServer/src/VoIPECallEventHandler.cpp Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/voipaudioservices/VoIPServer/src/VoIPECallEventHandler.cpp Mon Mar 15 12:42:35 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include <ctsydomainpskeys.h>
#include "debugtracemacros.h"
-#include "voipecalleventhandler.h"
+#include "VoIPECallEventHandler.h"
// -----------------------------------------------------------------------------
// CVoIPECallEventHandler::CVoIPECallEventHandler
--- a/package_definition.xml Fri Mar 12 15:45:41 2010 +0200
+++ b/package_definition.xml Mon Mar 15 12:42:35 2010 +0200
@@ -23,11 +23,12 @@
<component id="progressivedownload" filter="s60" name="Progressive Download">
<unit bldFile="mmfenh/progressivedownload/group"/>
</component>
- </collection>
- <collection id="mmfw" name="Multimedia Frameworks" level="framework">
+ <component id="mmfenh_test" filter="s60,test,module_test,pref_test" name="MMF Enhancements Tests" purpose="development">
+ <unit bldFile="mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/>
+ </component>
</collection>
<collection id="mmserv" name="Multimedia Services" level="specific">
- <component id="audioeffectsui="s60" name="Audio Effects UI">
+ <component id="audioeffectsui" filter="s60" name="Audio Effects UI">
<unit bldFile="mmserv/audioeffectsui/group"/>
</component>
<component id="callaudiocontrol" filter="s60" name="Call Audio Control">
@@ -48,11 +49,17 @@
<component id="voipaudioservices" filter="s60" name="VoIP Audio Services">
<unit bldFile="mmserv/voipaudioservices/group"/>
</component>
- </collection>
+ <component id="lib3gpextparser" filter="s60" name="3GP Extension Metadata Parser Library">
+ <unit bldFile="mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
+ </component>
+ </collection>
<collection id="mmmw_info" name="Multimedia Middleware Info" level="specific">
- <component id="mmmw_test" filter="s60" name="Multimedia Middleware Test" purpose="development">
+ <component id="mmmw_test" filter="s60,test,api_test,pref_test" name="Multimedia Middleware Tests" purpose="development">
<unit bldFile="tsrc/group"/>
</component>
+ <component id="mmmw_api_test" filter="s60,test,api_test" name="Multimedia Middleware API Tests" purpose="development">
+ <unit bldFile="mmmw_plat/telephony_multimedia_service_api/tsrc/group"/>
+ </component>
<component id="mmmw_plat" filter="s60" name="Multimedia Middleware Platform Interfaces" class="api">
<unit bldFile="mmmw_plat/group"/>
</component>