From: kramm <kramm>
Date: Sat, 16 Jul 2005 08:57:12 +0000 (+0000)
Subject: changed -v syntax- no longer expect an argument
X-Git-Tag: release-0-7-0~28
X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=ca7c0df2c3399b27b6ed4157908a33df6cb23e2f

changed -v syntax- no longer expect an argument
---

diff --git a/src/jpeg2swf.c b/src/jpeg2swf.c
index 3263cb2..644df91 100644
--- a/src/jpeg2swf.c
+++ b/src/jpeg2swf.c
@@ -406,11 +406,17 @@ int args_callback_option(char *arg, char *val)
 	    break;
 
 	case 'v':
-	    if (val)
-		global.verbose = atoi(val);
-	    res = 1;
+	    global.verbose++;
+	    res = 0;
 	    break;
 
+/*	case 'q':
+	    global.verbose--;
+	    if(global.verbose<0)
+		global.verbose = 0;
+	    res = 0;
+	    break;*/
+
 	case 'X':
 	    if (val)
 		global.force_width = atoi(val);
@@ -534,7 +540,8 @@ void args_callback_usage(char *name)
     printf("-Y , --height <height>         Force movie height to <height> (default: autodetect)\n");
     printf("-f , --fit-to-movie            Fit images to movie size\n");
     printf("-e , --export <assetname>      Make importable as asset with <assetname>\n");
-    printf("-v , --verbose <level>         Set verbose level to <level> (0=quiet, 1=default, 2=debug)\n");
+    printf("-v , --verbose                 Be verbose. Use more than one -v for greater effect \n");
+    //printf("-q , --quiet                   Omit normal log messages, only log errors\n");
     printf("-V , --version                 Print version information and exit\n");
     printf("\n");
 }
diff --git a/src/png2swf.c b/src/png2swf.c
index 2146ef7..b03a11d 100644
--- a/src/png2swf.c
+++ b/src/png2swf.c
@@ -806,9 +806,15 @@ int args_callback_option(char *arg, char *val)
 	    break;
 
 	case 'v':
-	    if (val)
-		global.verbose = atoi(val);
-	    res = 1;
+	    global.verbose++;
+	    res = 0;
+	    break;
+
+	case 'q':
+	    global.verbose--;
+	    if(global.verbose<0)
+		global.verbose = 0;
+	    res = 0;
 	    break;
 
 	case 'X':
@@ -848,6 +854,7 @@ static struct options_t options[] = {
 {"X", "pixel"},
 {"Y", "pixel"},
 {"v", "verbose"},
+{"q", "quiet"},
 {"C", "cgi"},
 {"V", "version"},
 {0,0}
@@ -887,7 +894,8 @@ void args_callback_usage(char *name)
     printf("-z , --zlib <zlib>             Enable Flash 6 (MX) Zlib Compression\n");
     printf("-X , --pixel <width>           Force movie width to <width> (default: autodetect)\n");
     printf("-Y , --pixel <height>          Force movie height to <height> (default: autodetect)\n");
-    printf("-v , --verbose <level>         Set verbose level (0=quiet, 1=default, 2=debug)\n");
+    printf("-v , --verbose                 Be verbose. Use more than one -v for greater effect \n");
+    printf("-q , --quiet                   Omit normal log messages, only log errors\n");
     printf("-C , --cgi                     For use as CGI- prepend http header, write to stdout\n");
     printf("-V , --version                 Print version information and exit\n");
     printf("\n");