# HG changeset patch
# User hgs
# Date 1286491470 -3600
# Node ID fcaf4606ba4e10c28863a4d6fb58b371af9fa4a1
# Parent  b8ed18f6c07b845cb4177094bc21810d9a623b43
2010wk40_04

diff -r b8ed18f6c07b -r fcaf4606ba4e eaacplusutil_stub/emgroup/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eaacplusutil_stub/emgroup/bld.inf	Thu Oct 07 23:44:30 2010 +0100
@@ -0,0 +1,21 @@
+
+// Copyright (c) 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:
+//
+
+#ifdef WINS
+
+#include "../group/bld.inf"
+
+#endif
diff -r b8ed18f6c07b -r fcaf4606ba4e filter_package_definition.bat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/filter_package_definition.bat	Thu Oct 07 23:44:30 2010 +0100
@@ -0,0 +1,9 @@
+@if not %SDTOOLS% == "" GOTO OK
+
+@echo You need to set SDTOOLS variable to be the location of the sysdeftools - e.g. \sf\os\buildtools\bldsystemtools\sysdeftools
+
+@goto EXIT
+
+:OK
+perl %SDTOOLS%\joinsysdef.pl -exclude-meta Api -output filtered_package_definition.xml -config %~d0\epoc32\include\feature_settings.hrh -I%~d0\epoc32\include -path ./package_definition.xml package_definition.xml
+:EXIT
diff -r b8ed18f6c07b -r fcaf4606ba4e frametable_stub/emgroup/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/frametable_stub/emgroup/bld.inf	Thu Oct 07 23:44:30 2010 +0100
@@ -0,0 +1,21 @@
+
+// Copyright (c) 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:
+//
+
+#ifdef WINS
+
+#include "../group/bld.inf"
+
+#endif
diff -r b8ed18f6c07b -r fcaf4606ba4e layers.sysdef.xml
--- a/layers.sysdef.xml	Thu Oct 07 22:34:12 2010 +0100
+++ b/layers.sysdef.xml	Thu Oct 07 23:44:30 2010 +0100
@@ -17,7 +17,7 @@
 				<unit name="mmfw" unitID="sos.mmfw" mrp="" bldFile="&layer_real_source_path;/mmlibs/mmfw/group"/>
 				<unit name="mmfcodecs" unitID="sos.mmfcodecs" mrp="" bldFile="&layer_real_source_path;/mmlibs/mmfw/codecs/group"/>				
 			</module>
-			<module name="">
+			<module name="mmaudio_effectspresets">
 				<unit unitID="AudioEqualizerUtility" mrp="" bldFile="&layer_real_source_path;/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build" name="AudioEqualizerUtility" />
 				<unit unitID="EnvironmentalReverbUtility" mrp="" bldFile="&layer_real_source_path;/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build" name="EnvironmentalReverbUtility" />
 			</module>
@@ -49,7 +49,7 @@
 			</module>
 		</layer>
 			
-  	<layer name="stub_layer">
+  	<layer name="stubs_layer">
 			<module name="mmaudio.nokia.ref">
 				<unit unitID="frametablestub" mrp="" bldFile="&layer_real_source_path;/frametable_stub/group" name="frametablestub" />
 				<unit unitID="eaacplusutilstub" mrp="" bldFile="&layer_real_source_path;/eaacplusutil_stub/group" name="eaacplusutilstub" />
@@ -57,4 +57,4 @@
 		</layer>			
 
   </systemModel>
-</SystemDefinition>
\ No newline at end of file
+</SystemDefinition>
diff -r b8ed18f6c07b -r fcaf4606ba4e mmaudio_config/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_config/group/bld.inf	Thu Oct 07 23:44:30 2010 +0100
@@ -0,0 +1,21 @@
+// Copyright (c) 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:
+//
+
+
+PRJ_EXPORTS
+
+// IBY FILE
+./mmaudio.iby				/epoc32/rom/include/mmaudio.iby
+
diff -r b8ed18f6c07b -r fcaf4606ba4e mmaudio_config/group/mmaudio.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_config/group/mmaudio.iby	Thu Oct 07 23:44:30 2010 +0100
@@ -0,0 +1,45 @@
+// Copyright (c) 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:
+//
+
+
+
+#ifndef MMAUDIO_IBY
+#define MMAUDIO_IBY
+
+#include <acf.iby>
+#include <a3fdevsound.iby>
+
+#include <mmf.iby>
+#include <ASR.iby>
+#include <mmcommon.iby>
+
+//The following are exported to CORE_OS_LAYER_IBY_EXPORT_PATH
+#include <RestrictedAudioOutput.iby>
+#include <GlobalAudioSettings.iby>
+#include <Effects.iby>
+#include <DrmAudioPlayer.iby>
+#include <TelephonyAudioRouting.iby>
+#include <MmfCustomInterfaces.iby>
+#include <AddedDevSoundControl.iby>
+#include <ciextnfactoryplugins.iby>
+#include <MMExtFw.iby>
+#include <EffectsPresets.iby>
+#include <AudioRouting.iby>
+
+
+#endif // MMAUDIO_IBY
+
+
+
diff -r b8ed18f6c07b -r fcaf4606ba4e mmaudio_pub/drm_audio_player_api/tsrc/data/mmc/drm/test3gp.dcf
diff -r b8ed18f6c07b -r fcaf4606ba4e mmaudio_pub/drm_audio_player_api/tsrc/data/mmc/drm/testmp3.dcf
diff -r b8ed18f6c07b -r fcaf4606ba4e package_definition.xml
--- a/package_definition.xml	Thu Oct 07 22:34:12 2010 +0100
+++ b/package_definition.xml	Thu Oct 07 23:44:30 2010 +0100
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="mmaudio" name="Multimedia Audio/DevSound" levels="adaptation hw-if device-fw devices middleware app-if">
+   <collection id="mmaudio_config" name="mmaudio config">
+    <component id="mmaudio_config_comp" name="mmaudio configuration">
+     <unit bldFile="mmaudio_config/group"/>
+    </component>
+   </collection>
    <collection id="devsound" name="Sound Device" level="devices">
    <component id="devsoundapi" name="DevSound API" introduced="7.0s" purpose="mandatory">
     <unit bldFile="devsound/devsoundapi/group" mrp="devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
@@ -475,13 +480,21 @@
   <collection id="frametable_stub" name="Frametable Stub" level="device-fw">
 	<!-- collection is really a component. Needs to move down a directory -->
    <component id="frametable_stub_build" name="Frametable Stub Build" filter="s60,mmaudio_stub" introduced="^4">
-    <unit bldFile="frametable_stub/group"/>
+    <meta rel="config">
+     <pick version="all"><defined condition="SYMBIAN_MMAUDIO_STUBS_ON_TARGET"/></pick>
+    </meta>
+    <unit version="all" bldFile="frametable_stub/group"/>
+    <unit version="winscw-only" bldFile="frametable_stub/emgroup"/>
    </component>
   </collection>
   <collection id="eaacplusutil_stub" name="eAAC Plus Utils Stub" level="hw-if">
 	<!-- collection is really a component. Needs to move down a directory -->
    <component id="eaacplusutil_stub_build" name="eAAC Plus Utils Stub Build" filter="s60,mmaudio_stub" introduced="^4">
-    <unit bldFile="eaacplusutil_stub/group"/>
+    <meta rel="config">
+     <pick version="all"><defined condition="SYMBIAN_MMAUDIO_STUBS_ON_TARGET"/></pick>
+    </meta>
+    <unit version="all" bldFile="eaacplusutil_stub/group"/>
+    <unit version="winscw-only" bldFile="eaacplusutil_stub/emgroup"/>
    </component>
   </collection>
   </package>