--- a/CompilerCompatibility/mw/mmmw/package_definition.xml	Wed Apr 21 18:29:51 2010 +0100
+++ b/CompilerCompatibility/mw/mmmw/package_definition.xml	Tue May 18 16:26:09 2010 +0100
@@ -54,68 +54,139 @@
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-    <collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-     <component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-      <unit bldFile="/sf/mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-     </component>
-     <component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-      <unit bldFile="/sf/mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-     </component>
-     <component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-      <unit bldFile="/sf/mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-     </component>
-     <component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-      <unit bldFile="/sf/mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-     </component>
-     <component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-      <unit bldFile="/sf/mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-     </component>
-     <component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-      <unit bldFile="/sf/mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-     </component>
-     <component name="progressivedownload" filter="s60" long-name="Progressive Download">
-      <unit bldFile="/sf/mw/mmmw/mmfenh/progressivedownload/group"/>
-     </component>
-    </collection>
-    <collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-     <!-- Id needs to be unique, mmfw already in use -->
-     <!-- Placeholder for OpenAX AL and other stuff -->
-    </collection>
-    <collection name="mmserv" long-name="Multimedia Services" level="specific">
-     <component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-      <unit bldFile="/sf/mw/mmmw/mmserv/audioeffectsui/group"/>
-     </component>
-     <component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-      <unit bldFile="/sf/mw/mmmw/mmserv/callaudiocontrol/group"/>
-     </component>
-     <component name="metadatautility" filter="s60" long-name="Metadata Utility">
-      <unit bldFile="/sf/mw/mmmw/mmserv/metadatautility/group"/>
-     </component>
-     <component name="radioutility" filter="s60" long-name="Radio Utility">
-      <unit bldFile="/sf/mw/mmmw/mmserv/radioutility/group"/>
-     </component>
-     <component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-      <unit bldFile="/sf/mw/mmmw/mmserv/thumbnailengine/group"/>
-     </component>
-     <component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-      <unit bldFile="/sf/mw/mmmw/mmserv/tms/group"/>
-     </component>
-     <component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-      <unit bldFile="/sf/mw/mmmw/mmserv/voipaudioservices/group"/>
-     </component>
-     <component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-      <unit bldFile="/sf/mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-     </component>
-    </collection>
-    <collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-     <component name="mmmw_plat" filter="s60" long-name="Multimedia Middleware Platform Interfaces" class="api">
-      <unit bldFile="/sf/mw/mmmw/mmmw_plat/group"/>
-     </component>
-     <component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-      <unit mrp="/sf/mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
+<collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
+<component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
+</component>
+<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/progressive_download_api/group"/>
+</component>
+<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
+</component>
+<component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
+</component>
+<component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
+</component>
+<component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
+</component>
+<component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
+</component>
+<component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
+</component>
+<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
+</component>
+<component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
+</component>
+<component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
+</component>
+<component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
+</component>
+<component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
+</component>
+<component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
+</component>
+<component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
+</component>
+<component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
+</component>
+<component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
+</component>
+<component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
+</component>
+<component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
+</component>
+<component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
+</component>
+<component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
+</component>
+<component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
+</component>
+<component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
+</component>
+<component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
+<unit bldFile="/sf/mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
+</component>
+</collection>
+<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
+<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
+<unit bldFile="/sf/mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
+</component>
+<component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
+<unit bldFile="/sf/mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
+</component>
+<component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
+<unit bldFile="/sf/mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
+</component>
+<component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
+<unit bldFile="/sf/mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
+</component>
+<component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
+<unit bldFile="/sf/mw/mmmw/mmfenh/enhancedmediaclient/group"/>
+</component>
+<component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
+<unit bldFile="/sf/mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
+</component>
+<component name="progressivedownload" filter="s60" long-name="Progressive Download">
+<unit bldFile="/sf/mw/mmmw/mmfenh/progressivedownload/group"/>
+</component>
+</collection>
+<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
+<!-- Id needs to be unique, mmfw already in use -->
+<!-- Placeholder for OpenAX AL and other stuff -->
+</collection>
+<collection name="mmserv" long-name="Multimedia Services" level="specific">
+<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
+<unit bldFile="/sf/mw/mmmw/mmserv/audioeffectsui/group"/>
+</component>
+<component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
+<unit bldFile="/sf/mw/mmmw/mmserv/callaudiocontrol/group"/>
+</component>
+<component name="metadatautility" filter="s60" long-name="Metadata Utility">
+<unit bldFile="/sf/mw/mmmw/mmserv/metadatautility/group"/>
+</component>
+<component name="radioutility" filter="s60" long-name="Radio Utility">
+<unit bldFile="/sf/mw/mmmw/mmserv/radioutility/group"/>
+</component>
+<component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
+<unit bldFile="/sf/mw/mmmw/mmserv/thumbnailengine/group"/>
+</component>
+<component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
+<unit bldFile="/sf/mw/mmmw/mmserv/tms/group"/>
+</component>
+<component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
+<unit bldFile="/sf/mw/mmmw/mmserv/voipaudioservices/group"/>
+</component>
+<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
+<unit bldFile="/sf/mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
+</component>
+</collection>
+<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
+<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="/sf/mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file