[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] mp4/fileformat atomizer.cpp, 1.18.8.3,
From:       qluo () helixcommunity ! org
Date:       2009-08-31 15:32:52
Message-ID: 200908311641.n7VGfx1F020847 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/datatype/mp4/fileformat
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv21476

Modified Files:
      Tag: hxclient_3_1_0_atlas
	atomizer.cpp mempager.cpp 
Log Message:
Avoid doing file access synchronously if the filesystem doesn't support it.
CR:  ehyche@real.com.


Index: atomizer.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/atomizer.cpp,v
retrieving revision 1.18.8.3
retrieving revision 1.18.8.4
diff -u -d -r1.18.8.3 -r1.18.8.4
--- atomizer.cpp	28 Apr 2008 02:09:58 -0000	1.18.8.3
+++ atomizer.cpp	31 Aug 2009 15:32:50 -0000	1.18.8.4
@@ -159,14 +159,14 @@
     // Find out if syncrhonous use of input is possible
     if (SUCCEEDED(retVal))
     {
-	if (SUCCEEDED(m_pFileSwitcher->Advise(HX_FILEADVISE_SYNCACCESS)))
+	HX_RESULT adviseRes = m_pFileSwitcher->Advise(HX_FILEADVISE_SYNCACCESS);
+	if (SUCCEEDED(adviseRes) && adviseRes != HXR_ADVISE_NETWORK_ACCESS)
 	{
 	    m_bSyncAccessEnabled = TRUE;
 	    m_pFileSwitcher->Advise(HX_FILEADVISE_ASYNCACCESS);
 	}
 	
-	HX_RESULT adviseRes = 
-	    m_pFileSwitcher->Advise(HX_FILEADVISE_RANDOMACCESS);
+	adviseRes = m_pFileSwitcher->Advise(HX_FILEADVISE_RANDOMACCESS);
 
 	if (HXR_ADVISE_PREFER_LINEAR == adviseRes)
 	{

Index: mempager.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/mempager.cpp,v
retrieving revision 1.6
retrieving revision 1.6.16.1
diff -u -d -r1.6 -r1.6.16.1
--- mempager.cpp	27 Apr 2005 13:57:41 -0000	1.6
+++ mempager.cpp	31 Aug 2009 15:32:50 -0000	1.6.16.1
@@ -198,7 +198,8 @@
 	}
 
 	// Page in here only if it can be done synchronously
-	if (SUCCEEDED(m_pFileSwitcher->Advise(HX_FILEADVISE_SYNCACCESS)))
+	HX_RESULT adviseRes = m_pFileSwitcher->Advise(HX_FILEADVISE_SYNCACCESS);
+	if (SUCCEEDED(adviseRes) && adviseRes != HXR_ADVISE_NETWORK_ACCESS)
 	{
 	    m_bSyncMode = TRUE;
 	    retVal = _LoadPage();


_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs
[prev in list] [next in list] [prev in thread] [next in thread]