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

Remere at users.sourceforge.net Remere at users.sourceforge.net
Wed Aug 5 02:33:37 CEST 2009


Revision: 43061
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43061&view=rev
Author:   Remere
Date:     2009-08-05 00:33:36 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
*compress_touche now takes an input file instead of input directory (filename is ignored, directory contents are checked instead).
*Spelling fix.

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/compress_gob.cpp
    tools/branches/gsoc2009-gui/compress_touche.cpp
    tools/branches/gsoc2009-gui/compress_touche.h

Modified: tools/branches/gsoc2009-gui/compress_gob.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_gob.cpp	2009-08-05 00:32:23 UTC (rev 43060)
+++ tools/branches/gsoc2009-gui/compress_gob.cpp	2009-08-05 00:33:36 UTC (rev 43061)
@@ -43,7 +43,7 @@
 	input.format = "*.stk";
 	_inputPaths.push_back(input);
 
-	_shorthelp = "Compresses Gobliiins! files data files.";
+	_shorthelp = "Compresses Gobliiins! data files.";
 	_helptext = 
 		"\nUsage: " + getName() + " [-f] [-o <output> = out.stk] <conf file>\n"
 		"<conf file> is a .gob file generated extract_gob_stk\n"

Modified: tools/branches/gsoc2009-gui/compress_touche.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_touche.cpp	2009-08-05 00:32:23 UTC (rev 43060)
+++ tools/branches/gsoc2009-gui/compress_touche.cpp	2009-08-05 00:33:36 UTC (rev 43061)
@@ -46,9 +46,20 @@
 	_inputPaths.push_back(input);
 
 	_shorthelp = "Used to compress Touche speech files (Vxxx and OBJ).";
-	_helptext = "\nUsage: " + getName() + " [params] [-o outputfile TOUCHE.*] <inputdir>\n* differs with compression type.\n";
+	_helptext = "\nUsage: " + getName() + " [params] [-o outputfile TOUCHE.*] <inputdir>\n* differs with compression type.\n" + _shorthelp + "\n";
 }
 
+InspectionMatch CompressTouche::inspectInput(const Filename &filename) {
+	// We don't care for the actual file, just what's in this directory
+	Filename probe(filename);
+
+	probe.setFullName("TOUCHE.DAT");
+	if (probe.exists())
+		return IMATCH_PERFECT;
+
+	return IMATCH_AWFUL;
+}
+
 uint32 CompressTouche::compress_sound_data_file(uint32 current_offset, File &output, File &input, uint32 *offs_table, uint32 *size_table, int len) {
 	int i, size;
 	uint8 buf[2048];

Modified: tools/branches/gsoc2009-gui/compress_touche.h
===================================================================
--- tools/branches/gsoc2009-gui/compress_touche.h	2009-08-05 00:32:23 UTC (rev 43060)
+++ tools/branches/gsoc2009-gui/compress_touche.h	2009-08-05 00:33:36 UTC (rev 43061)
@@ -31,6 +31,8 @@
 
 	virtual void execute();
 
+	virtual InspectionMatch inspectInput(const Filename &filename);
+
 protected:
 
 	uint32 compress_sound_data_file(uint32 current_offset, File &output, File &input, uint32 *offs_table, uint32 *size_table, int len);


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




More information about the Scummvm-git-logs mailing list