[Wired-commits] wired/src/gui MainWindow.cpp,1.66,1.67

[Pierre-Jean L. <pj-...@us...>]

Update of /cvsroot/wired/wired/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8744/src/gui

Modified Files:
	MainWindow.cpp 
Log Message:
Removed Progressbar while  exporting to wave + some bug fix on exiting

Index: MainWindow.cpp
===================================================================
RCS file: /cvsroot/wired/wired/src/gui/MainWindow.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** MainWindow.cpp	23 Oct 2005 22:54:22 -0000	1.66
--- MainWindow.cpp	25 Oct 2005 19:45:09 -0000	1.67
***************
*** 204,210 ****
    FileMenu->Append(MainWin_Quit, "&Quit");
  
-   //  EditMenu->Append(MainWin_Undo, "U&ndo\tCtrl+Z");
-   //EditMenu->Append(MainWin_Redo, "&Redo\tShift+Ctrl+Z");
-   //EditMenu->Append(MainWin_History, "History", HistoryMenu);
  
    EditMenu->AppendSeparator();
--- 204,207 ----
***************
*** 255,262 ****
    RackPanel = new Rack(split, -1, wxPoint(0, 0), wxSize(800, 250));
  
!   cout << "1111" << endl;  
      
    SeqPanel = new SequencerGui(split, wxPoint(0, 254), wxSize(800, 200));
!   cout << "2222" << endl;  
  
    //  OptPanel = new OptionPanel(this, wxPoint(306, 452), wxSize(470, 150), wxSIMPLE_BORDER);
--- 252,259 ----
    RackPanel = new Rack(split, -1, wxPoint(0, 0), wxSize(800, 250));
  
!   cout << "Known warning ...." << endl;  
      
    SeqPanel = new SequencerGui(split, wxPoint(0, 254), wxSize(800, 200));
!   cout << "done :-)" << endl;  
  
    //  OptPanel = new OptionPanel(this, wxPoint(306, 452), wxSize(470, 150), wxSIMPLE_BORDER);
***************
*** 337,342 ****
  	if (FileConverter->Init(&info, string(CurrentXmlSession->GetAudioDir()), (unsigned long) Audio->SamplesPerBuffer, this) == false)
  		cout << "[MAINWIN] Create file converter thread failed !" << endl; 
- //	if (FileConverter->Run() != wxTHREAD_NO_ERROR)
- //		cout << "[MAINWIN] Run file converter thread failed !" << endl; 
  }
  
--- 334,337 ----
***************
*** 347,369 ****
  	EditMenu->Enable(MainWin_Undo, false);
  	EditMenu->Enable(MainWin_Redo, false);
- 	//	EditMenu->Connect(wxEVT_MENU_OPEN, (wxObjectEventFunction) (wxEventFunction)
- 	//					(wxMenuEventFunction) &MainWindow::OnEditMenuOpen);
- //	Connect(MainWin_ImportWave, wxEVT_COMMAND_MENU_SELECTED, 
- //	  (wxObjectEventFunction)(wxEventFunction) 
- //	  (wxCommandEventFunction)&MainWindow::OnImportWave);
- //	EditMenu->Append(424242, "Just a try");
- //	Connect(424242, wxEVT_COMMAND_MENU_SELECTED, 
- //		      (wxObjectEventFunction)(wxEventFunction) 
- //		      (wxCommandEventFunction)&MainWindow::OnUndo);
- //	UndoMenu->Connect(wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction)(wxEventFunction) 
- //		      (wxCommandEventFunction)&MainWindow::OnUndo);
- //	RedoMenu->Connect(wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction)(wxEventFunction) 
- //		      (wxCommandEventFunction)&MainWindow::OnRedo);
- 	//UndoMenu->Connect();
- //	EditMenu->Connect(wxEVT_CONTEXT_MENU, (wxObjectEventFunction) (wxEventFunction)
- //						(wxContextMenuEventFunction) &MainWindow::OnMenuOpen);
- //	EditMenu->Connect(wxEVT_MENU_HIGHLIGHT, (wxObjectEventFunction) (wxEventFunction)
- //						 (wxMenuEventFunction) &MainWindow::OnMenuOpen);
- 
  }
  
--- 342,345 ----
***************
*** 403,406 ****
--- 379,383 ----
  	    }*/
  
+   WiredSettings->Save();
    cout << "[MAINWIN] Unloading shared libraries..."<< endl;
    for (k = LoadedPluginsList.begin(); k != LoadedPluginsList.end(); k++)
***************
*** 408,422 ****
      
    cout << "[MAINWIN] Unloading external plugins..." << endl;
!   Seq->Delete();
!   delete Seq;
!   delete LoadedExternalPlugins;
    
!   FileConverter->Stop();
!   delete FileConverter;
!   delete Audio;
!   MidiEngine->Delete();
!   delete MidiEngine;
!   WiredSettings->Save();
!   delete WiredSettings;
    cout << "[MAINWIN] Closing..."<< endl; 
    exit(0);
--- 385,410 ----
      
    cout << "[MAINWIN] Unloading external plugins..." << endl;
!   if (Seq)
!   {
! 	  Seq->Delete();
! 	  delete Seq;
!   }
!   if (LoadedExternalPlugins)
! 	  delete LoadedExternalPlugins;
    
!   if(FileConverter)
!   {
! 	  //FileConverter->Stop();
!     delete FileConverter;
!   }
!   if (Audio)
! 	  delete Audio;
!   if (MidiEngine)
! 	{
!   	MidiEngine->Delete();
! 	  delete MidiEngine;
! 	}
!   if (WiredSettings)
! 	  delete WiredSettings;
    cout << "[MAINWIN] Closing..."<< endl; 
    exit(0);
***************
*** 765,776 ****
        }
  
!       wxProgressDialog *Progress = new wxProgressDialog("Exporting mix", "Please wait...", 
! 						       (int)Seq->EndLoopPos * 1000, this, 
! 						       wxPD_CAN_ABORT | wxPD_REMAINING_TIME);
        bool done = false;
  
        while (!done)
  	{
! 	  Progress->Update((int) Seq->CurrentPos * 1000);
  	  //cout << "pos: " << Seq->CurrentPos << "; end: " << Seq->EndLoopPos << endl;
  	  wxMilliSleep(50);
--- 753,764 ----
        }
  
!       //wxProgressDialog Progress("Exporting mix", "Please wait...", 
! 	//					       (int)Seq->EndLoopPos * 1000, this, 
! 		//				       wxPD_CAN_ABORT | wxPD_REMAINING_TIME);
        bool done = false;
  
        while (!done)
  	{
! 	  //Progress.Update((int) Seq->CurrentPos * 1000);
  	  //cout << "pos: " << Seq->CurrentPos << "; end: " << Seq->EndLoopPos << endl;
  	  wxMilliSleep(50);
***************
*** 780,784 ****
  	  //SeqMutex.Unlock();
  	}
- //      delete Progress;
      }
    else
--- 768,771 ----