[matroska] r1013 - trunk/DvdMenuXtractor

Author: robux4
Date: 2005-01-05 23:10:48 +0300 (Wed, 05 Jan 2005)
New Revision: 1013

Modified:
   trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
   trunk/DvdMenuXtractor/DvdMenuXtractor.vcproj
   trunk/DvdMenuXtractor/VobParser.cpp
Log:
DMX: fix the produced XML to be usable without infinite cells support
ignore bad IFO files not mentioning existing streams

Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2005-01-05 16:19:39 UTC (rev 1012)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2005-01-05 20:10:48 UTC (rev 1013)
@@ -911,7 +911,8 @@
 					XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessCommand>");
 					lvl++;
 						XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessTime>2</ChapterProcessTime>");
-						XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessData>TODO: COMMAND TO BE DEFINED</ChapterProcessData>");
+						XmlFile.AddLine(IndentString(lvl)+"<!-- TODO: COMMAND TO BE DEFINED -->");
+						XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessData>"+encodebase64(_PrivatePG,1)+"</ChapterProcessData>");
 					lvl--;
 					XmlFile.AddLine(IndentString(lvl)+"</ChapterProcessCommand>");
 				lvl--;

Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.vcproj
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.vcproj	2005-01-05 16:19:39 UTC (rev 1012)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.vcproj	2005-01-05 20:10:48 UTC (rev 1013)
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="1"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)\win32&quot;;&quot;;&quot;$(ProjectDir)\libdvdread&quot;"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)\win32&quot;;&quot;$(ProjectDir)\libdvdread&quot;"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"

Modified: trunk/DvdMenuXtractor/VobParser.cpp
===================================================================
--- trunk/DvdMenuXtractor/VobParser.cpp	2005-01-05 16:19:39 UTC (rev 1012)
+++ trunk/DvdMenuXtractor/VobParser.cpp	2005-01-05 20:10:48 UTC (rev 1013)
@@ -89,8 +89,8 @@
 
 void CompositeDemuxWriter::ProcessStream(uint8_t streamID, uint8_t* buff, uint32_t size, int32_t start_time, int32_t end_time, wxString & debug)
 {
-	assert(m_muxers[streamID] != NULL);
-	m_muxers[streamID]->ProcessStream(buff, size, start_time, end_time, debug);
+	if (m_muxers[streamID] != NULL)
+		m_muxers[streamID]->ProcessStream(buff, size, start_time, end_time, debug);
 }
 
 void CompositeDemuxWriter::Reset()