[matroska] r889 - trunk/DvdMenuXtractor

Author: robux4
Date: 2004-10-17 18:20:25 +0400 (Sun, 17 Oct 2004)
New Revision: 889

Modified:
   trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
Log:
code factorisation
better output messages

Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2004-10-17 13:48:22 UTC (rev 888)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2004-10-17 14:20:25 UTC (rev 889)
@@ -63,6 +63,12 @@
 
 IFOFile* IfoFile = NULL;
 wxLogWindow* wxLogWin;
+wxString m2vDirectory;
+wxString ac3Directory;
+wxString subDirectory;
+wxString bmpDirectory;
+wxString wavDirectory;
+wxString maskDirectory;
 const wxString APPLICATION_NAME = "DVDMenu-X-tractor";
 
 // ----------------------------------------------------------------------------
@@ -524,29 +530,9 @@
 
     void SplitAndDemux(VobParser & aVobParser)
     {
-        wxFileConfig *pConfig = (wxFileConfig *)wxConfigBase::Get();
         CompositeDemuxWriter *demuxer = NULL;
         wxString newFilename;
 
-        // Create m2v directory
-        wxString m2vDirectory = pConfig->Read("OutputDirectory","")+ "m2v" + wxFILE_SEP_PATH;
-        wxMkdir(m2vDirectory);
-        // Create ac3 directory
-        wxString ac3Directory = pConfig->Read("OutputDirectory","")+ "ac3" + wxFILE_SEP_PATH;
-        wxMkdir(ac3Directory);
-        // Create sub directory
-        wxString subDirectory = pConfig->Read("OutputDirectory","")+ "sub" + wxFILE_SEP_PATH;
-        wxMkdir(subDirectory);
-        // Create bmp directory
-        wxString bmpDirectory = pConfig->Read("OutputDirectory","")+ "bmp" + wxFILE_SEP_PATH;
-        wxMkdir(bmpDirectory);
-		// Create wav directory
-        wxString wavDirectory = pConfig->Read("OutputDirectory","")+ "wav" + wxFILE_SEP_PATH;
-        wxMkdir(wavDirectory);
-		// Create mask directory
-		wxString maskDirectory = pConfig->Read("OutputDirectory","") + "mask" + wxFILE_SEP_PATH;
-		wxMkdir(maskDirectory);
-
 		aVobParser.Reset();
 		
 		// TODO, build VOB map & extract only real data for each cell
@@ -598,10 +584,6 @@
 		const CellsListType *CellsList = IfoFile->GetCellsList();
 		int i;			
 		wxFileConfig *pConfig = (wxFileConfig *)wxConfigBase::Get();
-        // Get m2v directory
-        wxString m2vDirectory = pConfig->Read("OutputDirectory","")+ "m2v" + wxFILE_SEP_PATH;
-        // Get bmp directory
-        wxString bmpDirectory = pConfig->Read("OutputDirectory","") + "bmp" + wxFILE_SEP_PATH;
 
 		m_gaDemuxProgress->SetValue(0);
 		m_gaDemuxProgress->SetRange(CellsList->GetCount());
@@ -636,10 +618,6 @@
 		const CellsListType *CellsList = IfoFile->GetCellsList();
 		int i;			
 		wxFileConfig *pConfig = (wxFileConfig *)wxConfigBase::Get();
-        // Get ac3 directory
-        wxString ac3Directory = pConfig->Read("OutputDirectory","")+ "ac3" + wxFILE_SEP_PATH;
-        // Get wav directory
-        wxString wavDirectory = pConfig->Read("OutputDirectory","") + "wav" + wxFILE_SEP_PATH;
 
 		m_gaDemuxProgress->SetValue(0);
 		m_gaDemuxProgress->SetRange(CellsList->GetCount());
@@ -675,10 +653,6 @@
 		const CellsListType *CellsList = IfoFile->GetCellsList();
 		int i;			
 		wxFileConfig *pConfig = (wxFileConfig *)wxConfigBase::Get();
-        // Get sub directory
-        wxString subDirectory = pConfig->Read("OutputDirectory","")+ "sub" + wxFILE_SEP_PATH;
-        // Get mask directory
-        wxString maskDirectory = pConfig->Read("OutputDirectory","") + "mask" + wxFILE_SEP_PATH;
 		
 		m_gaDemuxProgress->SetValue(0);
 		m_gaDemuxProgress->SetRange(CellsList->GetCount());
@@ -1204,20 +1178,53 @@
         }
 	}
 
+	void CreatDirectories() 
+	{
+        wxFileConfig *pConfig = (wxFileConfig *)wxConfigBase::Get();
+
+	    // Create m2v directory
+        wxString m2vDirectory = pConfig->Read("OutputDirectory","")+ "m2v" + wxFILE_SEP_PATH;
+        wxMkdir(m2vDirectory);
+        // Create ac3 directory
+        wxString ac3Directory = pConfig->Read("OutputDirectory","")+ "ac3" + wxFILE_SEP_PATH;
+        wxMkdir(ac3Directory);
+        // Create sub directory
+        wxString subDirectory = pConfig->Read("OutputDirectory","")+ "sub" + wxFILE_SEP_PATH;
+        wxMkdir(subDirectory);
+        // Create bmp directory
+        wxString bmpDirectory = pConfig->Read("OutputDirectory","")+ "bmp" + wxFILE_SEP_PATH;
+        wxMkdir(bmpDirectory);
+		// Create wav directory
+        wxString wavDirectory = pConfig->Read("OutputDirectory","")+ "wav" + wxFILE_SEP_PATH;
+        wxMkdir(wavDirectory);
+		// Create mask directory
+		wxString maskDirectory = pConfig->Read("OutputDirectory","") + "mask" + wxFILE_SEP_PATH;
+        wxMkdir(maskDirectory);
+	}
+
    virtual void AfterShow(void)
    {
 		const int NbsStep = 4;
-		int Step = 1;
-		wxString StepString = "", StepStringFormat = "Step %d/%d : %s...";
+		wxString StepString, StepStringFormat = "Step %d/%d : %s...";
 		
 		m_OperationInProgress = TRUE;
-		StepString = StepString.Format(StepStringFormat, Step++, NbsStep, "Building vob map");
-		m_lbStep->SetLabel(StepString);
-		m_txtDemuxLog->AppendText(StepString+"\n");
-		m_lbStep->Update();
+
+		m_txtDemuxLog->AppendText("Creating output directories\n");
+
+		CreatDirectories();
+
 		for (int16_t title = 0; title <= IfoFile->NumberOfTitles(); title++)
 		{
+			m_txtDemuxLog->AppendText(wxString::Format("         Treating title %d VOB file(s)\n", title));
+
+			int Step = 1;
+
+			StepString = StepString.Format(StepStringFormat, Step++, NbsStep, "Building vob map");
+			m_lbStep->SetLabel(StepString);
+			m_txtDemuxLog->AppendText(StepString+"\n");
+			m_lbStep->Update();
 			VobParser *aVobParser = BuildVobMap(title);
+
 			if (aVobParser != NULL)
 			{
 				StepString = StepString.Format(StepStringFormat, Step++, NbsStep, "Splitting and demuxing");