[matroska] r814 - trunk/DvdMenuXtractor

Author: robux4
Date: 2004-09-16 15:40:21 +0400 (Thu, 16 Sep 2004)
New Revision: 814

Modified:
   trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
Log:
fancier XML output

Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2004-09-16 11:18:52 UTC (rev 813)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2004-09-16 11:40:21 UTC (rev 814)
@@ -832,12 +832,7 @@
 		lvl++;
 		wxString _myUID = CreateUID();
 		XmlFile.AddLine(IndentString(lvl)+"<ChapterUID>"+_myUID+"</ChapterUID>");
-		// display the UID for the lazy rippers
-		XmlFile.AddLine(IndentString(lvl)+"<ChapterDisplay>");
-			lvl++;
-			XmlFile.AddLine(IndentString(lvl)+"<ChapterString>Program "+_myUID+"</ChapterString>");
-			lvl--;
-		XmlFile.AddLine(IndentString(lvl)+"</ChapterDisplay>");
+		XmlFile.AddLine(IndentString(lvl)+"<ChapterFlagHidden>1</ChapterFlagHidden>");
 		_PrivatePG[1] = (program_number+1) >> 8;
 		_PrivatePG[2] = (program_number+1) & 0xFF;
 		XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessPrivate>"+encodebase64(_PrivatePG,3)+"</ChapterProcessPrivate>");
@@ -888,7 +883,7 @@
 		static unsigned char _PrivatePTT[] = {0x18, 0x00};
 		uint64_t st_time = start_time, end_time;
 
-		XmlFile.AddLine(IndentString(lvl)+wxString::Format("<!-- PGC PGCN#%d type %s -->",pgc_num+1,GetPGCType(pgc_type)));
+		XmlFile.AddLine(IndentString(lvl)+wxString::Format("<!-- PGC PGC_%d type %s -->",pgc_num+1,GetPGCType(pgc_type)));
 		XmlFile.AddLine(IndentString(lvl)+"<ChapterAtom>");
 		lvl++;
 		wxString _myUID = CreateUID();
@@ -914,9 +909,6 @@
 		// Handle the Programs/Cells in the PGC
 		for (int i=0; i< pgc->nr_of_programs; i++)
 		{
-			XmlFile.AddLine(IndentString(lvl)+"<!-- Program PGN#"+wxString::Format("%d",i+1)+" in this PGC -->");
-			st_time = OutputProgram(lvl, XmlFile, pgc, i, st_time);
-			
 			// handle the PTT/Chapter
 			if (ptts != NULL)
 			{
@@ -925,7 +917,7 @@
 				{
 					if (ptts->ptt[ptt_num].pgcn == pgc_num+1 && ptts->ptt[ptt_num].pgn == i+1)
 					{
-						XmlFile.AddLine(IndentString(lvl)+wxString::Format("<!-- Chapter PTT#%d -->", ptt_num+1));
+						XmlFile.AddLine(IndentString(lvl)+wxString::Format("<!-- Chapter PTT_%d -->", ptt_num+1));
 						XmlFile.AddLine(IndentString(lvl)+"<ChapterAtom>");
 						lvl++;
 							wxString _myUIDa = CreateUID();
@@ -941,13 +933,16 @@
 							XmlFile.AddLine(IndentString(lvl)+"</ChapterDisplay>");
 				
 						// PTT start times (no end time, it's only a reference used to seek)
-						XmlFile.AddLine(IndentString(lvl)+"<ChapterTimeStart>"+TimeFormat(start_time)+"</ChapterTimeStart>");
+						XmlFile.AddLine(IndentString(lvl)+"<ChapterTimeStart>"+TimeFormat(st_time)+"</ChapterTimeStart>");
 						lvl--;
 						XmlFile.AddLine(IndentString(lvl)+"</ChapterAtom>");
 						break;
 					}
 				}
 			}
+
+			XmlFile.AddLine(IndentString(lvl)+"<!-- Program PGN#"+wxString::Format("%d",i+1)+" in this PGC -->");
+			st_time = OutputProgram(lvl, XmlFile, pgc, i, st_time);
 		}
 	
 		// PGC start/end times