Author: robux4
Date: 2004-09-25 17:46:10 +0400 (Sat, 25 Sep 2004)
New Revision: 838
Modified:
trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
Log:
use the same XML chapter names as in mkvmerge
Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.cpp 2004-09-23 22:54:24 UTC (rev 837)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.cpp 2004-09-25 13:46:10 UTC (rev 838)
@@ -741,10 +741,10 @@
XmlFile.AddLine(IndentString(lvl)+"<!-- Pre commands -->");
XmlFile.AddLine(IndentString(lvl)+"<ChapterProcess>");
lvl++;
- XmlFile.AddLine(IndentString(lvl)+"<ChapProcessTime>1</ChapProcessTime>");
+ XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessTime>1</ChapterProcessTime>");
_buf[0] = command_tbl->nr_of_pre;
memcpy(&_buf[1], command_tbl->pre_cmds, command_tbl->nr_of_pre * 8);
- XmlFile.AddLine(IndentString(lvl)+"<ChapProcessCommand>"+encodebase64(_buf,1+command_tbl->nr_of_pre * 8)+"</ChapProcessCommand>");
+ XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessCommand>"+encodebase64(_buf,1+command_tbl->nr_of_pre * 8)+"</ChapterProcessCommand>");
lvl--;
XmlFile.AddLine(IndentString(lvl)+"</ChapterProcess>");
}
@@ -755,11 +755,11 @@
XmlFile.AddLine(IndentString(lvl)+"<!-- Cell commands -->");
XmlFile.AddLine(IndentString(lvl)+"<ChapterProcess>");
lvl++;
- XmlFile.AddLine(IndentString(lvl)+"<ChapProcessTime>0</ChapProcessTime>");
+ XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessTime>0</ChapterProcessTime>");
_buf = (unsigned char*) realloc(_buf, 1+command_tbl->nr_of_cell * 8);
_buf[0] = command_tbl->nr_of_cell;
memcpy(&_buf[1], command_tbl->cell_cmds, command_tbl->nr_of_cell * 8);
- XmlFile.AddLine(IndentString(lvl)+"<ChapProcessCommand>"+encodebase64(_buf,1+command_tbl->nr_of_cell * 8)+"</ChapProcessCommand>");
+ XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessCommand>"+encodebase64(_buf,1+command_tbl->nr_of_cell * 8)+"</ChapterProcessCommand>");
lvl--;
XmlFile.AddLine(IndentString(lvl)+"</ChapterProcess>");
}
@@ -770,11 +770,11 @@
XmlFile.AddLine(IndentString(lvl)+"<!-- Post commands -->");
XmlFile.AddLine(IndentString(lvl)+"<ChapterProcess>");
lvl++;
- XmlFile.AddLine(IndentString(lvl)+"<ChapProcessTime>2</ChapProcessTime>");
+ XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessTime>2</ChapterProcessTime>");
_buf = (unsigned char*) realloc(_buf, 1+command_tbl->nr_of_post * 8);
_buf[0] = command_tbl->nr_of_post;
memcpy(&_buf[1], command_tbl->post_cmds, command_tbl->nr_of_post * 8);
- XmlFile.AddLine(IndentString(lvl)+"<ChapProcessCommand>"+encodebase64(_buf,1+command_tbl->nr_of_post * 8)+"</ChapProcessCommand>");
+ XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessCommand>"+encodebase64(_buf,1+command_tbl->nr_of_post * 8)+"</ChapterProcessCommand>");
lvl--;
XmlFile.AddLine(IndentString(lvl)+"</ChapterProcess>");
}
@@ -829,7 +829,7 @@
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>");
+ XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessedPrivate>"+encodebase64(_PrivatePG,3)+"</ChapterProcessedPrivate>");
// for this program
int entry_cell_num = pgc->program_map[program_number];
int program_last_cell_num = pgc->nr_of_cells;
@@ -860,7 +860,7 @@
_PrivateCN[2] = (position.vob_id_nr) & 0xFF;
_PrivateCN[3] = position.cell_nr;
_PrivateCN[4] = cell_num - entry_cell_num + 1; // Number of angles
- XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessPrivate>"+encodebase64(_PrivateCN,5)+"</ChapterProcessPrivate>");
+ XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessedPrivate>"+encodebase64(_PrivateCN,5)+"</ChapterProcessedPrivate>");
//_TODO_: handle the vobID/cellID to determine the real timecode of the cells !
// -> no, done when extracting the content streams, using the same timecode base
@@ -897,7 +897,7 @@
_PrivatePGC[5] = ((uint8_t*) &pgc->prohibited_ops)[1];
_PrivatePGC[6] = ((uint8_t*) &pgc->prohibited_ops)[2];
_PrivatePGC[7] = ((uint8_t*) &pgc->prohibited_ops)[3];
- XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessPrivate>"+encodebase64(_PrivatePGC,8)+"</ChapterProcessPrivate>");
+ XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessedPrivate>"+encodebase64(_PrivatePGC,8)+"</ChapterProcessedPrivate>");
// display the UID for the lazy rippers
XmlFile.AddLine(IndentString(lvl)+"<ChapterDisplay>");
lvl++;
@@ -926,7 +926,7 @@
XmlFile.AddLine(IndentString(lvl)+"<ChapterUID>"+_myUIDa+"</ChapterUID>");
_PrivatePTT[1] = (ptt_num+1) >> 8;
_PrivatePTT[2] = (ptt_num+1) & 0xFF;
- XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessPrivate>"+encodebase64(_PrivatePTT,3)+"</ChapterProcessPrivate>");
+ XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessedPrivate>"+encodebase64(_PrivatePTT,3)+"</ChapterProcessedPrivate>");
// display the UID for the lazy rippers
XmlFile.AddLine(IndentString(lvl)+"<ChapterDisplay>");
lvl++;
@@ -1025,7 +1025,7 @@
wxString _myUIDb = CreateUID();
XmlFile.AddLine(IndentString(lvl)+"<ChapterUID>"+_myUIDb+"</ChapterUID>");
- XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessPrivate>"+encodebase64(_PrivateLU,4)+"</ChapterProcessPrivate>");
+ XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessedPrivate>"+encodebase64(_PrivateLU,4)+"</ChapterProcessedPrivate>");
// display the UID for the lazy rippers
XmlFile.AddLine(IndentString(lvl)+"<ChapterDisplay>");
lvl++;
@@ -1104,7 +1104,7 @@
lvl--;
XmlFile.AddLine(IndentString(lvl)+"</ChapterDisplay>");
- XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessPrivate>"+encodebase64(_PrivateFP,4)+"</ChapterProcessPrivate>");
+ XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessedPrivate>"+encodebase64(_PrivateFP,4)+"</ChapterProcessedPrivate>");
// PGC commands
AddCommands(lvl, XmlFile, IfoFile->FirstPlayPGC()->command_tbl);
lvl--;
@@ -1121,7 +1121,7 @@
lvl++;
wxString _myUIDa = CreateUID();
XmlFile.AddLine(IndentString(lvl)+"<ChapterUID>"+_myUIDa+"</ChapterUID>");
- XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessPrivate>"+encodebase64(_PrivateVM,4)+"</ChapterProcessPrivate>");
+ XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessedPrivate>"+encodebase64(_PrivateVM,4)+"</ChapterProcessedPrivate>");
timecode_endA = HandleLanguageUnit(lvl, XmlFile, timecode_startA, *IfoFile, 0);
@@ -1161,7 +1161,7 @@
XmlFile.AddLine(IndentString(lvl)+"<ChapterUID>"+_myUIDa+"</ChapterUID>");
_PrivateVTS[2] = title >> 8;
_PrivateVTS[3] = title & 0xFF;
- XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessPrivate>"+encodebase64(_PrivateVTS,4)+"</ChapterProcessPrivate>");
+ XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessedPrivate>"+encodebase64(_PrivateVTS,4)+"</ChapterProcessedPrivate>");
// VTS Menu
if (IfoFile->LanguageUnits(title) && IfoFile->LanguageUnits(title)->nr_of_lus)
@@ -1183,7 +1183,7 @@
_PrivateTT[1] = (i+1) >> 8;
_PrivateTT[2] = (i+1) & 0xFF;
- XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessPrivate>"+encodebase64(_PrivateTT,3)+"</ChapterProcessPrivate>");
+ XmlFile.AddLine(IndentString(lvl)+"<ChapterProcessedPrivate>"+encodebase64(_PrivateTT,3)+"</ChapterProcessedPrivate>");
// add the PGC that match this PTT
uint64_t timecode_startC = timecode_startB, timecode_endC = timecode_startB;
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.