[matroska] r887 - trunk/DvdMenuXtractor

Author: robux4
Date: 2004-10-17 14:39:43 +0400 (Sun, 17 Oct 2004)
New Revision: 887

Modified:
   trunk/DvdMenuXtractor/VobParser.cpp
   trunk/DvdMenuXtractor/VobParser.h
Log:
compilation fixes

Modified: trunk/DvdMenuXtractor/VobParser.cpp
===================================================================
--- trunk/DvdMenuXtractor/VobParser.cpp	2004-10-14 19:24:21 UTC (rev 886)
+++ trunk/DvdMenuXtractor/VobParser.cpp	2004-10-17 10:39:43 UTC (rev 887)
@@ -80,6 +80,7 @@
 VobParser::VobParser(const char* dirname, int16_t title)
   :m_title(title)
    ,m_demuxer(NULL)
+   ,m_vobfile(NULL)
 {
 	FILE *_file;
 	wxString FileName;
@@ -120,7 +121,7 @@
 	}
 	else
 	{
-		m_file = m_files.begin();
+		m_vobfile = m_files.GetFirst();
 	}
 
 	m_pktcount = fileSize / PACKET_SIZE;
@@ -132,7 +133,7 @@
 
 VobParser::~VobParser()
 {
-	for (int i=0; i<m_files.GetCount(); i++)
+	for (unsigned int i=0; i<m_files.GetCount(); i++)
 		fclose(m_files.Item(i)->GetData());
 }
 
@@ -256,11 +257,11 @@
 {
 	m_index = 0;
 
-	if (feof(*m_file) && m_file != m_files.end())
-		m_file++;
-	if (m_file == m_files.end())
+	if (m_vobfile && feof(m_vobfile->GetData()))
+		m_vobfile = m_vobfile->GetNext();
+	if (!m_vobfile)
 		return false;
-	return (fread(m_buff, PACKET_SIZE, 1, *m_file) == 1);
+	return (fread(m_buff, PACKET_SIZE, 1, m_vobfile->GetData()) == 1);
 }
 
 // ----------------------------------------------------------------------------

Modified: trunk/DvdMenuXtractor/VobParser.h
===================================================================
--- trunk/DvdMenuXtractor/VobParser.h	2004-10-14 19:24:21 UTC (rev 886)
+++ trunk/DvdMenuXtractor/VobParser.h	2004-10-17 10:39:43 UTC (rev 887)
@@ -570,7 +570,7 @@
 
 private:
 	FileHandleList m_files;
-	FileHandleList::iterator m_file;
+	FileHandleList::Node *m_vobfile;
 	uint8_t m_buff[PACKET_SIZE];
 	uint32_t m_index;
 	uint32_t m_pktindex;