Author: robux4
Date: 2005-01-18 00:42:30 +0300 (Tue, 18 Jan 2005)
New Revision: 1039
Modified:
trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
trunk/DvdMenuXtractor/README.txt
trunk/DvdMenuXtractor/VobParser.cpp
Log:
DMX: added more family UID handling
Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.cpp 2005-01-17 14:36:28 UTC (rev 1038)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.cpp 2005-01-17 21:42:30 UTC (rev 1039)
@@ -71,7 +71,7 @@
wxString outputDirectory;
wxString mtxDirectory;
const wxString APPLICATION_NAME = "DVDMenuXtractor: DMX - a fair-use tool";
-const wxString APPLICATION_VERSION = "0.8.2";
+const wxString APPLICATION_VERSION = "0.8.4";
// ----------------------------------------------------------------------------
@@ -628,7 +628,7 @@
#else
MtxCommandString = mtxDirectory + "mkvmerge -o " + outputDirectory+newFilename + ".mkv";
#endif
- MtxCommandString += " --family-uid " + encodeHex(m_FamilyUID, 16);
+ MtxCommandString += " --family-uid \"" + encodeHex(m_FamilyUID, 16, true) + "\"";
if (aVobParser != NULL)
{
@@ -1184,11 +1184,14 @@
return start_time;
}
- wxString encodeHex(const unsigned char * buffer, unsigned int size)
+ wxString encodeHex(const unsigned char * buffer, unsigned int size, bool prefix = false)
{
wxString result;
for (unsigned int i=0; i<size; i++)
- result += wxString::Format("%02X ", buffer[i]);
+ if (prefix)
+ result += wxString::Format("0x%02x ", buffer[i]);
+ else
+ result += wxString::Format("%02x ", buffer[i]);
return result;
}
@@ -1229,7 +1232,7 @@
lvl++;
XmlFile.AddLine(IndentString(lvl)+"<LinkEditionUID>"+editionUID+"</LinkEditionUID>");
XmlFile.AddLine(IndentString(lvl)+"<LinkCodec>1</LinkCodec>");
-// XmlFile.AddLine(IndentString(lvl)+"<LinkID></LinkID>");
+ XmlFile.AddLine(IndentString(lvl)+"<LinkID format=\"ascii\">TODO</LinkID>");
lvl--;
XmlFile.AddLine(IndentString(lvl)+"</Links>");
XmlFile.AddLine(IndentString(lvl)+"<EditionEntry>");
@@ -1319,7 +1322,7 @@
lvl++;
XmlFile.AddLine(IndentString(lvl)+"<LinkEditionUID>"+editionUID+"</LinkEditionUID>");
XmlFile.AddLine(IndentString(lvl)+"<LinkCodec>1</LinkCodec>");
-// XmlFile.AddLine(IndentString(lvl)+"<LinkID></LinkID>");
+ XmlFile.AddLine(IndentString(lvl)+"<LinkID format=\"ascii\">TODO</LinkID>");
lvl--;
XmlFile.AddLine(IndentString(lvl)+"</Links>");
XmlFile.AddLine(IndentString(lvl)+"<EditionEntry>");
Modified: trunk/DvdMenuXtractor/README.txt
===================================================================
--- trunk/DvdMenuXtractor/README.txt 2005-01-17 14:36:28 UTC (rev 1038)
+++ trunk/DvdMenuXtractor/README.txt 2005-01-17 21:42:30 UTC (rev 1039)
@@ -1,5 +1,6 @@
TODO :
-* verify (and fix) the frame and cluster timecodes from mkvmerge
+* finish the LinkID (with the correct definition)
+* get the PTT handling back and correct...
* generate the d2v file ?
* allow skipping DVD parts when extracting (VMG, VTSM, VTS)
* allow selection of stream output (audio & subs languages)
Modified: trunk/DvdMenuXtractor/VobParser.cpp
===================================================================
--- trunk/DvdMenuXtractor/VobParser.cpp 2005-01-17 14:36:28 UTC (rev 1038)
+++ trunk/DvdMenuXtractor/VobParser.cpp 2005-01-17 21:42:30 UTC (rev 1039)
@@ -24,8 +24,6 @@
#define PRIVATE_STREAM2 0xBF
#define CURRENT_OFFSET (m_pktindex * DVD_VIDEO_LB_LEN + m_index)
-#define USE_DEBUG_LOG 1
-
// ----------------------------------------------------------------------------
// Logging
// ----------------------------------------------------------------------------
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.