diff -r 80975da52420 -r 43d09473c595 mmmw_plat/enhanced_media_client_api/tsrc/EnhanMediaTestClass/inc/EnhanMediaTestClass.h --- a/mmmw_plat/enhanced_media_client_api/tsrc/EnhanMediaTestClass/inc/EnhanMediaTestClass.h Mon May 03 12:59:52 2010 +0300 +++ b/mmmw_plat/enhanced_media_client_api/tsrc/EnhanMediaTestClass/inc/EnhanMediaTestClass.h Fri May 14 16:22:35 2010 +0300 @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include @@ -71,10 +70,8 @@ #include "CEMCConstants.h" -#include using multimedia::MStreamControl; using multimedia::MControlObserver; -using multimedia::MProgDLSource; using multimedia::MDataBufferSource; using multimedia::MDescriptorSource; using multimedia::MDataBuffer; @@ -119,8 +116,7 @@ */ NONSHARABLE_CLASS(CEnhanMediaTestClass) : public CScriptBase, public MTimeoutObserver - ,public MControlObserver, - public MHttpDownloadMgrObserver + ,public MControlObserver //public MDevSoundObserver, //public MMdaAudioOutputStreamCallback // public MRadioFmTunerObserver, @@ -140,14 +136,6 @@ virtual ~CEnhanMediaTestClass(); void Event( MControl* aObject,TUint aEvent, TAny* aData ); - /** - * From MhttpDownloadMgrObserver. - * Callback from the DownloadManager notifying Client Events. - * @since S60 v3.2 - * @param aDownload Download for which the Event is meant - * @param aEvent Actual Event - */ - void HandleDMgrEventL( RHttpDownload& aDownload, THttpDownloadEvent aEvent ); enum TAEnhsExpectedEvent { @@ -417,21 +405,6 @@ TInt CreateSeekableData(CStifItemParser& aItem); - TInt GeneralGen_StartProgDLL(CStifItemParser& aItem); - TInt PDLSOpenL(CStifItemParser& aItem); - TInt PDLSGetCurFileSizeL(CStifItemParser& aItem); - TInt PDLSGetExpFileSizeL(CStifItemParser& aItem); - TInt PDLSGetDLStatusL(CStifItemParser& aItem); - TInt PDLSIsDLCompleteL(CStifItemParser& aItem); - TInt PDLSGetPerDownloadedL(CStifItemParser& aItem); - TInt PDLSGetPerBufferedL(CStifItemParser& aItem); - TInt PDLSGetDLRateL(CStifItemParser& aItem); - TInt PDLSGetBitRateL(CStifItemParser& aItem); - TInt PDLSResumeDownloadL(CStifItemParser& aItem); - TInt PDLSMoveFileL(CStifItemParser& aItem); - TInt PDLSGetSize(CStifItemParser& aItem); - TInt PDLSCancelDownloadL(CStifItemParser& aItem); - TInt AudioEffectIsEnabled (CStifItemParser& aItem); TInt HandleAudioEffectEnableL(CStifItemParser& aItem); @@ -557,7 +530,6 @@ MSourceControl* iSourceControl; RPointerArray iBuffers; RArray iAvailable; - MProgDLSource* iMProgDLSource; MEqualizerControl* iMEqualizerControl; MBassBoostControl* iMBassBoostControl; MVolumeControl* iMVolumeControl; @@ -597,20 +569,6 @@ TInt iAllowedDevice; - // Url used to Open the PDL - HBufC8* iUrlName; - // Download Manager instance to which we connect - RHttpDownloadMgrApiExt iDownloadMgr; - // Whether the DMgr is connected or not - TBool iDMgrConnected; - // Download for which we connect - RHttpDownload* iDownload; - // Current Download ID - TInt32 iDownloadId; - // Temp FileName - HBufC* iAccessPtName; - - CActiveSchedulerWait* iActive; // ?one_line_short_description_of_data //?data_declaration;