Update of /cvsroot/clientapps/symbianMmf
In directory cvs02.internal.helixcommunity.org:/tmp/cvs-serv23552

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

Modified by:
    darrin.mann at nokia.com

Reviewed by:
    gwright at real.com

Date: 
    July-17-2006

Project: 
    Helix plug-in for Symbian

Error ID: 
    DMAN-6RMSWB

Synopsis: 
    When DevVideo has an error, it makes a calls MdvpoFatalError() on the MDF video 
    adapter.  Since the video is lost, MDF issues an error on the IHXErrorMessages
    interface.  The error is propagated to the MMF and TLC and the player is closed.  
    A few memory leaks were removed also.

Files Modified: 
    clientapps/symbianMmf/hxmmfctrlimpl.cpp

    common/include/hxresult.h

    datatype/mdf/video/renderer/mdfpluginmanager.cpp
    datatype/mdf/video/renderer/mdfvideoadapter.cpp
    datatype/mdf/video/renderer/mdfvidrend.cpp
    datatype/mdf/video/renderer/pub/mdfvideoadapter.h

Files Added:
    None

Image Size and Heap Use impact: 
    None

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

Platforms and Profiles Functionality verified: 
    winscw 
    armv5

Branch: 
    head and hxclient_2_1_0_cayennes 


Index: hxmmfctrlimpl.cpp
===================================================================
RCS file: /cvsroot/clientapps/symbianMmf/hxmmfctrlimpl.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- hxmmfctrlimpl.cpp	7 Jul 2006 16:03:35 -0000	1.38
+++ hxmmfctrlimpl.cpp	17 Jul 2006 22:01:12 -0000	1.39
@@ -127,7 +127,6 @@
     { HXR_UNSUPPORTED_VIDEO,      KErrNotSupported         },
     { HXR_UNSUPPORTED_AUDIO,      KErrNotSupported         },
     { HXR_NOINTERFACE,            KErrNotSupported         },
-    { HXR_FAIL,                   KErrGeneral              },
     { HXR_INVALID_OPERATION,      KErrGeneral              },
     { HXR_DOC_MISSING,            KErrNotFound             },
     { HXR_PE_NOT_FOUND,           KErrNotFound             },
@@ -177,51 +176,9 @@
     { HXR_PARSE_ERROR,            KErrNotSupported         },
     { HXR_BAD_FORMAT,             KErrNotSupported         },
     { HXR_DEC_NOT_FOUND,          KErrNotSupported         },
-    { HXR_SET_SECURE_OUT_FAIL,    KErrNotSupported         }
-/*
-    { scUserStopped,           KErrCancel               },
-    { scCanceled,              KErrCancel               },
-    { scClipEnd,               KErrNone                 },
-    { scIncompletePlayback,    KErrMMPartialPlayback    },
-    { scServerDisconnect,      KErrDisconnected         },
-    { scFailedToConnect,       KErrCouldNotConnect      },
-    { scRedirected,            KErrMMInvalidProtocol    },
-    { scFileNotFound,          KErrNotFound             },
-    { scProtocolError,         KErrMMInvalidProtocol    },
-    { scConnectionTimeout,     KErrTimedOut             },
-    { scCannotPlay,            KErrNotSupported         },
-    { scPlayerShutdown,        KErrSessionClosed        },
-    { scNoMemory,              KErrNoMemory             },
-    { scEngineStartFail,       KErrDied                 },
-    { scEngineDeath,           KErrDied                 },
-    { scNoResource,            KErrHardwareNotAvailable },
-    { scSystemError,           KErrGeneral              },
-    { scAudioDevNotAvail,      KErrMMAudioDevice        },
-    { scNotEnoughMemory,       KErrNoMemory             },
-    { scAlreadyConnected,      KErrServerBusy           },
-    { scInvalidURL,            KErrMMInvalidURL         },
-    { scNotEnoughBandwidth,    KErrMMNotEnoughBandwidth },
-    { scAudioDevOpenFailed,    KErrMMAudioDevice        },
-    { scSetupFailed,           KErrCouldNotConnect      },
-    { scUnsupportedDataType,   KErrNotSupported         },
-    { scImageSizeTooLarge,     KErrNotSupported         },
-    { scCodecNotFound,         KErrNotSupported         },
-    { scCodecNotInited,        KErrNotSupported         },
-    { scDepackNotInited,       KErrNotSupported         },
-    { scAPConnectFailed,       KErrAbort                },
-    { scCoprocessorLost,       KErrSessionClosed        },
-    { scCoprocessorAbort,      KErrNotSupported         },
-    { scCallActive,            KErrGprsServicesNotAllowed },
-    { scPDPContextInUse,       KErrInUse                },
-    { scQosLowBandwidth,       KErrMMQosLowBandwidth    },
-    { scQosNotSupported,       KErrMMQosNotSupported    },
-    { scQosInitFailed,         KErrMMQosNotSupported    },
-    { scQosNotEnoughBandwidth, KErrMMNotEnoughBandwidth },
-    { scQosUnsupportedTrafficClass, KErrMMQosUnsupportedTrafficClass },
-    { scQosPoorTrafficClass,   KErrMMQosPoorTrafficClass },
-    { scQosUnsupportedParams,  KErrMMQosUnsupportedParameters },
-    { scQosPoorParams,         KErrMMQosPoorParameters }
-    */
+    { HXR_PROXY_NET_CONNECT,      KErrCouldNotConnect      },
+    { HXR_SET_SECURE_OUT_FAIL,    KErrNotSupported         },
+    { HXR_DEVVIDEO_FATAL_ERROR,   KErrMMVideoDevice        }
 };
 
 static const int NumMmfStatus = sizeof(MmfStatusMap)/sizeof(HXMMFStatus);
@@ -249,7 +206,7 @@
 #ifdef HELIX_FEATURE_MMF_SITE_CONTROL
 ,m_pDSAControl(NULL)
 ,m_pSurfaceControl(NULL)
-    ,m_aRotation(EVideoRotationNone)
+,m_aRotation(EVideoRotationNone)
 #endif
 , m_pDataSource(NULL)
 , m_lFrameWidth(0)
@@ -481,6 +438,7 @@
 void
 HXMMFCtrlImpl::ConstructL()
 {
+
     //
     //   Check for sufficient memory
     //