From c02e03049131fbf18084cea5c4f86cf17f486273 Mon Sep 17 00:00:00 2001
From: fduncanh <fduncanh@gmail.com>
Date: Sun, 25 Sep 2022 14:18:21 -0400
Subject: [PATCH] minor cleanup of parsing for -admp, -vdmp options

---
 uxplay.cpp | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/uxplay.cpp b/uxplay.cpp
index d701b22..2c7b4d6 100644
--- a/uxplay.cpp
+++ b/uxplay.cpp
@@ -719,7 +719,7 @@ void parse_arguments (int argc, char *argv[]) {
             }
         } else if (arg == "-vdmp") {
             dump_video = true;
-            if (option_has_value(i, argc, arg, argv[i+1])) {
+            if (i < argc - 1 && *argv[i+1] != '-') {
                 unsigned int n = 0;
                 if (get_value (argv[++i], &n)) {
                     if (n == 0) {
@@ -736,10 +736,9 @@ void parse_arguments (int argc, char *argv[]) {
                     video_dumpfile_name.append(argv[i]);
                 }
             }
-	    printf("dump_video %d %d %s \n",dump_video, video_dump_limit, video_dumpfile_name.c_str());
         } else if (arg == "-admp") {
             dump_audio = true;
-            if (option_has_value(i, argc, arg, argv[i+1])) {
+            if (i < argc - 1 && *argv[i+1] != '-') {
                 unsigned int n = 0;
                 if (get_value (argv[++i], &n)) {
                     if (n == 0) {
@@ -784,9 +783,23 @@ int main (int argc, char *argv[]) {
 #endif
 
     parse_arguments (argc, argv);
-    
     if (audiosink == "0") {
         use_audio = false;
+        dump_audio = false;
+    }
+    if (dump_video) {
+        if (video_dump_limit > 0) {
+             printf("dump video using \"-vdmp %d %s\"\n", video_dump_limit, video_dumpfile_name.c_str());
+	} else {
+             printf("dump video using \"-vdmp %s\"\n", video_dumpfile_name.c_str());
+        }
+    }
+    if (dump_audio) {
+        if (audio_dump_limit > 0) {
+            printf("dump audio using \"-admp %d %s\"\n", audio_dump_limit, audio_dumpfile_name.c_str());
+        } else {
+            printf("dump audio using \"-admp %s\"\n",  audio_dumpfile_name.c_str());
+        }
     }
 
 #ifdef _WIN32    /* don't buffer stdout in WIN32 when debug_log = false */