diff -r b68f3e90dca1 -r 261fd7adccd0 package_definition.xml
--- a/package_definition.xml	Fri Sep 17 08:37:57 2010 +0300
+++ b/package_definition.xml	Mon Oct 04 02:40:16 2010 +0300
@@ -1,303 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
  <package id="mm" name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
-  <collection id="mm_pub" name="Multimedia Public Interfaces" level="app-if">
-   <component id="audio_effects_api" name="Audio Effects API" class="api" filter="s60">
-    <meta rel="Api" href="mm_pub/audio_effects_api/audio_effects_api.metaxml"/>
-    <unit bldFile="mm_pub/audio_effects_api/group" filter="!test"/>
-    <unit bldFile="mm_pub/audio_effects_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
-   </component>
-   <component id="audio_effects_presets_api" name="Audio Effects Presets API" class="api" filter="s60">
-    <meta rel="Api" href="mm_pub/audio_effects_presets_api/audio_effects_presets_api.metaxml"/>
-    <unit bldFile="mm_pub/audio_effects_presets_api/group" filter="!test"/>
-    <unit bldFile="mm_pub/audio_effects_presets_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
-   </component>
-   <component id="drm_audio_player_api" name="DRM Audio Player API" class="api" filter="s60">
-    <meta rel="Api" href="mm_pub/drm_audio_player_api/drm_audio_player_api.metaxml"/>
-    <unit bldFile="mm_pub/drm_audio_player_api/group" filter="!test"/>
-    <unit bldFile="mm_pub/drm_audio_player_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
-   </component>
-   <component id="multimedia_extension_interfaces_api" name="Multimedia Extension Interfaces API" class="api" filter="s60">
-    <meta rel="Api" href="mm_pub/multimedia_extension_interfaces_api/multimedia_extension_interfaces_api.metaxml"/>
-    <unit bldFile="mm_pub/multimedia_extension_interfaces_api/group"/>
-   </component>
-  </collection>
   <collection id="mm_plat" name="Multimedia Platform Interfaces" level="app-if">
-   <component id="aac_decoder_config_api" name="AAC Decoder Config API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/aac_decoder_config_api/aac_decoder_config_api.metaxml"/>
-    <unit bldFile="mm_plat/aac_decoder_config_api/group" filter="!test"/>
-    <unit bldFile="mm_plat/aac_decoder_config_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
-   </component>
-   <component id="aac_decoder_config_msg_hdlr_api" name="AAC Decoder Config Msg Hdlr API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/aac_decoder_config_msg_hdlr_api/aac_decoder_config_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/aac_decoder_config_msg_hdlr_api/group"/>
-   </component>
-   <component id="aac_decoder_config_proxy_api" name="AAC Decoder Config Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/aac_decoder_config_proxy_api/aac_decoder_config_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/aac_decoder_config_proxy_api/group"/>
-   </component>
-   <component id="added_devsound_control_api" name="Added DevSound Control API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/added_devsound_control_api/added_devsound_control_api.metaxml"/>
-    <unit bldFile="mm_plat/added_devsound_control_api/group"/>
-   </component>
-   <component id="added_devsound_control_msg_hdlr_api" name="Added DevSound Control Msg Hdlr API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/added_devsound_control_msg_hdlr_api/added_devsound_control_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-   </component>
-   <component id="added_devsound_control_proxy_api" name="Added DevSound Control Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/added_devsound_control_proxy_api/added_devsound_control_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/added_devsound_control_proxy_api/group"/>
-   </component>
-   <component id="audio_effects_msg_hdlr_api" name="Audio Effects Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/audio_effects_msg_hdlr_api/audio_effects_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/audio_effects_msg_hdlr_api/group"/>
-   </component>
-   <component id="audio_effects_proxy_api" name="Audio Effects Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/audio_effects_proxy_api/audio_effects_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/audio_effects_proxy_api/group"/>
-   </component>
-   <component id="audio_policy_header_api" name="Audio Policy Header API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/audio_policy_header_api/audio_policy_header_api.metaxml"/>
-    <unit bldFile="mm_plat/audio_policy_header_api/group"/>
-   </component>
-   <component id="audio_routing_api" name="Audio Routing API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/audio_routing_api/audio_routing_api.metaxml"/>
-    <unit bldFile="mm_plat/audio_routing_api/group" filter="!test"/>
-    <unit bldFile="mm_plat/audio_routing_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
-   </component>
-   <component id="audio_routing_msg_hdlr_api" name="Audio Routing Msg Hdlr API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/audio_routing_msg_hdlr_api/audio_routing_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/audio_routing_msg_hdlr_api/group"/>
-   </component>
-   <component id="audio_routing_proxy_api" name="Audio Routing Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/audio_routing_proxy_api/audio_routing_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/audio_routing_proxy_api/group"/>
-   </component>
-   <component id="custom_interface_builder_api" name="Custom Interface Builder API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/custom_interface_builder_api/custom_interface_builder_api.metaxml"/>
-    <unit bldFile="mm_plat/custom_interface_builder_api/group"/>
-   </component>
-   <component id="custom_interface_message_handler_factory_api" name="Custom Interface Message Handler Factory API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/custom_interface_message_handler_factory_api/custom_interface_message_handler_factory_api.metaxml"/>
-    <unit bldFile="mm_plat/custom_interface_message_handler_factory_api/group"/>
-   </component>
-   <component id="custom_interface_proxy_factory_api" name="Custom Interface Proxy Factory API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/custom_interface_proxy_factory_api/custom_interface_proxy_factory_api.metaxml"/>
-    <unit bldFile="mm_plat/custom_interface_proxy_factory_api/group"/>
-   </component>
-   <component id="custom_interface_utility_api" name="Custom Interface Utility API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/custom_interface_utility_api/custom_interface_utility_api.metaxml"/>
-    <unit bldFile="mm_plat/custom_interface_utility_api/group"/>
-   </component>
-   <component id="devsound_adaptation_api" name="DevSound Adaptation API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/devsound_adaptation_api/devsound_adaptation_api.metaxml"/>
-    <unit bldFile="mm_plat/devsound_adaptation_api/group"/>
-   </component>
-   <component id="display_posting_api" name="Display Posting API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/display_posting_api/display_posting_api.metaxml"/>
-    <unit bldFile="mm_plat/display_posting_api/group"/>
-   </component>
-   <component id="eaac_plus_decoder_interface_api" name="eAAC Plus Decoder Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/eaac_plus_decoder_interface_api/eaac_plus_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/eaac_plus_decoder_interface_api/group" filter="!test"/>
-    <unit bldFile="mm_plat/eaac_plus_decoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
-   </component>
-   <component id="eaac_plus_decoder_interface_msg_hdlr_api" name="eAAC Plus Decoder Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/eaac_plus_decoder_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="eaac_plus_decoder_interface_proxy_api" name="eAAC Plus Decoder Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/eaac_plus_decoder_interface_proxy_api/eaac_plus_decoder_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/eaac_plus_decoder_interface_proxy_api/group"/>
-   </component>
-   <component id="error_concealment_interface_api" name="Error Concealment Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/error_concealment_interface_api/error_concealment_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/error_concealment_interface_api/group" filter="!test"/>
-    <unit bldFile="mm_plat/error_concealment_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
-   </component>
-   <component id="error_concealment_interface_msg_hdlr_api" name="Error Concealment Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/error_concealment_interface_msg_hdlr_api/error_concealment_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/error_concealment_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="error_concealment_interface_proxy_api" name="Error Concealment Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/error_concealment_interface_proxy_api/error_concealment_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/error_concealment_interface_proxy_api/group"/>
-   </component>
-   <component id="fm_radio_adaptation_api" name="FM Radio Adaptation API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/fm_radio_adaptation_api/fm_radio_adaptation_api.metaxml"/>
-    <unit bldFile="mm_plat/fm_radio_adaptation_api/group"/>
-   </component>
-   <component id="g711_decoder_interface_api" name="G711 Decoder Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g711_decoder_interface_api/g711_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/g711_decoder_interface_api/group" filter="!test"/>
-    <unit bldFile="mm_plat/g711_decoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
-   </component>
-   <component id="g711_decoder_interface_msg_hdlr_api" name="G711 Decoder Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g711_decoder_interface_msg_hdlr_api/g711_decoder_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/g711_decoder_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="g711_decoder_interface_proxy_api" name="G711 Decoder Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g711_decoder_interface_proxy_api/g711_decoder_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/g711_decoder_interface_proxy_api/group"/>
-   </component>
-   <component id="g711_encoder_interface_api" name="G711 Encoder Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g711_encoder_interface_api/g711_encoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/g711_encoder_interface_api/group" filter="!test"/>
-    <unit bldFile="mm_plat/g711_encoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
-   </component>
-   <component id="g711_encoder_interface_msg_hdlr_api" name="G711 Encoder Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g711_encoder_interface_msg_hdlr_api/g711_encoder_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/g711_encoder_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="g711_encoder_interface_proxy_api" name="G711 Encoder Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g711_encoder_interface_proxy_api/g711_encoder_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/g711_encoder_interface_proxy_api/group"/>
-   </component>
-   <component id="g729_decoder_interface_api" name="G729 Decoder Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g729_decoder_interface_api/g729_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/g729_decoder_interface_api/group" filter="!test"/>
-    <unit bldFile="mm_plat/g729_decoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
-   </component>
-   <component id="g729_decoder_interface_msg_hdlr_api" name="G729 Decoder Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g729_decoder_interface_msg_hdlr_api/g729_decoder_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/g729_decoder_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="g729_decoder_interface_proxy_api" name="G729 Decoder Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g729_decoder_interface_proxy_api/g729_decoder_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/g729_decoder_interface_proxy_api/group"/>
-   </component>
-   <component id="g729_encoder_interface_api" name="G729 Encoder Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g729_encoder_interface_api/g729_encoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/g729_encoder_interface_api/group" filter="!test"/>
-    <unit bldFile="mm_plat/g729_encoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
-   </component>
-   <component id="g729_encoder_interface_proxy_api" name="G729 Encoder Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g729_encoder_interface_proxy_api/g729_encoder_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/g729_encoder_interface_proxy_api/group"/>
-   </component>
-   <component id="g729_encoder_interface_msg_hdlr_api" name="G729 Encoder Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g729_encoder_interface_msg_hdlr_api/g729_encoder_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/g729_encoder_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="global_audio_settings_api" name="Global Audio Settings API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/global_audio_settings_api/global_audio_settings_api.metaxml"/>
-    <unit bldFile="mm_plat/global_audio_settings_api/group" filter="!test"/>
-    <unit bldFile="mm_plat/global_audio_settings_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
-   </component>
-   <component id="global_audio_settings_definition_api" name="Global Audio Settings Definition API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/global_audio_settings_definition_api/global_audio_settings_definition_api.metaxml"/>
-    <unit bldFile="mm_plat/global_audio_settings_definition_api/group"/>
-   </component>
-   <component id="ilbc_decoder_interface_api" name="Ilbc Decoder Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/ilbc_decoder_interface_api/ilbc_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/ilbc_decoder_interface_api/group" filter="!test"/>
-    <unit bldFile="mm_plat/ilbc_decoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
-   </component>
-   <component id="ilbc_decoder_interface_msg_hdlr_api" name="Ilbc Decoder Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/ilbc_decoder_interface_msg_hdlr_api/ilbc_decoder_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/ilbc_decoder_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="ilbc_decoder_interface_proxy_api" name="Ilbc Decoder Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/ilbc_decoder_interface_proxy_api/ilbc_decoder_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/ilbc_decoder_interface_proxy_api/group"/>
-   </component>
-   <component id="ilbc_encoder_interface_api" name="Ilbc Encoder Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/ilbc_encoder_interface_api/ilbc_encoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/ilbc_encoder_interface_api/group" filter="!test"/>
-    <unit bldFile="mm_plat/ilbc_encoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
-   </component>
-   <component id="ilbc_encoder_interface_msg_hdlr_api" name="Ilbc Encoder Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/ilbc_encoder_interface_msg_hdlr_api/ilbc_encoder_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/ilbc_encoder_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="ilbc_encoder_interface_proxy_api" name="Ilbc Encoder Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/ilbc_encoder_interface_proxy_api/ilbc_encoder_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-   </component>
    <component id="mdf_plugin_uids" name="MDF Plug-in UIDs" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/mdf_plugin_uids/mdf_plugin_uids.metaxml"/>
     <unit bldFile="mm_plat/mdf_plugin_uids/group"/>
    </component>
-   <component id="multimedia_fourcc_definitions_api" name="Multimedia FourCC Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/multimedia_fourcc_definitions_api/multimedia_fourcc_definitions_api.metaxml"/>
-    <unit bldFile="mm_plat/multimedia_fourcc_definitions_api/group"/>
-   </component>
-   <component id="nokia_audio_policy_header_api" name="Nokia Audio Policy Header API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/nokia_audio_policy_header_api/nokia_audio_policy_header_api.metaxml"/>
-    <unit bldFile="mm_plat/nokia_audio_policy_header_api/group"/>
-   </component>
-   <component id="nokia_multimedia_fourcc_definitions_api" name="Nokia Multimedia Fourcc Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/nokia_multimedia_fourcc_definitions_api/nokia_multimedia_fourcc_definitions_api.metaxml"/>
-    <unit bldFile="mm_plat/nokia_multimedia_fourcc_definitions_api/group"/>
-   </component>
-   <component id="ra8_decoder_interface_api" name="RA8 Decoder Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/ra8_decoder_interface_api/ra8_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/ra8_decoder_interface_api/group" filter="!test"/>
-    <unit bldFile="mm_plat/ra8_decoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
-   </component>
-   <component id="ra8_decoder_interface_msg_hdlr_api" name="RA8 Decoder Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/ra8_decoder_interface_msg_hdlr_api/ra8_decoder_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/ra8_decoder_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="ra8_decoder_interface_proxy_api" name="RA8 Decoder Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/ra8_decoder_interface_proxy_api/ra8_decoder_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/ra8_decoder_interface_proxy_api/group"/>
-   </component>
-   <component id="rds_adaptation_api" name="RDS Adaptation API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/rds_adaptation_api/rds_adaptation_api.metaxml"/>
-    <unit bldFile="mm_plat/rds_adaptation_api/group"/>
-   </component>
-   <component id="restricted_audio_output_api" name="Restricted Audio Output API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/restricted_audio_output_api/restricted_audio_output_api.metaxml"/>
-    <unit bldFile="mm_plat/restricted_audio_output_api/group" filter="!test"/>
-    <unit bldFile="mm_plat/restricted_audio_output_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
-   </component>
-   <component id="restricted_audio_output_msg_hdlr_api" name="Restricted Audio Output Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/restricted_audio_output_msg_hdlr_api/restricted_audio_output_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/restricted_audio_output_msg_hdlr_api/group"/>
-   </component>
-   <component id="restricted_audio_output_proxy_api" name="Restricted Audio Output Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/restricted_audio_output_proxy_api/restricted_audio_output_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/restricted_audio_output_proxy_api/group"/>
-   </component>
-   <component id="sbc_encoder_interface_api" name="SBC Encoder Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/sbc_encoder_interface_api/sbc_encoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/sbc_encoder_interface_api/group" filter="!test"/>
-    <unit bldFile="mm_plat/sbc_encoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
-   </component>
-   <component id="sbc_encoder_interface_msg_hdlr_api" name="SBC Encoder Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/sbc_encoder_interface_msg_hdlr_api/sbc_encoder_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/sbc_encoder_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="sbc_encoder_interface_proxy_api" name="SBC Encoder Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/sbc_encoder_interface_proxy_api/sbc_encoder_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/sbc_encoder_interface_proxy_api/group"/>
-   </component>
-   <component id="secure_output_mdf_custom_interface" name="Secure Output MDF Custom Interface" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/secure_output_mdf_custom_interface/secure_output_mdf_custom_interface.metaxml"/>
-    <unit bldFile="mm_plat/secure_output_mdf_custom_interface/group"/>
-   </component>
-   <component id="speech_encoder_config_api" name="Speech Encoder Config API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/speech_encoder_config_api/speech_encoder_config_api.metaxml"/>
-    <unit bldFile="mm_plat/speech_encoder_config_api/group" filter="!test"/>
-    <unit bldFile="mm_plat/speech_encoder_config_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
-   </component>
-   <component id="speech_encoder_config_msg_hdlr_api" name="Speech Encoder Config Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/speech_encoder_config_msg_hdlr_api/speech_encoder_config_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/speech_encoder_config_msg_hdlr_api/group"/>
-   </component>
-   <component id="speech_encoder_config_proxy_api" name="Speech Encoder Config Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/speech_encoder_config_proxy_api/speech_encoder_config_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/speech_encoder_config_proxy_api/group"/>
-   </component>
-   <component id="telephony_audio_routing_client_api" name="Telephony Audio Routing Client API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/telephony_audio_routing_client_api/telephony_audio_routing_client_api.metaxml"/>
-    <unit bldFile="mm_plat/telephony_audio_routing_client_api/group"/>
-   </component>
-   <component id="telephony_audio_routing_manager_api" name="Telephony Audio Routing Manager API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/telephony_audio_routing_manager_api/telephony_audio_routing_manager_api.metaxml"/>
-    <unit bldFile="mm_plat/telephony_audio_routing_manager_api/group"/>
-   </component>
    <component id="video_buffer_management_mdf_custom_interface" name="Video Buffer Management MDF Custom Interface" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/video_buffer_management_mdf_custom_interface/video_buffer_management_mdf_custom_interface.metaxml"/>
     <unit bldFile="mm_plat/video_buffer_management_mdf_custom_interface/group"/>
@@ -318,68 +26,6 @@
     <meta rel="Api" href="mm_plat/video_window_control_custom_interface/video_window_control_custom_interface.metaxml"/>
     <unit bldFile="mm_plat/video_window_control_custom_interface/group"/>
    </component>
-   <component id="wma_decoder_interface_api" name="WMA Decoder Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/wma_decoder_interface_api/wma_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/wma_decoder_interface_api/group" filter="!test"/>
-    <unit bldFile="mm_plat/wma_decoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
-   </component>
-   <component id="wma_decoder_interface_msg_hdlr_api" name="WMA Decoder Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/wma_decoder_interface_msg_hdlr_api/wma_decoder_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/wma_decoder_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="wma_decoder_interface_proxy_api" name="WMA Decoder Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/wma_decoder_interface_proxy_api/wma_decoder_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/wma_decoder_interface_proxy_api/group"/>
-   </component>
-   <component id="eaacplusutil_api" name="EAac Plus Util API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/eaacplusutil_api/eaacplusutil_api.metaxml"/>
-    <unit bldFile="mm_plat/eaacplusutil_api/group"/>
-   </component>
-   <component id="frametable_api" name="Frametable API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/frametable_api/frametable_api.metaxml"/>
-    <unit bldFile="mm_plat/frametable_api/group"/>
-   </component>
-  </collection>
-  <collection id="devsoundextensions" name="Devsound Extensions" level="device-fw">
-   <component id="drmaudioplayer" filter="s60" name="DRM Audio Player">
-    <unit bldFile="devsoundextensions/drmaudioplayer/group"/>
-   </component>
-   <component id="mmextfw" filter="s60" name="Multimedia Extension Framework">
-    <unit bldFile="devsoundextensions/mmextfw/group"/>
-   </component>
-   <component id="audiorouting" filter="s60" name="Audio Routing">
-    <unit bldFile="devsoundextensions/audiorouting/group"/>
-   </component>
-   <component id="effects" filter="s60" name="Effects">
-    <unit bldFile="devsoundextensions/effects/group"/>
-   </component>
-   <component id="effectspresets" filter="s60" name="Effects Presets">
-    <unit bldFile="devsoundextensions/effectspresets/group"/>
-   </component>
-   <component id="effectspresets_utils" filter="s60" name="Effects Presets Utils">
-    <!-- need to #include the lot from a single bld.inf
-      		Also move to a standard component location, not under effectspresets -->
-    <unit bldFile="devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-    <unit bldFile="devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-   </component>
-   <component id="telephonyaudiorouting" filter="s60" name="Telephony Audio Routing">
-    <unit bldFile="devsoundextensions/telephonyaudiorouting/group"/>
-   </component>
-   <component id="mmfcustominterfaces" filter="s60" name="MMF Custom Interfaces">
-    <unit bldFile="devsoundextensions/mmfcustominterfaces/group"/>
-   </component>
-   <component id="addeddevsoundcontrol" filter="s60" name="Added DevSound Control">
-    <unit bldFile="devsoundextensions/addeddevsoundcontrol/group"/>
-   </component>
-   <component id="globalaudiosettings" filter="s60" name="Global Audio Settings">
-    <unit bldFile="devsoundextensions/globalaudiosettings/group"/>
-   </component>
-   <component id="restrictedaudiooutput" filter="s60" name="Restricted Audio Output">
-    <unit bldFile="devsoundextensions/restrictedaudiooutput/group"/>
-   </component>
-   <component id="ciextnfactoryplugins" filter="s60" name="Custom Interface Extension Factory Plugins" class="plugin">
-    <unit bldFile="devsoundextensions/ciextnfactoryplugins/group"/>
-   </component>
   </collection>
   <collection id="mdfdevvideoextensions" name="MDF Dev Video Extensions" level="device-fw">
    <component id="nga_mdf_postprocessor" name="NGA MDF Postprocessor" filter="s60">
@@ -389,18 +35,6 @@
     <unit bldFile="mdfdevvideoextensions/nga_mdf_postprocessor_shai/group"/>
    </component>
   </collection>
-  <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" introduced="^4">
-    <unit bldFile="frametable_stub/group"/>
-   </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" introduced="^4">
-    <unit bldFile="eaacplusutil_stub/group"/>
-   </component>
-  </collection>
   <collection id="imagingandcamerafws" name="Imaging and Camera Frameworks" level="app-if">
    <component id="camerafw" name="Camera Framework" introduced="7.0s" purpose="optional">
     <unit bldFile="imagingandcamerafws/camerafw/group" mrp="imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
@@ -409,14 +43,6 @@
     <unit mrp="imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp" bldFile="imagingandcamerafws/cameraunittest/group"/>
    </component>
   </collection>
-  <collection id="mmlibs" name="Multimedia Libraries" level="middleware">
-   <component id="mmutilitylib" name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-    <unit bldFile="mmlibs/mmutilitylib/group" mrp="mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-   </component>
-   <component id="mmfw" name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-    <unit bldFile="mmlibs/mmfw/group" mrp="mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-   </component>
-  </collection>
   <collection id="mmplugins" name="Multimedia Plugins" level="middleware">
    <component id="cameraplugins" name="Camera Plugins" introduced="7.0s" purpose="optional" class="plugin">
     <unit bldFile="mmplugins/cameraplugins/group" mrp="mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
@@ -427,9 +53,6 @@
    <component id="lib3gpunittest" name="3GP Unit Tests" introduced="^2" purpose="development" filter="test">
     <unit mrp="mmplugins/lib3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp" bldFile="mmplugins/lib3gpunittest/group"/>
    </component>
-   <component id="mmfwplugins" name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" class="plugin">
-    <unit bldFile="mmplugins/mmfwplugins/group" mrp="mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-   </component>
   </collection>
   <collection id="mm_info" name="Multimedia Info" level="app-if">
    <component id="mmdocs" name="Multimedia Documentation" purpose="development" class="doc">
@@ -439,11 +62,6 @@
     <unit mrp="mm_info/mm_metadata/mm_metadata.mrp"/>
    </component>
   </collection>
-  <collection id="mmresourcemgmt" name="Multimedia Resource Management" level="middleware">
-   <component id="mmresctrl" name="Multimedia Resource Controller" introduced="^2" purpose="development">
-    <unit bldFile="mmresourcemgmt/mmresctrl/group" mrp="mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-   </component>
-  </collection>
   <collection id="mmdevicefw" name="Multimedia Device Framework" level="device-fw">
    <component id="mdf" name="Media Device Framework" introduced="9.2" purpose="mandatory">
     <unit bldFile="mmdevicefw/mdf/group" mrp="mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
@@ -451,71 +69,19 @@
    <component id="mdfunittest" name="MDF Unit Tests" introduced="9.2" purpose="development" filter="test">
     <unit mrp="mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp" bldFile="mmdevicefw/mdfunittest/group"/>
    </component>
-   <component id="speechrecogsupport" name="Speech Recognition Support" introduced="7.0s" purpose="mandatory">
-    <unit bldFile="mmdevicefw/speechrecogsupport/group" mrp="mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
-   </component>
   </collection>
   <collection id="mmswadaptation" name="Multimedia Software Adaptation" level="adaptation">
    <component id="videorenderer" name="Video Renderer" introduced="^3" purpose="optional">
     <unit bldFile="mmswadaptation/videorenderer/group" mrp="mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
    </component>
   </collection>
-  <collection id="mmtestenv" name="Multimedia Test Environment" level="device-fw">
-   <component id="mmtestfw" name="Multimedia Test Framework" introduced="7.0s" purpose="development" filter="test">
-    <unit mrp="mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp" bldFile="mmtestenv/mmtestfw/group"/>
-   </component>
-   <component id="mmtestfwunittest" name="Multimedia Test Framework Unit Tests" introduced="7.0s" purpose="development" filter="test">
-    <unit mrp="mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp" bldFile="mmtestenv/mmtestfwunittest/group"/>
-   </component>
-   <component id="mmtestagent" name="Multimedia Test Agent" introduced="8.0" purpose="development" filter="test">
-    <unit mrp="mmtestenv/mmtestagent/group/multimediatestagent_source.mrp" bldFile="mmtestenv/mmtestagent/group"/>
-   </component>
-   <component id="mmtesttools" name="Multimedia Test Tools" purpose="development" filter="test">
-    <unit mrp="mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp" bldFile="mmtestenv/mmtesttools/Group"/>
-   </component>
-  </collection>
+  <!-- Obsolete code
   <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"/>
-   </component>
-   <component id="a3fdevsound" name="A3F DevSound" introduced="^2" purpose="optional">
-    <unit bldFile="devsound/a3fdevsound/group" mrp="devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-   </component>
-   <component id="a3facf" name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-    <unit bldFile="devsound/a3facf/group" mrp="devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-   </component>
-   <component id="devsoundpluginsupport" name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-    <unit bldFile="devsound/devsoundpluginsupport/group" mrp="devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-   </component>
-   <component id="refdevsound" name="Reference DevSound Plugins" introduced="7.0s" purpose="optional">
-    <unit bldFile="devsound/devsoundrefplugin/group" mrp="devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
-   </component>
    <component id="btdevsound" name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" class="plugin" deprecated="^4">
     <unit bldFile="devsound/sounddevbt/group" mrp="devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
    </component>
-   <component id="a3ftrace" name="A3F Trace Utility" introduced="^2" purpose="development">
-    <unit bldFile="devsound/a3ftrace/group" mrp="devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-   </component>
-   <component id="a3fintegrationtest" name="A3F Integration Tests" introduced="^2" purpose="development" filter="test">
-    <unit mrp="devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp" bldFile="devsound/a3fintegrationtest/group"/>
-   </component>
-   <component id="a3fsrvstart" name="A3F Server Start" introduced="^2" purpose="optional" class="plugin">
-    <unit bldFile="devsound/a3fsrvstart/group" mrp="devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-   </component>
-  </collection>
+  </collection> -->
   <collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-   <component id="devsoundhwdeviceapi" name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
-    <unit bldFile="devsound/hwdevapi/group" mrp="devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
-   </component>
-   <component id="a3facl" name="A3F Audio Component Library" introduced="^2" purpose="development">
-    <unit bldFile="mmhais/a3facl/group" mrp="mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
-   </component>
-   <component id="a3fdevsoundcustomisation" name="A3F DevSound Customisation" introduced="^2" purpose="optional">
-    <unit bldFile="mmhais/a3fdevsoundcustomisation/group" mrp="mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
-   </component>
-   <component id="refacladapt" name="Reference ACL Adaptation" introduced="^2" purpose="optional">
-    <unit bldFile="mmhais/refacladapt/group" mrp="mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
-   </component>
    <component id="videohai" name="Video HAI" introduced="7.0s" purpose="mandatory">
     <unit bldFile="mmhais/videohai/group" mrp="mmhais/videohai/group/multimedia_videohai.mrp"/>
    </component>