[matroska] r812 - trunk/DvdMenuXtractor

Author: robux4
Date: 2004-09-15 22:52:19 +0400 (Wed, 15 Sep 2004)
New Revision: 812

Modified:
   trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
Log:
more verbose about the PGC being saved

Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2004-09-15 13:51:44 UTC (rev 811)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2004-09-15 18:52:19 UTC (rev 812)
@@ -257,6 +257,7 @@
         pConfig->SetPath("/Input");
 
         pConfig->Write("InDirectory",    m_edInDir->GetValue());	
+		pConfig->Write("MenuVOBFilename", m_edInDir->GetValue() + "VIDEO_TS.VOB");
         pConfig->Write("OutputDirectory",m_edOutDir->GetValue());	
     }
 private:
@@ -827,6 +828,7 @@
 		
 		uint64_t st_time = start_time, end_time;
 
+		XmlFile.AddLine(IndentString(lvl)+"<ChapterAtom>");
 		lvl++;
 		wxString _myUID = CreateUID();
 		XmlFile.AddLine(IndentString(lvl)+"<ChapterUID>"+_myUID+"</ChapterUID>");
@@ -876,6 +878,7 @@
 		// PGC start/end times
 		DisplayTime(lvl, XmlFile, start_time, end_time);
 		lvl--;
+		XmlFile.AddLine(IndentString(lvl)+"</ChapterAtom>");
 		return end_time;
 	}
 	
@@ -885,6 +888,7 @@
 		static unsigned char _PrivatePTT[] = {0x18, 0x00};
 		uint64_t st_time = start_time, end_time;
 
+		XmlFile.AddLine(IndentString(lvl)+wxString::Format("<!-- PGC #%d type %s -->",pgc_num+1,GetPGCType(pgc_type)));
 		XmlFile.AddLine(IndentString(lvl)+"<ChapterAtom>");
 		lvl++;
 		wxString _myUID = CreateUID();
@@ -926,9 +930,7 @@
 			for (int i=0; i< pgc->nr_of_programs; i++)
 			{
 				XmlFile.AddLine(IndentString(lvl)+"<!-- Program #"+wxString::Format("%d",i+1)+" in this PGC -->");
-				XmlFile.AddLine(IndentString(lvl)+"<ChapterAtom>");
 				st_time = OutputProgram(lvl, XmlFile, pgc, i, st_time);
-				XmlFile.AddLine(IndentString(lvl)+"</ChapterAtom>");
 			}
 	
 		// PTT start/end times
@@ -1028,7 +1030,6 @@
 					for (int j=0; j<_LU.pgcit->nr_of_pgci_srp; j++)
 					{
 						const pgci_srp_t &_PGC_SRP = _LU.pgcit->pgci_srp[j];
-						XmlFile.AddLine("\n"+IndentString(lvl)+"<!-- PGC type "+GetPGCType(_PGC_SRP.entry_id)+" -->");
 						timecode_endB = OutputPGC(lvl, XmlFile, _PGC_SRP.pgc, timecode_endB, j, _PGC_SRP.entry_id);
 					}
 				}
@@ -1141,7 +1142,7 @@
 						uint64_t timecode_startB = timecode_endA, timecode_endB = timecode_endA;
 						for (int i=0; i<IfoFile->VtsTitles()->nr_of_srpts; i++)
 						{
-							XmlFile.AddLine(IndentString(lvl)+wxString::Format("<!-- Title #%d -->",i));
+							XmlFile.AddLine(IndentString(lvl)+wxString::Format("<!-- Title #%d -->",i+1));
 							XmlFile.AddLine(IndentString(lvl)+"<ChapterAtom>");
 								lvl++;
 								wxString _myUIDa = CreateUID();