[matroska] r1149 - trunk/DvdMenuXtractor

Author: robux4
Date: 2005-04-23 16:15:05 +0400 (Sat, 23 Apr 2005)
New Revision: 1149

Modified:
   trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
Log:
DMX: use the same edition UID for all editions from the same DVD

Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2005-04-20 05:12:46 UTC (rev 1148)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2005-04-23 12:15:05 UTC (rev 1149)
@@ -72,7 +72,7 @@
 wxString outputDirectory;
 wxString mtxDirectory;
 const wxString APPLICATION_NAME = "DVDMenuXtractor: DMX - a fair-use tool";
-const wxString APPLICATION_VERSION = "0.9.6";
+const wxString APPLICATION_VERSION = "0.9.7";
 
 // ----------------------------------------------------------------------------
 
@@ -613,6 +613,7 @@
 		wxString MtxCommandString;
 		const CellsListType *CellsList = IfoFile->GetCellsList(title, language);
 		int fOverWrite =  wxID_YES;
+		wxString editionUID = CreateUID();
 
 		if (!CellsList)
 			return;
@@ -805,9 +806,9 @@
 			bool addChapters;
 
 			if (language)
-				addChapters = GenerateXMLScriptMenu(outputDirectory+newFilename, title);
+				addChapters = GenerateXMLScriptMenu(outputDirectory+newFilename, title, editionUID);
 			else
-				addChapters = GenerateXMLScript(outputDirectory+newFilename, title);
+				addChapters = GenerateXMLScript(outputDirectory+newFilename, title, editionUID);
 
 			if (addChapters)
 			{
@@ -1265,13 +1266,13 @@
 		XmlFileSeg.Write();
 	}
 	
-	bool GenerateXMLScriptMenu(const wxString & Filename, uint16_t title) const
+	bool GenerateXMLScriptMenu(const wxString & Filename, uint16_t title, const wxString & editionUID) const
 	{
 		unsigned char _PrivateFP[]  = {0x30, 0x00, 0x00, 0x00};
 		unsigned char _PrivateVM[]  = {0x30, 0xC0, 0x00, 0x00};
 		unsigned char _PrivateVTS[] = {0x30, 0x80, 0x00, 0x00};
 
-		wxString line, editionUID = CreateUID();
+		wxString line;
 		
 		GenerateXMLScriptInfo(Filename, title, editionUID);
 
@@ -1349,7 +1350,7 @@
 		return true;
 	}
 
-	bool GenerateXMLScript(const wxString & Filename, uint16_t title) const
+	bool GenerateXMLScript(const wxString & Filename, uint16_t title, const wxString & editionUID) const
 	{
 		unsigned char _PrivateFP[]  = {0x30, 0x00, 0x00, 0x00};
 		unsigned char _PrivateVM[]  = {0x30, 0xC0, 0x00, 0x00};
@@ -1357,7 +1358,7 @@
 		unsigned char _PrivateTT[]  = {0x28, 0x00, 0x00, 0x00};
 		uint64_t start_timeH = uint64_t(-1);
 
-		wxString line, editionUID = CreateUID();
+		wxString line;
 
 		GenerateXMLScriptInfo(Filename, title, editionUID);