diff -r 1553c141c99f -r 5dfc4b38cad0 3k/os/mm/package_definition.xml
--- a/3k/os/mm/package_definition.xml	Mon Jul 27 18:33:03 2009 +0100
+++ b/3k/os/mm/package_definition.xml	Tue Jul 28 14:16:28 2009 +0100
@@ -1,79 +1,79 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="Foundation" schema="2.0.1">
+<SystemDefinition name="foundation" schema="2.0.1">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
 <block name="mm" long-name="Multimedia" tech_domain="mm" level="services" levels="adaptation hw-if device-fw devices middleware app-if">
     <collection name="audio" long-name="Audio Codecs" level="middleware">
-     <component name="ARM_CMMF_codecs" long-name="ARM CMMF Codecs" origin-model="Foundation">
+     <component name="arm_cmmf_codecs" long-name="ARM CMMF Codecs" origin-model="foundation">
       <unit bldFile="/sf/os/mm/audio/arm_cmmf_codecs/group"/>
      </component>
-     <component unofficial="yes" name="audio_build" long-name="Audio Codecs Build" origin-model="Foundation">
+     <component unofficial="yes" name="audio_build" long-name="Audio Codecs Build" origin-model="foundation">
       <unit bldFile="/sf/os/mm/audio/group"/>
      </component>
     </collection>
     <collection name="video" long-name="Video Codecs" level="middleware">
-     <component name="ARM_MDF_Decoders" long-name="ARM MDF Decoders" origin-model="Foundation">
+     <component name="arm_mdf_decoders" long-name="ARM MDF Decoders" origin-model="foundation">
       <unit bldFile="/sf/os/mm/video/group"/>
      </component>
     </collection>
     <collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-     <component name="drmaudioplayer" long-name="DRM Audio Player" origin-model="Foundation">
+     <component name="drmaudioplayer" long-name="DRM Audio Player" origin-model="foundation">
       <!-- <unit bldFile="os/mm/devsoundextensions/drmaudioplayer/drmplayserver/group"/> -->
       <!-- <unit bldFile="os/mm/devsoundextensions/drmaudioplayer/drmplayutility/group"/> -->
       <unit bldFile="/sf/os/mm/devsoundextensions/drmaudioplayer/group"/>
      </component>
-     <component name="mmextfw" long-name="MM Ext Framework" origin-model="Foundation">
+     <component name="mmextfw" long-name="MM Ext Framework" origin-model="foundation">
       <unit bldFile="/sf/os/mm/devsoundextensions/mmextfw/group"/>
      </component>
-     <component name="audiorouting" long-name="Audio Routing" origin-model="Foundation">
+     <component name="audiorouting" long-name="Audio Routing" origin-model="foundation">
       <unit bldFile="/sf/os/mm/devsoundextensions/audiorouting/group"/>
      </component>
-     <component name="effects" long-name="Effects" origin-model="Foundation">
+     <component name="effects" long-name="Effects" origin-model="foundation">
       <!-- <unit bldFile="os/mm/devsoundextensions/effects/effecttest"/> -->
       <unit bldFile="/sf/os/mm/devsoundextensions/effects/group"/>
      </component>
-     <component name="effectspresets" long-name="Effects Presets" origin-model="Foundation">
+     <component name="effectspresets" long-name="Effects Presets" origin-model="foundation">
       <unit bldFile="/sf/os/mm/devsoundextensions/effectspresets/group"/>
      </component>
-     <component name="telephonyaudiorouting" long-name="Telephony Audio Routing" origin-model="Foundation">
+     <component name="telephonyaudiorouting" long-name="Telephony Audio Routing" origin-model="foundation">
       <unit bldFile="/sf/os/mm/devsoundextensions/telephonyaudiorouting/group"/>
       <!-- <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/server/group"/> -->
       <!-- <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/session/group"/> -->
       <!-- <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/telephonyaudioroutingbase/group"/> -->
       <!-- <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/telephonyaudioroutingmanager/group"/> -->
      </component>
-     <component name="mmfcustominterfaces" long-name="MMF Custom Interfaces" origin-model="Foundation">
+     <component name="mmfcustominterfaces" long-name="MMF Custom Interfaces" origin-model="foundation">
       <unit bldFile="/sf/os/mm/devsoundextensions/mmfcustominterfaces/group"/>
      </component>
-     <component name="addeddevsoundcontrol" long-name="Added DevSound Control" origin-model="Foundation">
+     <component name="addeddevsoundcontrol" long-name="Added DevSound Control" origin-model="foundation">
       <unit bldFile="/sf/os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
      </component>
-     <component name="globalaudiosettings" long-name="Global Audio Settings" origin-model="Foundation">
+     <component name="globalaudiosettings" long-name="Global Audio Settings" origin-model="foundation">
       <unit bldFile="/sf/os/mm/devsoundextensions/globalaudiosettings/group"/>
      </component>
-     <component name="restrictedaudiooutput" long-name="Restricted Audio Output" origin-model="Foundation">
+     <component name="restrictedaudiooutput" long-name="Restricted Audio Output" origin-model="foundation">
       <unit bldFile="/sf/os/mm/devsoundextensions/restrictedaudiooutput/group"/>
      </component>
-     <component name="ciextnfactoryplugins" long-name="CI Extension Factory Plugins" origin-model="Foundation">
+     <component name="ciextnfactoryplugins" long-name="CI Extension Factory Plugins" origin-model="foundation">
       <unit bldFile="/sf/os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
      </component>
-     <component unofficial="yes" name="devsoundextensions_build" long-name="Devsound Extensions Build" origin-model="Foundation">
+     <component unofficial="yes" name="devsoundextensions_build" long-name="Devsound Extensions Build" origin-model="foundation">
       <unit bldFile="/sf/os/mm/devsoundextensions/group"/>
      </component>
     </collection>
     <collection name="mdfdevvideoextensions" long-name="MDF devvideo Extensions" level="device-fw">
-     <component name="arm_mdf_postprocessor" long-name="ARM MDF Postprocessor" origin-model="Foundation">
+     <component name="arm_mdf_postprocessor" long-name="ARM MDF Postprocessor" origin-model="foundation">
       <unit bldFile="/sf/os/mm/mdfdevvideoextensions/arm_mdf_postprocessor/group"/>
      </component>
-     <component unofficial="yes" name="mdfdevvideoextensions_build" long-name="MDF devvideo Extensions Build" origin-model="Foundation">
+     <component unofficial="yes" name="mdfdevvideoextensions_build" long-name="MDF devvideo Extensions Build" origin-model="foundation">
       <unit bldFile="/sf/os/mm/mdfdevvideoextensions/group"/>
      </component>
     </collection>
     <collection name="videoadaptationextensions" long-name="Video Adaptation Extensions" level="adaptation">
-     <component name="postingsurface" long-name="Posting Surface" origin-model="Foundation">
+     <component name="postingsurface" long-name="Posting Surface" origin-model="foundation">
       <unit bldFile="/sf/os/mm/videoadaptationextensions/postingsurface/group"/>
      </component>
-     <component unofficial="yes" name="videoadaptationextensions_build" long-name="Video Adaptation Extensions Build" origin-model="Foundation">
+     <component unofficial="yes" name="videoadaptationextensions_build" long-name="Video Adaptation Extensions Build" origin-model="foundation">
       <unit bldFile="/sf/os/mm/videoadaptationextensions/group"/>
      </component>
     </collection>
@@ -118,12 +118,38 @@
      </component>
     </collection>
     <collection name="mm_info" long-name="Multimedia Info" level="app-if">
-     <component unofficial="yes" name="mm_build" long-name="Multimedia Build" origin-model="Foundation">
+     <component unofficial="yes" name="mm_pub" long-name="Multimedia Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="/sf/os/mm/mm_pub/audio_effects_api/tsrc/group"/>
+      <unit bldFile="/sf/os/mm/mm_pub/audio_effects_presets_api/tsrc/group"/>
+      <unit bldFile="/sf/os/mm/mm_pub/drm_audio_player_api/tsrc/group"/>
+      <unit bldFile="/sf/os/mm/mm_pub/group"/>
+     </component>
+     <component unofficial="yes" name="mm_build" long-name="Multimedia Build" origin-model="foundation">
       <unit bldFile="/sf/os/mm/group"/>
      </component>
-     <component unofficial="yes" name="mm_test" long-name="Multimedia Test" origin-model="Foundation">
+     <component unofficial="yes" name="mm_test" long-name="Multimedia Test" origin-model="foundation">
       <!-- <unit bldFile="os/mm/tsrc/group"/> -->
      </component>
+     <component unofficial="yes" name="mm_plat" long-name="Multimedia Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="/sf/os/mm/mm_plat/aac_decoder_config_api/tsrc/group"/>
+      <unit bldFile="/sf/os/mm/mm_plat/audio_routing_api/tsrc/group"/>
+      <unit bldFile="/sf/os/mm/mm_plat/audio_visualization_api/tsrc/group"/>
+      <unit bldFile="/sf/os/mm/mm_plat/eaac_plus_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="/sf/os/mm/mm_plat/error_concealment_interface_api/tsrc/group"/>
+      <unit bldFile="/sf/os/mm/mm_plat/g711_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="/sf/os/mm/mm_plat/g711_encoder_interface_api/tsrc/group"/>
+      <unit bldFile="/sf/os/mm/mm_plat/g729_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="/sf/os/mm/mm_plat/g729_encoder_interface_api/tsrc/group"/>
+      <unit bldFile="/sf/os/mm/mm_plat/global_audio_settings_api/tsrc/group"/>
+      <unit bldFile="/sf/os/mm/mm_plat/group"/>
+      <unit bldFile="/sf/os/mm/mm_plat/ilbc_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="/sf/os/mm/mm_plat/ilbc_encoder_interface_api/tsrc/group"/>
+      <unit bldFile="/sf/os/mm/mm_plat/ra8_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="/sf/os/mm/mm_plat/restricted_audio_output_api/tsrc/group"/>
+      <unit bldFile="/sf/os/mm/mm_plat/sbc_encoder_interface_api/tsrc/group"/>
+      <unit bldFile="/sf/os/mm/mm_plat/speech_encoder_config_api/tsrc/group"/>
+      <unit bldFile="/sf/os/mm/mm_plat/wma_decoder_interface_api/tsrc/group"/>
+     </component>
     <component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
      </component>
@@ -131,250 +157,6 @@
       <unit mrp="/sf/os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="mm_plat" long-name="Multimedia Platform Interfaces" level="app-if">
-     <component unofficial="yes" name="custom_interface_message_handler_factory_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-     </component>
-     <component unofficial="yes" name="eaac_plus_decoder_interface_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/eaac_plus_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="g729_encoder_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/g729_encoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="g729_encoder_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/g729_encoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_visualization_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/audio_visualization_api/group"/>
-     </component>
-     <component unofficial="yes" name="ra8_decoder_interface_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/ra8_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="aac_decoder_config_proxy_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="frametable_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/frametable_api/group"/>
-     </component>
-     <component unofficial="yes" name="error_concealment_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/error_concealment_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="aac_decoder_config_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/aac_decoder_config_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_decoder_scaling_mdf_custom_interface" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_decoder_interface_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/ilbc_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="g711_decoder_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/g711_decoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_effects_proxy_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/audio_effects_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="g711_decoder_interface_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/g711_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="rds_adaptation_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/rds_adaptation_api/group"/>
-     </component>
-     <component unofficial="yes" name="eaac_plus_decoder_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="g711_encoder_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/g711_encoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="speech_encoder_config_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/speech_encoder_config_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="g711_decoder_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/g711_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="error_concealment_interface_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/error_concealment_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="wma_decoder_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/wma_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_encoder_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/ilbc_encoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_buffer_management_mdf_custom_interface" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-     </component>
-     <component unofficial="yes" name="added_devsound_control_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_decoder_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/ilbc_decoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="ra8_decoder_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/ra8_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="custom_interface_utility_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/custom_interface_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="g729_encoder_interface_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/g729_encoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="fm_radio_adaptation_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/fm_radio_adaptation_api/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_encoder_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="sbc_encoder_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/sbc_encoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_audio_routing_manager_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="restricted_audio_output_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/restricted_audio_output_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_routing_proxy_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/audio_routing_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="eaacplusutil_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/eaacplusutil_api/group"/>
-     </component>
-     <component unofficial="yes" name="speech_encoder_config_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/speech_encoder_config_api/group"/>
-     </component>
-     <component unofficial="yes" name="display_posting_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/display_posting_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_routing_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/audio_routing_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="g729_decoder_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/g729_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="sbc_encoder_interface_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/sbc_encoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_policy_header_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/audio_policy_header_api/group"/>
-     </component>
-     <component unofficial="yes" name="nokia_audio_policy_header_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_routing_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/audio_routing_api/group"/>
-     </component>
-     <component unofficial="yes" name="speech_encoder_config_proxy_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="mdf_plugin_uids" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/mdf_plugin_uids/group"/>
-     </component>
-     <component unofficial="yes" name="custom_interface_builder_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/custom_interface_builder_api/group"/>
-     </component>
-     <component unofficial="yes" name="global_audio_settings_definition_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/global_audio_settings_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="sbc_encoder_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="multimedia_fourcc_definitions_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="devsound_adaptation_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/devsound_adaptation_api/group"/>
-     </component>
-     <component unofficial="yes" name="aac_decoder_config_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/aac_decoder_config_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_reclaim_extbuffers_ci" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-     </component>
-     <component unofficial="yes" name="restricted_audio_output_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/restricted_audio_output_api/group"/>
-     </component>
-     <component unofficial="yes" name="nokia_multimedia_fourcc_definitions_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/nokia_multimedia_fourcc_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_encoder_interface_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/ilbc_encoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="custom_interface_proxy_factory_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-     </component>
-     <component unofficial="yes" name="g711_encoder_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/g711_encoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_effects_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="g711_encoder_interface_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/g711_encoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_decoder_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/ilbc_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_window_control_custom_interface" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/video_window_control_custom_interface/group"/>
-     </component>
-     <component unofficial="yes" name="added_devsound_control_proxy_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="ra8_decoder_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="g729_decoder_interface_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/g729_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_audio_routing_client_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="eaac_plus_decoder_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/eaac_plus_decoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="global_audio_settings_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/global_audio_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="added_devsound_control_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/added_devsound_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="error_concealment_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="wma_decoder_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="restricted_audio_output_proxy_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/restricted_audio_output_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="secure_output_mdf_custom_interface" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/secure_output_mdf_custom_interface/group"/>
-     </component>
-     <component unofficial="yes" name="wma_decoder_interface_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/wma_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_decoder_rotation_mdf_custom_interface" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-     </component>
-     <component unofficial="yes" name="g729_decoder_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/g729_decoder_interface_proxy_api/group"/>
-     </component>
-    </collection>
-    <collection name="mm_pub" long-name="Multimedia Public Interfaces" level="app-if">
-     <component unofficial="yes" name="audio_effects_presets_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_pub/audio_effects_presets_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_audio_player_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_pub/drm_audio_player_api/group"/>
-     </component>
-     <component unofficial="yes" name="multimedia_extension_interfaces_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_pub/multimedia_extension_interfaces_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_effects_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/mm/mm_pub/audio_effects_api/group"/>
-     </component>
-    </collection>
    <collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
      <component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="tb92" purpose="development" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/mm/mmresourcemgmt/mmresctrl/group" mrp="/sf/os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>