Update of /cvsroot/clientapps/symbianMmf
In directory cvs:/tmp/cvs-serv9049

Modified Files:
	hxmmfstatectrl.cpp 
Log Message:
"Nokia submits this code under the terms of a commercial 
contribution agreement with RealNetworks, and I am authorized 
to contribute this code under said agreement."

Modified by: 
    carol.i.chen at nokia.com 

Reviewed by: 
    ehyche at real.com, gwright at real.com 

Date: 
    3-3-2006 

Project: 
    Helix plug-in for Symbian 

Synopsis: 
    -- Priority settings passed to the MMF from the Client/UI needs 
    to be passed down to DevSound. There are two integer values in 
    the settings: iPriority and iPref. Currently these values are ignored 
    in MMF and a default value is passed to DevSound instead. 
    The change will allow iPriority and iPref to be set to the desired 
    values, and this is required for the Video Ringtone feature to work 
    properly, as Video Ringtones have a higher priority than normal 
    video playback and Audio Policy needs to be aware of the difference. 

    -- The MMF Controller code is changed to store priority values 
    through the IHXPreferences interface. The AudioDevice code (for both 
    MDF and non-MDF) is modified to retrieve these saved values, and 
    pass them down to DevSound in place of the previous default values. 
    Helix core is not affected by this implementation. 

    -- [Update from original submission] Instead of creating an instance 
    of HXCommonClassFactory in HXMMFCtrlImpl, context pointer is obtained
    by query of HXMMFStateCtrl. Support for QI of IHXCommonClassFactory 
    is also added in HXMMFStateCtrl. In addition, since QI can be done on 
    a context, usage of IHXPreferences is not needed and thus removed from 
    the audio device code. 

Files Modified: 
    clientapps\symbianMmf\hxmmfctrlimpl.cpp 
    clientapps\symbianMmf\hxmmfstatectrl.cpp 

    audio\device\pub\platform\symbian\audsymbian.h 
    audio\device\platform\symbian\audsymbian.cpp 
    audio\device\platform\symbian\audiosvr\audio_svr.h 
    audio\device\platform\symbian\audiosvr\audio_svr.cpp 
    audio\device\platform\symbian\audiosvr\mmf\audio_session-mmf.h 
    audio\device\platform\symbian\audiosvr\mmf\audio_session-mmf.cpp 

    datatype\mdf\audio\dsp\mdfauddevice.h 
    datatype\mdf\audio\dsp\mdfauddevice.cpp 
    datatype\mdf\audio\dsp\mdfdevsound.h 
    datatype\mdf\audio\dsp\mdfdevsound.cpp 
    datatype\mdf\audio\dsp\Umakefil 

Files Added: 
    none 

Image Size and Heap Use impact: 
    minor 

Platforms and Profiles Build Verified: 
    helix-client-s60-mmf-basic, helix-client-s60-mmf-mdf-basic 

Platforms and Profiles Functionality verified: 
    armv5, winscw 

Branch: 
    hxclient_2_1_0_cayennes, head


Index: hxmmfstatectrl.cpp
===================================================================
RCS file: /cvsroot/clientapps/symbianMmf/hxmmfstatectrl.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- hxmmfstatectrl.cpp	24 Feb 2006 20:28:05 -0000	1.10
+++ hxmmfstatectrl.cpp	7 Mar 2006 18:10:31 -0000	1.11
@@ -66,14 +66,16 @@
 
 HX_RESULT HXMMFStateCtrl::QueryInterfaceDelegates(REFIID riid, void** ppvObj)
 {
-    if ( IsEqualIID(riid, IID_IHXPreferences) )
+    if ( IsEqualIID(riid, IID_IHXPreferences) && (m_pPrefs != NULL) )
     {
         return m_pPrefs->QueryInterface(riid, ppvObj);
     }
-    else if ( IsEqualIID(riid, IID_IHXSiteSupplier) )
+    else if ( IsEqualIID(riid, IID_IHXSiteSupplier) && (m_pSiteSupplier != NULL) )
     {
         return m_pSiteSupplier->QueryInterface(riid, ppvObj);
     }
+    else if ( IsEqualIID(riid, IID_IHXCommonClassFactory) && (m_pCCF != NULL) )
+        return m_pCCF->QueryInterface(riid, ppvObj);
 
     return HXR_NOINTERFACE;
 }