diff tools/ppl.c @ 2408:60e119262c67

Option index re-ordering cleanup work.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 13 Jan 2020 21:21:25 +0200
parents b7cd5dd0b82e
children bc05bcfc4598
line wrap: on
line diff
--- a/tools/ppl.c	Mon Jan 13 21:16:57 2020 +0200
+++ b/tools/ppl.c	Mon Jan 13 21:21:25 2020 +0200
@@ -68,21 +68,22 @@
 
 static const DMOptArg optList[] =
 {
-    {  0, '?', "help",     "Show this help", OPT_NONE },
-    {  1, 'v', "verbose",  "Be more verbose", OPT_NONE },
-    {  2,   0, "fs",       "Fullscreen", OPT_NONE },
-    { 12, 'C', "cli",      "Do not open GUI window", OPT_NONE },
-    {  3, 'w', "window",   "Initial window size/resolution -w 640x480", OPT_ARGREQ },
+    {  0, '?', "help"            , "Show this help", OPT_NONE },
+    {  2, 'v', "verbose"         , "Be more verbose", OPT_NONE },
+
+    { 10,   0, "fs"              , "Fullscreen", OPT_NONE },
+    { 12, 'C', "cli"             , "Do not open GUI window", OPT_NONE },
+    { 14, 'w', "window"          , "Initial window size/resolution -w 640x480", OPT_ARGREQ },
 
-    {  4, '1', "16bit",    "16-bit output", OPT_NONE },
-    {  5, '8', "8bit",     "8-bit output", OPT_NONE },
-    {  6, 'm', "mono",     "Mono output", OPT_NONE },
-    {  7, 's', "stereo",   "Stereo output", OPT_NONE },
-    {  8, 'f', "freq",     "Output frequency", OPT_ARGREQ },
+    { 16, '1', "16bit"           , "16-bit output", OPT_NONE },
+    { 18, '8', "8bit"            , "8-bit output", OPT_NONE },
+    { 20, 'm', "mono"            , "Mono output", OPT_NONE },
+    { 22, 's', "stereo"          , "Stereo output", OPT_NONE },
+    { 24, 'f', "freq"            , "Output frequency", OPT_ARGREQ },
 
-    {  9, 'M', "mute",     "Mute other channels than #", OPT_ARGREQ },
-    { 10, 'o', "order",    "Start from order #", OPT_ARGREQ },
-    { 11, 't', "time",     "Play for # seconds", OPT_ARGREQ },
+    { 28, 'M', "mute"            , "Mute other channels than #", OPT_ARGREQ },
+    { 30, 'o', "order"           , "Start from order #", OPT_ARGREQ },
+    { 32, 't', "time"            , "Play for # seconds", OPT_ARGREQ },
 };
 
 const int optListN = sizeof(optList) / sizeof(optList[0]);
@@ -97,21 +98,26 @@
 
 BOOL argHandleOpt(const int optN, char *optArg, char *currArg)
 {
-    switch (optN) {
+    switch (optN)
+    {
         case 0:
             argShowHelp();
             exit(0);
             break;
 
-        case 1:
+        case 2:
             dmVerbosity++;
             break;
 
-        case 2:
+        case 10:
             eng.optVFlags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
             break;
 
-        case 3:
+        case 12:
+            optUseGUI = FALSE;
+            break;
+
+        case 14:
             {
                 int w, h;
                 if (sscanf(optArg, "%dx%d", &w, &h) == 2)
@@ -132,43 +138,39 @@
             }
             break;
 
-        case 4:
+        case 16:
             optOutFormat = JSS_AUDIO_S16;
             break;
 
-        case 5:
+        case 18:
             optOutFormat = JSS_AUDIO_U8;
             break;
 
-        case 6:
+        case 20:
             optOutChannels = JSS_AUDIO_MONO;
             break;
 
-        case 7:
+        case 22:
             optOutChannels = JSS_AUDIO_STEREO;
             break;
 
-        case 8:
+        case 24:
             optOutFreq = atoi(optArg);
             break;
 
-        case 9:
+        case 28:
             optMuteOChannels = atoi(optArg);
             break;
 
-        case 10:
+        case 30:
             optStartOrder = atoi(optArg);
             break;
 
-        case 11:
+        case 32:
             optPlayTime = atoi(optArg);
             optUsePlayTime = TRUE;
             break;
 
-        case 12:
-            optUseGUI = FALSE;
-            break;
-
         default:
             dmErrorMsg("Unimplemented option argument '%s'.\n", currArg);
             return FALSE;