X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fbase%2Frawfile.cpp;h=e444ba90c7613a36264ea8dbf2445ae23bb222a5;hp=0d8a93b525683d9a2077f370ebccf22c20da191e;hb=10e7e45ae92d4fe06f70126ed256b87896dbc432;hpb=08ee4eef0af570f64937fd7a20c5d71dfb89cabc

diff --git a/lib/base/rawfile.cpp b/lib/base/rawfile.cpp
index 0d8a93b..e444ba9 100644
--- a/lib/base/rawfile.cpp
+++ b/lib/base/rawfile.cpp
@@ -140,7 +140,7 @@ void eRawFile::scan()
 	{
 		if (!m_cached)
 		{
-			int f = openFile(m_nrfiles);
+			int f = openFileUncached(m_nrfiles);
 			if (f < 0)
 				break;
 			if (!m_nrfiles)
@@ -149,7 +149,7 @@ void eRawFile::scan()
 			::close(f);
 		} else
 		{
-			FILE *f = (FILE*)openFile(m_nrfiles);
+			FILE *f = openFileCached(m_nrfiles);
 			if (!f)
 				break;
 			::fseeko(f, 0, SEEK_END);
@@ -176,9 +176,9 @@ int eRawFile::switchOffset(off_t off)
 //			eDebug("-> %d", filenr);
 			close();
 			if (!m_cached)
-				m_fd = openFile(filenr);
+				m_fd = openFileUncached(filenr);
 			else
-				m_file = (FILE*)openFile(filenr);
+				m_file = openFileCached(filenr);
 			m_last_offset = m_base_offset = m_splitsize * filenr;
 			m_current_file = filenr;
 		}
@@ -201,7 +201,8 @@ int eRawFile::switchOffset(off_t off)
 	}
 }
 
-int eRawFile::openFile(int nr)
+/* m_cached */
+FILE *eRawFile::openFileCached(int nr)
 {
 	std::string filename = m_basename;
 	if (nr)
@@ -210,8 +211,18 @@ int eRawFile::openFile(int nr)
 		snprintf(suffix, 5, ".%03d", nr);
 		filename += suffix;
 	}
-	if (!m_cached)
-		return ::open(filename.c_str(), O_RDONLY | O_LARGEFILE);
-	else
-		return (int)::fopen64(filename.c_str(), "rb");
+	return ::fopen64(filename.c_str(), "rb");
+}
+
+/* !m_cached */
+int eRawFile::openFileUncached(int nr)
+{
+	std::string filename = m_basename;
+	if (nr)
+	{
+		char suffix[5];
+		snprintf(suffix, 5, ".%03d", nr);
+		filename += suffix;
+	}
+	return ::open(filename.c_str(), O_RDONLY | O_LARGEFILE);
 }