[matroska] r1132 - trunk/DvdMenuXtractor

Author: robux4
Date: 2005-04-12 22:51:07 +0400 (Tue, 12 Apr 2005)
New Revision: 1132

Modified:
   trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
   trunk/DvdMenuXtractor/MyWizard.cpp
Log:
DMX: fix issues with spaces in paths, wxWidget compatibility and overwriting check

Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2005-04-11 13:11:34 UTC (rev 1131)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2005-04-12 18:51:07 UTC (rev 1132)
@@ -629,7 +629,7 @@
 
 			// check for an overwrite message
 			wxFile MtxCommandFileTest;
-			if (MtxCommandFileTest.Open(MtxFilename))
+			if (MtxCommandFileTest.Exists(MtxFilename))
 			{
 				wxMessageDialog OverWrite(this, wxString::Format("Overwrite '%s' files ?", newFilename.c_str()), APPLICATION_NAME, wxYES_NO|wxICON_EXCLAMATION );
 				fOverWrite = OverWrite.ShowModal();
@@ -645,9 +645,9 @@
 			MtxCommandFile.Write(ShellString.c_str(), ShellString.Length());
 #endif
 #if defined(WIN32)
-			MtxCommandString = "\"" + mtxDirectory + "mkvmerge\" -o " + outputDirectory+newFilename + ".mkv";
+			MtxCommandString = "\"" + mtxDirectory + "mkvmerge\" -o \"" + outputDirectory+newFilename + ".mkv\"";
 #else
-			MtxCommandString = mtxDirectory + "mkvmerge -o " + outputDirectory+newFilename + ".mkv";
+			MtxCommandString = mtxDirectory + "mkvmerge -o \"" + outputDirectory+newFilename + ".mkv\"";
 #endif
 
 			if (aVobParser != NULL)
@@ -670,7 +670,7 @@
 
 				m_txtDemuxLog->AppendText("Processing " + newFilename + "\n");
 
-				wxString MtxCommandStringTemp = " --track-name 0:\"video\" --timecodes 0:" + outputDirectory+newFilename + "_m2v.tmc " + outputDirectory+newFilename + ".m2v";
+				wxString MtxCommandStringTemp = " --track-name 0:\"video\" --timecodes 0:\"" + outputDirectory+newFilename + "_m2v.tmc\" \"" + outputDirectory+newFilename + ".m2v\"";
 
 				Writer * _muxer = new VideoDemuxWriter(outputDirectory + newFilename, _fps);
 				if (!demuxer.AddDemuxer(VIDEO_STREAM, _muxer, MtxCommandStringTemp))
@@ -701,11 +701,11 @@
 							MtxTempString += newFilename+_langName + "\" --language 0:";
 							MtxTempString += wxString::Format("%c%c", _attr->lang_code >> 8, _attr->lang_code & 0xFF);
 						}
-						MtxTempString += " --timecodes 0:" + outputDirectory+newFilename+_langName;
+						MtxTempString += " --timecodes 0:\"" + outputDirectory+newFilename+_langName;
 						switch (_audioTracks[_stream]->audio_format)
 						{
 						case 0:
-							MtxTempString += "_ac3.tmc " + outputDirectory+newFilename+_langName + ".ac3";
+							MtxTempString += "_ac3.tmc\" \"" + outputDirectory+newFilename+_langName + ".ac3\"";
 							_muxer = new AC3DemuxWriter(outputDirectory + newFilename+_langName, 0x80 + _ID);
 							if (!demuxer.AddDemuxer(SUBSTREAM_AC3_LOW + _ID, _muxer, MtxTempString))
 								delete _muxer;
@@ -713,7 +713,7 @@
 
 						case 2:
 						case 3:
-							MtxTempString += "_mpa.tmc " + outputDirectory+newFilename+_langName + ".mpa";
+							MtxTempString += "_mpa.tmc\" \"" + outputDirectory+newFilename+_langName + ".mpa\"";
 							_muxer = new MPADemuxWriter(outputDirectory + newFilename+_langName, 0xC0 + _ID);
 							if (!demuxer.AddDemuxer(AUDIO_STREAM + _ID, _muxer, MtxTempString))
 								delete _muxer;
@@ -721,14 +721,14 @@
 
 						case 4:
 							// TODO possibly other LPCM formats ?
-							MtxTempString += "_wav.tmc " + outputDirectory+newFilename+_langName + ".wav";
+							MtxTempString += "_wav.tmc\" " + outputDirectory+newFilename+_langName + ".wav\"";
 							_muxer = new LPCMDemuxWriter(outputDirectory + newFilename+_langName, 0xA0 + _ID, 48000, 16, 2);
 							if (!demuxer.AddDemuxer(SUBSTREAM_PCM_LOW + _ID, _muxer, MtxTempString))
 								delete _muxer;
 							break;
 
 						case 6:
-							MtxTempString += "_dts.tmc " + outputDirectory+newFilename+_langName + ".dts";
+							MtxTempString += "_dts.tmc\" \"" + outputDirectory+newFilename+_langName + ".dts\"";
 							_muxer = new DTSDemuxWriter(outputDirectory + newFilename+_langName, 0x88 + _ID);
 							if (!demuxer.AddDemuxer(SUBSTREAM_DTS_LOW + _ID, _muxer, MtxTempString))
 								delete _muxer;
@@ -757,22 +757,22 @@
 							if (_attr->lang_code == 0)
 							{
 								_langName = wxString::Format("_%d_un", _IDs.Item(_IDidx));
-								MtxTempString += 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 += newFilename+_langName + "\" --language 0:";
-								MtxTempString += wxString::Format("%c%c ", _attr->lang_code >> 8, _attr->lang_code & 0xFF);
+								MtxTempString += wxString::Format("%c%c \"", _attr->lang_code >> 8, _attr->lang_code & 0xFF);
 							}
-							MtxTempString += outputDirectory+newFilename+_langName + ".idx";
+							MtxTempString += outputDirectory+newFilename+_langName + ".idx\"";
 							_muxer = new SubDemuxWriter(outputDirectory + newFilename+_langName, 0x20 + _IDs.Item(_IDidx), _width, _height, _palette, _attr->lang_code, _attr->lang_extension == 9);
 							if (!demuxer.AddDemuxer(SUBSTREAM_SUB_LOW + _IDs.Item(_IDidx), _muxer, MtxTempString))
 								delete _muxer;
 						}
 					}
 					// create a possible button demuxer too
-					MtxCommandStringTemp = " --track-name 0:\"btn-" + newFilename + "\" --timecodes 0:" + outputDirectory+newFilename + "_btn.tmc " + outputDirectory+newFilename + ".btn";
+					MtxCommandStringTemp = " --track-name 0:\"btn-" + newFilename + "\" --timecodes 0:\"" + outputDirectory+newFilename + "_btn.tmc\" \"" + outputDirectory+newFilename + ".btn\"";
 					_muxer = new BtnDemuxWriter(outputDirectory + newFilename, _width, _height);
 					if (!demuxer.AddDemuxer(SUBSTREAM_PCI, _muxer, MtxCommandStringTemp))
 						delete _muxer;
@@ -812,8 +812,8 @@
 
 			if (addChapters)
 			{
-				MtxCommandString += " --chapters " + outputDirectory+newFilename + ChapterSuffix;
-				MtxCommandString += " --segmentinfo " + outputDirectory+newFilename + InfoSuffix;
+				MtxCommandString += " --chapters \"" + outputDirectory+newFilename + ChapterSuffix + "\"";
+				MtxCommandString += " --segmentinfo \"" + outputDirectory+newFilename + InfoSuffix + "\"";
 			}
 
 			MtxCommandFile.Write(MtxCommandString);

Modified: trunk/DvdMenuXtractor/MyWizard.cpp
===================================================================
--- trunk/DvdMenuXtractor/MyWizard.cpp	2005-04-11 13:11:34 UTC (rev 1131)
+++ trunk/DvdMenuXtractor/MyWizard.cpp	2005-04-12 18:51:07 UTC (rev 1132)
@@ -227,7 +227,7 @@
     {
         m_page->BeforeHide();
         m_page->Hide();
-#if (wxMAJOR_VERSION >= 2) && (xwMINOR_VERSION < 5 )
+#if (wxMAJOR_VERSION >= 2) && (wxMINOR_VERSION < 5 )
         sizer->Remove(m_page);
 #else
         sizer->Detach(m_page);