[matroska] r991 - trunk/DvdMenuXtractor

Author: robux4
Date: 2004-12-29 23:42:15 +0300 (Wed, 29 Dec 2004)
New Revision: 991

Modified:
   trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
Log:
DMX: fix the mkvmerge command-line and improve the track names

Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2004-12-29 20:26:58 UTC (rev 990)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2004-12-29 20:42:15 UTC (rev 991)
@@ -625,7 +625,7 @@
 			MtxCommandFile.Write(ShellString.c_str(), ShellString.Length());
 #endif
 #if defined(WIN32)
-			wxString MtxCommandString = "\"" + mtxDirectory + "\"mkvmerge -o " + outputDirectory+newFilename + ".mkv ";
+			wxString MtxCommandString = "\"" + mtxDirectory + "mkvmerge\" -o " + outputDirectory+newFilename + ".mkv ";
 #else
 			wxString MtxCommandString = mtxDirectory + "mkvmerge -o " + outputDirectory+newFilename + ".mkv ";
 #endif
@@ -648,16 +648,16 @@
 
 					// get the possible ID for this track for this Cell/PGC
 					uint8_t _ID = IfoFile->GetAudioId(_stream, title, language);
-					MtxTempString = " --track-name 0:\"" ;
+					MtxTempString = " --track-name 0:\"aud-" ;
 					if (_attr->lang_code == 0)
 					{
 						_langName = wxString::Format("_%d_un", _ID);
-						MtxTempString += outputDirectory+newFilename+_langName + "\" --language 0:und";
+						MtxTempString += newFilename+_langName + "\" --language 0:und";
 					}
 					else
 					{
 						_langName = wxString::Format("_%d_%c%c", _ID, _attr->lang_code >> 8, _attr->lang_code & 0xFF);
-						MtxTempString += outputDirectory+newFilename+_langName + "\" --language 0:";
+						MtxTempString += newFilename+_langName + "\" --language 0:";
 						MtxTempString += wxString::Format("%c%c", _attr->lang_code >> 8, _attr->lang_code & 0xFF);
 					}
 					MtxTempString += " --timecodes 0:" + outputDirectory+newFilename+_langName;
@@ -716,16 +716,16 @@
 						wxString MtxTempString;
 
 						subp_attr_t * _attr = _subTracks.Item(_stream)->GetData();
-						MtxTempString = " --track-name 0:\"";
+						MtxTempString = " --track-name 0:\"sub-";
 						if (_attr->lang_code == 0)
 						{
 							_langName = wxString::Format("_%d_un", _IDs.Item(_IDidx));
-							MtxTempString += outputDirectory+newFilename+_langName + "\" --language 0:und ";
+							MtxTempString += newFilename+_langName + "\" --language 0:und ";
 						}
 						else
 						{
 							_langName = wxString::Format("_%d_%c%c", _IDs.Item(_IDidx), _attr->lang_code >> 8, _attr->lang_code & 0xFF);
-							MtxTempString += outputDirectory+newFilename+_langName + "\" --language 0:";
+							MtxTempString += newFilename+_langName + "\" --language 0:";
 							MtxTempString += wxString::Format("%c%c ", _attr->lang_code >> 8, _attr->lang_code & 0xFF);
 						}
 						_muxer = new SubDemuxWriter(outputDirectory + newFilename+_langName, 0x20 + _IDs.Item(_IDidx), _width, _height, _palette, _attr->lang_code, _attr->lang_extension == 9);
@@ -740,7 +740,7 @@
 				if (!demuxer.AddDemuxer(SUBSTREAM_PCI, _muxer))
 					delete _muxer;
 				else
-					MtxCommandString += " --track-name 0:\"" + outputDirectory+newFilename + "\" --timecodes 0:" + outputDirectory+newFilename + "_btn.tmc " + outputDirectory+newFilename + ".btn";
+					MtxCommandString += " --track-name 0:\"btn-" + newFilename + "\" --timecodes 0:" + outputDirectory+newFilename + "_btn.tmc " + outputDirectory+newFilename + ".btn";
 			}
 
 			MtxCommandString += " --chapters " + outputDirectory+newFilename + "_menu.xml";