[Scummvm-cvs-logs] SF.net SVN: scummvm:[42160] tools/branches/gsoc2009-gui

[Remere at users.sourceforge.net]

Revision: 42160
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42160&view=rev
Author:   Remere
Date:     2009-07-05 23:38:11 +0000 (Sun, 05 Jul 2009)

Log Message:
-----------
*Made text messages clearer.
*Audio format specs are now passed to the tool when run.
*Fixed compress_agos outputting to a file, not a directory.

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/compress_agos.cpp
    tools/branches/gsoc2009-gui/gui/pages.cpp
    tools/branches/gsoc2009-gui/gui/tools.cpp
    tools/branches/gsoc2009-gui/gui/tools.h

Modified: tools/branches/gsoc2009-gui/compress_agos.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_agos.cpp	2009-07-05 22:58:06 UTC (rev 42159)
+++ tools/branches/gsoc2009-gui/compress_agos.cpp	2009-07-05 23:38:11 UTC (rev 42160)
@@ -29,7 +29,9 @@
 	_compMode = AUDIO_MP3;
 	_convertMac = false;
 
-	_helptext = "\nUsage: %s [mode] [mode params] [--mac] <infile>\n" kCompressionAudioHelp
+	_outputToDirectory = false;
+
+	_helptext = "\nUsage: %s [mode params] [--mac] [-o outfile] <infile>\n" kCompressionAudioHelp
 }
 
 void CompressAgos::end() {
@@ -206,7 +208,6 @@
 }
 
 void CompressAgos::execute() {
-
 	// We only got one input file
 	if (_inputPaths.size() > 1)
 		error("Only one input file expected!");

Modified: tools/branches/gsoc2009-gui/gui/pages.cpp
===================================================================
--- tools/branches/gsoc2009-gui/gui/pages.cpp	2009-07-05 22:58:06 UTC (rev 42159)
+++ tools/branches/gsoc2009-gui/gui/pages.cpp	2009-07-05 23:38:11 UTC (rev 42160)
@@ -409,7 +409,7 @@
 }
 
 void ChooseInOutPage::onNext(wxWindow *panel) {
-	if (_configuration.compressing)
+	if (_configuration.selectedTool->_type == TOOLTYPE_COMPRESSION)
 		switchPage(new ChooseAudioFormatPage(_topframe));
 	else
 		switchPage(new ProcessPage(_topframe));
@@ -430,7 +430,7 @@
 	sizer->AddSpacer(15);
 
 	sizer->Add(new wxStaticText(panel, wxID_ANY, 
-		wxT("Please select for what game/engine you'd like to extract files from.")));
+		wxT("Select audio format you want to compress to")));
 	
 	wxArrayString choices;
 
@@ -877,6 +877,10 @@
 void ProcessPage::runTool() {
 	const ToolGUI *tool = _topframe->_configuration.selectedTool;
 
+	// Write some text that we've started...
+	_outwin->WriteText(wxT("Running ") + tool->_name + wxT("\n\n"));
+
+	// Child thread to run the tool
 	_thread = new ProcessToolThread(tool, _topframe->_configuration, _output);
 
 	// We should check return value of this
@@ -972,7 +976,11 @@
 
 	sizer->AddSpacer(15);
 
-	wxString text = wxT("You have finished the wizard! Your files should now be extracted or compressed.");
+	wxString text;
+	if(_topframe->_configuration.selectedTool->_type == TOOLTYPE_COMPRESSION)
+		text = wxT("You have finished the wizard! Your files should now be compressed.");
+	else
+		text = wxT("You have finished the wizard! Your files should now be extracted.");
 	sizer->Add(new wxStaticText(panel, wxID_ANY, text));
 
 	sizer->AddSpacer(10);

Modified: tools/branches/gsoc2009-gui/gui/tools.cpp
===================================================================
--- tools/branches/gsoc2009-gui/gui/tools.cpp	2009-07-05 22:58:06 UTC (rev 42159)
+++ tools/branches/gsoc2009-gui/gui/tools.cpp	2009-07-05 23:38:11 UTC (rev 42160)
@@ -282,6 +282,28 @@
 		_backend->_inputPaths.push_back((const char *)iter->mb_str());
 	_backend->_outputPath = std::string(conf.outputPath.mb_str());
 
+	CompressionTool *compression = dynamic_cast<CompressionTool *>(_backend);
+	if(compression) {
+		// mp3
+		compression->_mp3ABRBitrate        = (const char *)conf.mp3ABRBitrate.mb_str();
+		compression->_mp3CompressionType   = (const char *)conf.mp3CompressionType.mb_str();
+		compression->_mp3MpegQuality       = (const char *)conf.mp3MpegQuality.mb_str();
+		compression->_mp3ABRBitrate        = (const char *)conf.mp3ABRBitrate.mb_str();
+		compression->_mp3VBRMinBitrate     = (const char *)conf.mp3VBRMinBitrate.mb_str();
+		compression->_mp3VBRMaxBitrate     = (const char *)conf.mp3VBRMaxBitrate.mb_str();
+		compression->_mp3VBRQuality        = (const char *)conf.mp3VBRQuality.mb_str();
+
+		// flac
+		compression->_flacCompressionLevel = (const char *)conf.flacCompressionLevel.mb_str();
+		compression->_flacBlockSize        = (const char *)conf.flacBlockSize.mb_str();
+		
+		// vorbis
+		compression->_oggQuality           = (const char *)conf.oggQuality.mb_str();
+		compression->_oggMinBitrate        = (const char *)conf.oggMinBitrate.mb_str();
+		compression->_oggAvgBitrate        = (const char *)conf.oggAvgBitrate.mb_str();
+		compression->_oggMaxBitrate        = (const char *)conf.oggMaxBitrate.mb_str();
+	}
+
 	_backend->run();
 }
 

Modified: tools/branches/gsoc2009-gui/gui/tools.h
===================================================================
--- tools/branches/gsoc2009-gui/gui/tools.h	2009-07-05 22:58:06 UTC (rev 42159)
+++ tools/branches/gsoc2009-gui/gui/tools.h	2009-07-05 23:38:11 UTC (rev 42160)
@@ -68,6 +68,8 @@
  * @todo Add some way to represent extra arguments to the tool
  */
 class ToolGUI {
+	// Block copy-construction
+	ToolGUI(const ToolGUI &);
 public:
 	ToolGUI();
 	/**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.