[matroska] r1057 - trunk/DvdMenuXtractor

Author: robux4
Date: 2005-01-28 23:27:11 +0300 (Fri, 28 Jan 2005)
New Revision: 1057

Modified:
   trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
Log:
DMX: keep the title number in the chapter text

Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2005-01-28 20:07:13 UTC (rev 1056)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2005-01-28 20:27:11 UTC (rev 1057)
@@ -916,7 +916,7 @@
 		return result;
 	}
 
-	uint64_t OutputProgram(int lvl, wxTextFile & XmlFile, const pgc_t * pgc, int program_number, const CellsListType & cell_list, int16_t pgc_num, const ttu_t * ptts) const
+	uint64_t OutputProgram(int lvl, wxTextFile & XmlFile, const pgc_t * pgc, int program_number, const CellsListType & cell_list, int16_t pgc_num, const ttu_t * ptts, int title) const
 	{
 		static unsigned char _PrivatePTT[] = {0x10, 0x00};
 		static unsigned char _PrivatePG[] = {0x18, 0x00, 0x00};
@@ -962,7 +962,7 @@
 					lvl++;
 						XmlFile.AddLine(IndentString(lvl)+"<ChapterDisplay>");
 							lvl++;
-							XmlFile.AddLine(IndentString(lvl)+wxString::Format("<ChapterString>Your Name Here For Chapter #%d</ChapterString>", pppt_nr+1));
+							XmlFile.AddLine(IndentString(lvl)+wxString::Format("<ChapterString>Your Name Here For Chapter #%d.%d</ChapterString>", title, pppt_nr+1));
 							lvl--;
 						XmlFile.AddLine(IndentString(lvl)+"</ChapterDisplay>");
 						wxString _myUID = CreateUID();
@@ -1045,7 +1045,7 @@
 		return start_time;
 	}
 	
-	uint64_t OutputPGC(int lvl, wxTextFile & XmlFile, const pgc_t * pgc, uint16_t pgc_num, unsigned char pgc_type, const CellsListType & cell_list, const ttu_t * ptts) const
+	uint64_t OutputPGC(int lvl, wxTextFile & XmlFile, const pgc_t * pgc, uint16_t pgc_num, unsigned char pgc_type, const CellsListType & cell_list, const ttu_t * ptts, int title) const
 	{
 		static unsigned char _PrivatePGC[] = {0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 		uint64_t start_time = uint64_t(-1), found_time;
@@ -1087,7 +1087,7 @@
 		// Handle the Programs/Cells in the PGC
 		for (int i=0; i< pgc->nr_of_programs; i++)
 		{
-			found_time = OutputProgram(lvl, XmlFile, pgc, i, cell_list, pgc_num, ptts);
+			found_time = OutputProgram(lvl, XmlFile, pgc, i, cell_list, pgc_num, ptts, title);
 			if (start_time > found_time)
 				start_time = found_time;
 
@@ -1194,7 +1194,7 @@
 					for (int j=0; j<_LU.pgcit->nr_of_pgci_srp; j++)
 					{
 						const pgci_srp_t &_PGC_SRP = _LU.pgcit->pgci_srp[j];
-						found_time = OutputPGC(lvl, XmlFile, _PGC_SRP.pgc, j, _PGC_SRP.entry_id, _ifo.CellsList(title, true), NULL);
+						found_time = OutputPGC(lvl, XmlFile, _PGC_SRP.pgc, j, _PGC_SRP.entry_id, _ifo.CellsList(title, true), NULL, 0);
 						if (start_time > found_time)
 							start_time = found_time;
 					}
@@ -1400,7 +1400,7 @@
 								if ((IfoFile->VtsPGCs(title)->pgci_srp[k].entry_id & 0x7F) == i+1)
 								{
 									found_time = OutputPGC(lvl, XmlFile, 
-											IfoFile->VtsPGCs(title)->pgci_srp[k].pgc, k, 0, IfoFile->CellsList(title, false), &IfoFile->VtsTitles(title)->title[i]);
+											IfoFile->VtsPGCs(title)->pgci_srp[k].pgc, k, 0, IfoFile->CellsList(title, false), &IfoFile->VtsTitles(title)->title[i], i+1);
 									if (start_time > found_time)
 										start_time = found_time;
 								}