[Scummvm-cvs-logs] CVS: tools Makefile,1.21,1.22 descumm.h,1.8,1.9 extract.c,1.27,1.28 extract.h,1.1,1.2 simon2mp3.c,1.15,1.16 util.h,1.1,1.2

[Max Horn]

Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv7290

Modified Files:
	Makefile descumm.h extract.c extract.h simon2mp3.c util.h 
Log Message:
more refactoring

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/tools/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Makefile	9 Nov 2003 12:56:40 -0000	1.21
+++ Makefile	9 Nov 2003 13:08:02 -0000	1.22
@@ -29,7 +29,7 @@
 descumm$(EXEEXT): descumm-tool.o descumm.o descumm6.o descumm-common.o
 	$(CXX) $(LFLAGS) -o $@ $+
 
-extract$(EXEEXT): extract.o
+extract$(EXEEXT): extract.o extract-common.o
 	$(CC) $(LFLAGS) -o $@ $+
 
 mm_nes_extract$(EXEEXT): mm_nes_extract.o
@@ -44,12 +44,12 @@
 simon1decr$(EXEEXT): simon1decr.o
 	$(CC) $(LFLAGS) -o $@ $+
 
-simon2mp3$(EXEEXT): simon2mp3.o
+simon2mp3$(EXEEXT): simon2mp3.o extract-common.o
 	$(CC) $(LFLAGS) -o $@ $+
 
 
 descumm.o descumm6.o descumm-common.o descumm-tool.o: descumm.h util.h
-extract.o simon2mp3.o: util.h extract.h
+extract.o simon2mp3.o extract-common.o: util.h extract.h
 
 clean:
 	rm -f *.o $(TARGETS)

Index: descumm.h
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- descumm.h	9 Nov 2003 12:55:38 -0000	1.8
+++ descumm.h	9 Nov 2003 13:08:02 -0000	1.9
@@ -25,6 +25,7 @@
 
 #include "util.h"
 
+typedef unsigned int uint;
 
 //
 // The block stack records jump instructions

Index: extract.c
===================================================================
RCS file: /cvsroot/scummvm/tools/extract.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- extract.c	9 Nov 2003 12:55:39 -0000	1.27
+++ extract.c	9 Nov 2003 13:08:02 -0000	1.28
@@ -19,10 +19,8 @@
  *
  */
 
-#include "util.h"
 #include "extract.h"
 
-FILE *input, *output_idx, *output_snd;
 
 char f_hdr[] = {
 	'S', 'O', 'U', ' ', 0, 0, 0, 0, 0
@@ -37,26 +35,6 @@
 	' ', 'F', 'i', 'l', 'e', 0x1a, 0x1a, 0x00, 0x0A, 0x01, 0x29, 0x11
 };
 
-struct lameparams {
-	uint32 minBitr;
-	uint32 maxBitr; 
-	uint32 abr;
-	uint32 vbr;
-	uint32 algqual;
-	uint32 vbrqual;
-	uint32 silent;
-} encparms = { minBitrDef, maxBitrDef, abrDef, vbrDef, algqualDef, vbrqualDef, 0 };
-
-struct oggencparams {
-	int nominalBitr;
-	int minBitr;
-	int maxBitr;
-	int quality;
-	int silent;
-} oggparms = { -1, -1, -1, oggqualDef, 0 };
-
-int oggmode = 0;
-
 void put_int(uint32 val);
 
 #define OUTPUT_MP3	"monster.so3"
@@ -320,95 +298,6 @@
 	printf("\n\nIf a parameter is not given the default value is used\n");
 	printf("If using VBR mode for MP3 -b and -B must be multiples of 8; the maximum is 160!\n");
 	exit(2);
-}
-
-void process_mp3_parms(int argc, char *argv[], int i) {
-	for(; i < argc; i++) {
-		if (strcmp(argv[i], "--vbr") == 0) {
-			encparms.vbr=1;
-			encparms.abr=0;
-		} else if (strcmp(argv[i], "--abr") == 0) {
-			encparms.vbr=0;
-			encparms.abr=1;
-		} else if (strcmp(argv[i], "-b") == 0) {
-			encparms.minBitr = atoi(argv[i + 1]);
-			if ((encparms.minBitr % 8) != 0)
-				encparms.minBitr -= encparms.minBitr % 8;
-			if (encparms.minBitr >160)
-				encparms.minBitr = 160;
-			if (encparms.minBitr < 8)
-				encparms.minBitr=8;
-			i++;
-		} else if (strcmp(argv[i], "-B") == 0) {
-			encparms.maxBitr = atoi(argv[i + 1]);
-			if ((encparms.maxBitr % 8) != 0)
-				encparms.maxBitr -= encparms.maxBitr % 8;
-			if (encparms.maxBitr > 160)
-				encparms.maxBitr = 160;
-			if (encparms.maxBitr < 8)
-				encparms.maxBitr = 8;
-			i++;
-		} else if (strcmp(argv[i], "-V") == 0) {
-			encparms.vbrqual = atoi(argv[i + 1]);
-			if(encparms.vbrqual < 0)
-				encparms.vbrqual = 0;
-			if(encparms.vbrqual > 9)
-				encparms.vbrqual = 9;
-			i++;
-		} else if (strcmp(argv[i], "-q") == 0) {
-			encparms.algqual = atoi(argv[i + 1]);
-			if (encparms.algqual < 0)
-				encparms.algqual = 0;
-			if (encparms.algqual > 9)
-				encparms.algqual = 9;
-			i++;
-		} else if (strcmp(argv[i], "--silent") == 0) {
-			encparms.silent = 1;
-		} else if (strcmp(argv[i], "--help") == 0) {
-			showhelp(argv[0]);
-		} else if (argv[i][0] == '-') {
-			showhelp(argv[0]);
-		} else {
-			break;
-		}
-	}
-	if (i != (argc - 1)) {
-		showhelp(argv[0]);
-	}
-}
-
-void process_ogg_parms(int argc, char *argv[], int i) {
-	for (; i < argc; i++) {
-		if (strcmp(argv[i], "-b") == 0) {
-			oggparms.nominalBitr = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (strcmp(argv[i], "-m") == 0) {
-			oggparms.minBitr = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (strcmp(argv[i], "-M") == 0) {
-			oggparms.maxBitr = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (strcmp(argv[i], "-q") == 0) {
-			oggparms.quality = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (strcmp(argv[i], "--silent") == 0) {
-			oggparms.silent = 1;
-		}
-		else if (strcmp(argv[i], "--help") == 0) {
-			showhelp(argv[0]);
-		}
-		else if (argv[i][0] == '-') {
-			showhelp(argv[0]);
-		}
-		else
-			break;
-	}
-	if (i != argc - 1)
-		showhelp(argv[0]);
 }
 
 int main(int argc, char *argv[])

Index: extract.h
===================================================================
RCS file: /cvsroot/scummvm/tools/extract.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- extract.h	9 Nov 2003 12:55:38 -0000	1.1
+++ extract.h	9 Nov 2003 13:08:02 -0000	1.2
@@ -1,5 +1,5 @@
 /* Scumm Tools
- * Copyright (C) 2002, 2003  The ScummVM Team
+ * Copyright (C) 2003  The ScummVM Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,6 +22,9 @@
 #ifndef EXTRACT_H
 #define EXTRACT_H
 
+#include "util.h"
+
+
 /* These are the defaults parameters for the Lame invocation */
 #define minBitrDef 24
 #define maxBitrDef 64
@@ -33,7 +36,43 @@
 /* The default for oggenc invocation is to use the --quality option only */
 #define oggqualDef 3
 
+typedef struct  {
+	uint32 minBitr;
+	uint32 maxBitr; 
+	uint32 abr;
+	uint32 vbr;
+	uint32 algqual;
+	uint32 vbrqual;
+	uint32 silent;
+} lameparams;
 
+typedef struct {
+	int nominalBitr;
+	int minBitr;
+	int maxBitr;
+	int quality;
+	int silent;
+} oggencparams;
+
+
+/*
+ * Stuff which is in extract-common.c
+ */
+extern FILE *input, *output_idx, *output_snd;
+
+extern lameparams encparms;
+extern oggencparams oggparms;
+
+extern int oggmode;
+
+extern void process_mp3_parms(int argc, char *argv[], int i);
+extern void process_ogg_parms(int argc, char *argv[], int i);
+
+
+/*
+ * Stuff which is in extract.c / simon2mp3.c
+ */
+extern void showhelp(char *exename);
 
 
 #endif

Index: simon2mp3.c
===================================================================
RCS file: /cvsroot/scummvm/tools/simon2mp3.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- simon2mp3.c	9 Nov 2003 12:55:38 -0000	1.15
+++ simon2mp3.c	9 Nov 2003 13:08:02 -0000	1.16
@@ -19,11 +19,8 @@
  *
  */
 
-#include "util.h"
 #include "extract.h"
 
-FILE *input, *output_idx, *output_snd;
-
 unsigned int filenums[32768];
 unsigned int offsets[32768];
 
@@ -32,26 +29,6 @@
 char buf[256];
 char tmp[256];
 
-struct lameparams {
-	unsigned int minBitr;
-	unsigned int maxBitr; 
-	unsigned int abr;
-	unsigned int vbr;
-	unsigned int algqual;
-	unsigned int vbrqual;
-	unsigned int silent;
-} encparms = { minBitrDef, maxBitrDef, abrDef, vbrDef, algqualDef, vbrqualDef, 0 };
-
-struct oggencparams {
-	int nominalBitr;
-	int minBitr;
-	int maxBitr;
-	int quality;
-	int silent;
-} oggparms = { -1, -1, -1, oggqualDef, 0 };
-
-int oggmode = 0;
-
 void end(void)
 {
 	int size;
@@ -416,94 +393,6 @@
 	exit(2);
 }
 
-void process_mp3_parms(int argc, char *argv[], int i) {
-	for(; i < argc; i++) {
-		if (strcmp(argv[i], "--vbr") == 0) {
-			encparms.vbr=1;
-			encparms.abr=0;
-		} else if (strcmp(argv[i], "--abr") == 0) {
-			encparms.vbr=0;
-			encparms.abr=1;
-		} else if (strcmp(argv[i], "-b") == 0) {
-			encparms.minBitr = atoi(argv[i + 1]);
-			if ((encparms.minBitr % 8) != 0)
-				encparms.minBitr -= encparms.minBitr % 8;
-			if (encparms.minBitr >160)
-				encparms.minBitr = 160;
-			if (encparms.minBitr < 8)
-				encparms.minBitr=8;
-			i++;
-		} else if (strcmp(argv[i], "-B") == 0) {
-			encparms.maxBitr = atoi(argv[i + 1]);
-			if ((encparms.maxBitr % 8) != 0)
-				encparms.maxBitr -= encparms.maxBitr % 8;
-			if (encparms.maxBitr > 160)
-				encparms.maxBitr = 160;
-			if (encparms.maxBitr < 8)
-				encparms.maxBitr = 8;
-			i++;
-		} else if (strcmp(argv[i], "-V") == 0) {
-			encparms.vbrqual = atoi(argv[i + 1]);
-			if(encparms.vbrqual < 0)
-				encparms.vbrqual = 0;
-			if(encparms.vbrqual > 9)
-				encparms.vbrqual = 9;
-			i++;
-		} else if (strcmp(argv[i], "-q") == 0) {
-			encparms.algqual = atoi(argv[i + 1]);
-			if (encparms.algqual < 0)
-				encparms.algqual = 0;
-			if (encparms.algqual > 9)
-				encparms.algqual = 9;
-			i++;
-		} else if (strcmp(argv[i], "--silent") == 0) {
-			encparms.silent = 1;
-		} else if (strcmp(argv[i], "--help") == 0) {
-			showhelp(argv[0]);
-		} else if (argv[i][0] == '-') {
-			showhelp(argv[0]);
-		} else {
-			break;
-		}
-	}
-	if (i != (argc - 1)) {
-		showhelp(argv[0]);
-	}
-}
-
-void process_ogg_parms(int argc, char *argv[], int i) {
-	for (; i < argc; i++) {
-		if (strcmp(argv[i], "-b") == 0) {
-			oggparms.nominalBitr = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (strcmp(argv[i], "-m") == 0) {
-			oggparms.minBitr = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (strcmp(argv[i], "-M") == 0) {
-			oggparms.maxBitr = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (strcmp(argv[i], "-q") == 0) {
-			oggparms.quality = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (strcmp(argv[i], "--silent") == 0) {
-			oggparms.silent = 1;
-		}
-		else if (strcmp(argv[i], "--help") == 0) {
-			showhelp(argv[0]);
-		}
-		else if (argv[i][0] == '-') {
-			showhelp(argv[0]);
-		}
-		else
-			break;
-	}
-	if (i != argc - 1)
-		showhelp(argv[0]);
-}
 
 void convert_pc(char *infile)
 {

Index: util.h
===================================================================
RCS file: /cvsroot/scummvm/tools/util.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- util.h	9 Nov 2003 12:55:38 -0000	1.1
+++ util.h	9 Nov 2003 13:08:02 -0000	1.2
@@ -49,19 +49,16 @@
 typedef unsigned char uint8;
 typedef unsigned short uint16;
 typedef unsigned int uint32;
-typedef unsigned int uint;
 typedef signed char int8;
 typedef signed short int16;
 typedef signed int int32;
 
-uint32 inline SWAP_32(uint32 a)
-{
+static uint32 inline SWAP_32(uint32 a) {
 	return ((a >> 24) & 0xFF) + ((a >> 8) & 0xFF00) + ((a << 8) & 0xFF0000) +
 		((a << 24) & 0xFF000000);
 }
 
-uint16 inline SWAP_16(uint16 a)
-{
+static uint16 inline SWAP_16(uint16 a) {
 	return ((a >> 8) & 0xFF) + ((a << 8) & 0xFF00);
 }