ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/s10k/Vago/soundWizard/soundpagefinal.cpp
(Generate patch)

Comparing Vago/trunk/Vago/soundWizard/soundpagefinal.cpp (file contents):
Revision 790 by s10k, Sat Apr 6 20:54:26 2013 UTC vs.
Revision 1035 by s10k, Thu Mar 24 22:28:41 2016 UTC

# Line 1 | Line 1
1   #include "soundpagefinal.h"
2   #include "ui_soundpagefinal.h"
3  
4 < SoundPageFinal::SoundPageFinal(QString soundsLocation, DropTableWidget *page2Table, Logger *myLogger, QHash<QString, QString> *commandMap, QWidget *parent) :
4 > SoundPageFinal::SoundPageFinal(QString AppDir, QString soundsLocation, DropTableWidget *page2Table, Logger *myLogger, QHash<QString, QString> *commandMap, QWidget *parent) :
5      QWizardPage(parent),
6      ui(new Ui::soundpagefinal)
7   {
# Line 13 | Line 13 | SoundPageFinal::SoundPageFinal(QString s
13  
14      this->xmlCommands = new QStringList();
15      this->oniSplitCommands = new QStringList();
16 <    this->myXmlProcessor = new XmlProcessor(this->myLogger,this->xmlCommands);
17 <    this->myConverter = new Converter(this->myLogger,this->oniSplitCommands);
16 >    this->myXmlProcessor = new XmlProcessor(AppDir, this->myLogger,this->xmlCommands);
17 >    this->myConverter = new Converter(AppDir, this->myLogger,this->oniSplitCommands);
18  
19      ui->lbComplete->setText("<html>The wizard is now complete. The sounds have been converted. "
20                              "You can view all converted files clicking <a href=' '>here.</a><br />"
# Line 196 | Line 196 | void SoundPageFinal::startProcessing(){
196  
197      for(int i=0; i<this->page2Table->rowCount(); i++){
198  
199 <        (*this->oniSplitCommands) << this->commandMap->value("general->XML->ONI")+" "+outputFolder+" "+Util::insertQuotes(this->page2Table->item(i,1)->text()); // add location of sound file to convert
199 >        (*this->oniSplitCommands) << this->commandMap->value("xml->XML->ONI")+" "+outputFolder+" "+Util::insertQuotes(this->page2Table->item(i,1)->text()); // add location of sound file to convert
200  
201          currFileName=this->page2Table->item(i,0)->text(); // get current file name
202          currAmbFileLocation = QString(ambFileLocation).replace("sample_file",currFileName); // get the new files, filenames
# Line 212 | Line 212 | void SoundPageFinal::startProcessing(){
212          myXmlProcessor->wait(); // Wait until all xml is edited
213      }
214  
215 <    (*this->oniSplitCommands) << this->commandMap->value("general->XML->ONI")+" "+outputFolder+" "+Util::insertQuotes(GlobalVars::VagoTemporaryDir+"/*.xml");
215 >    (*this->oniSplitCommands) << this->commandMap->value("xml->XML->ONI")+" "+outputFolder+" "+Util::insertQuotes(GlobalVars::VagoTemporaryDir+"/*.xml");
216  
217      this->myConverter->start(); // finally process the onisplit commands
218      this->myConverter->wait(); // wait for it to complete

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)