[Common-cvs] fileio hxdatasource.cpp,1.1.2.1,1.1.2.2
rrajesh at helixcommunity.org rrajesh at helixcommunity.orgUpdate of /cvsroot/common/fileio
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv9530
Modified Files:
Tag: hxclient_2_1_0_cayennes
hxdatasource.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: rajesh.rathinasamy at nokia.com
>
> Reviewed by:
>
> Date: 17-May-2007
>
> Project: SymbianMmf
>
> ErrorId: ETZG-732BAQ
>
> Synopsis: Detection of MMC Card removal during playback when Symbian
> data source is used
>
> MMC card removal during playout results in read error which was not
> handled. Added a new API to datasource interface similar to ferror().
> Only symbianMMf uses the data source interface now, so adding a new
> interface does not have any impact on other platforms.
>
> Also updated the install pcf file to include meta data dll to the
> video and audio controller package files.
>
>
> Root Cause of the problem: Implementation
>
> Files Modified:
> common/include/ihxmmfdatasource.h
> common/fileio/hxdatasource.cpp
> common/fileio/platform/symbian/hxdatasource_ccontent.cpp
> common/fileio/platform/symbian/hxdatasource_descriptor.cpp
> common/fileio/platform/symbian/hxdatasourcemmfclip.cpp
> common/fileio/pub/hxdatasource.h
> filesystem/local/mini/minifileobj.cpp
> filesystem/local/mini/minifileobj.h
> filesystem/progdown/platform/symbian/pdfileobj.cpp
> clientapps/symbianMmf/audiocontroller/installMMF.pcf
> clientapps/symbianMmf/videocontroller/installMMF.pcf
>
>
> Image Size and Heap Use impact: no major impact
>
> Module Release testing (STIF) : Passed.
>
> Test case(s) Added : No.
>
> Memory leak check performed : Yes. No new leaks introduced.
>
> Platforms and Profiles Build Verified:
> helix-client-s60-32-mmf-mdf-arm
>
> Platforms and Profiles Functionality verified: armv5,winscw
>
> Branch: Head & 210CayS
Index: hxdatasource.cpp
===================================================================
RCS file: /cvsroot/common/fileio/hxdatasource.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- hxdatasource.cpp 19 Sep 2006 21:05:57 -0000 1.1.2.1
+++ hxdatasource.cpp 22 May 2007 14:38:40 -0000 1.1.2.2
@@ -58,6 +58,7 @@
CHXDataSource::CHXDataSource():
m_ulRefCount(0)
,m_ulPosition(0)
+ ,m_ulLastError(HXR_OK)
,m_pRequest(NULL)
{
}
@@ -182,3 +183,7 @@
return HXR_FAIL;
}
+STDMETHODIMP CHXDataSource::GetLastError()
+{
+ return m_ulLastError;
+}