move clear intil util.c

when resetting buffer, clear only bits written to

.gitignore

@@ -52,3 +52,5 @@ Mkfile.old
 dkms.conf
 
 .vscode/
+
+test*

README.md

@@ -48,6 +48,18 @@ Launch banana GUI, set log level to DEBUG, set Strip 0 label to podmic then prin
 .\vmrcli.exe -kbanana -D1 strip[0].label=podmic strip[2].label
 ```
 
+#### `Quick Commands`
+
+A short list of quick commands are available:
+
+- `lock`: command.lock=1
+- `unlock`: command.lock=0
+- `show`: command.show=1
+- `hide`: command.show=0
+- `restart`: command.restart=1
+
+They may be used in direct or interactive mode.
+
 ## `Interactive Mode`
 
 Running the following command in Powershell:

include/util.h

@@ -18,6 +18,7 @@ void remove_last_part_of_path(char *fullpath);
 char *kind_as_string(char *s, int kind, int n);
 char *version_as_string(char *s, long v, int n);
 bool is_comment(char *s);
-struct quickcommand *command_in_quickcommands(const char *command, struct quickcommand *quickcommands, int n);
+struct quickcommand *command_in_quickcommands(const char *command, const struct quickcommand *quickcommands, int n);
+void clear(PT_VMR vmr, bool (*f)(PT_VMR));
 
 #endif /* __UTIL_H__ */

include/wrapper.h

@@ -11,7 +11,7 @@
 #include <stdbool.h>
 #include "voicemeeterRemote.h"
 
-enum kind
+enum kind : int
 {
     UNKNOWN = -1,
     BASIC = 1,
@@ -41,6 +41,4 @@ bool is_mdirty(PT_VMR vmr);
 long macrobutton_getstatus(PT_VMR vmr, long n, float *val, long mode);
 long macrobutton_setstatus(PT_VMR vmr, long n, float val, long mode);
 
-void clear_dirty(PT_VMR vmr);
-
 #endif /* __WRAPPER_H__ */

src/util.c

@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
+#include <windows.h>
 #include "wrapper.h"
 #include "util.h"
 
@@ -93,14 +94,27 @@ bool is_comment(char *s)
  * @return struct quickcommand* Pointer to the found quickcommand
  * May return NULL if quickcommand not found.
  */
-struct quickcommand *command_in_quickcommands(const char *command_key, struct quickcommand *quickcommands, int n)
+struct quickcommand *command_in_quickcommands(const char *command_key, const struct quickcommand *quickcommands, int n)
 {
     for (int i = 0; i < n; i++)
     {
-        if (strncmp(command_key, quickcommands[i].name, strlen(command_key)) == 0)
+        if (strcmp(command_key, quickcommands[i].name) == 0)
         {
-            return &quickcommands[i];
+            return (struct quickcommand *)(quickcommands + i);
         }
     }
     return NULL;
 }
+
+/**
+ * @brief Continuously polls an is_{}dirty function until it clears.
+ *
+ * @param vmr Pointer to the iVMR interface
+ * @param f Pointer to a polling function
+ */
+void clear(PT_VMR vmr, bool (*f)(PT_VMR))
+{
+    Sleep(30);
+    while (f(vmr))
+        Sleep(1);
+}

src/vmrcli.c

@@ -32,13 +32,15 @@
               "\tm: Launch the MacroButtons application\n"                                       \
               "\ts: Launch the StreamerView application"
 #define OPTSTR ":hk:msc:iID:v"
-#define MAX_LINE 512
+#define MAX_LINE 4096 /* Size of the input buffer */
+#define RES_SZ 512    /* Size of the buffer passed to VBVMR_GetParameterStringW */
 #define COUNT_OF(x) (sizeof(x) / sizeof(x[0]))
+#define DELIMITERS " \t;,"
 
 /**
  * @enum The kind of values a get call may return.
  */
-enum
+enum restype : int
 {
     FLOAT_T,
     STRING_T,
@@ -49,24 +51,17 @@ enum
  */
 struct result
 {
-    int type;
+    enum restype type;
     union val
     {
         float f;
-        wchar_t s[MAX_LINE];
+        wchar_t s[RES_SZ];
     } val;
 };
 
-struct quickcommand quickcommands[] = {
-    {.name = "lock", .fullcommand = "command.lock=1"},
-    {.name = "unlock", .fullcommand = "command.lock=0"},
-    {.name = "show", .fullcommand = "command.show=1"},
-    {.name = "hide", .fullcommand = "command.show=0"},
-    {.name = "restart", .fullcommand = "command.restart=1"}};
-
 static bool vflag = false;
 
-static void usage(void);
+static void usage();
 enum kind set_kind(char *kval);
 void interactive(PT_VMR vmr, bool with_prompt);
 void parse_input(PT_VMR vmr, char *input);
@@ -180,7 +175,7 @@ int main(int argc, char *argv[])
         log_info("Profile %s loaded", cvalue);
         set_parameter_string(vmr, "command.load", cvalue);
         Sleep(300);
-        clear_dirty(vmr);
+        clear(vmr, is_pdirty);
     }
 
     if (iflag)
@@ -242,22 +237,24 @@ enum kind set_kind(char *kval)
  * Each line is passed to parse_input()
  *
  * @param vmr Pointer to the iVMR interface
+ * @param with_prompt If true, prints the interactive prompt '>>'
  */
 void interactive(PT_VMR vmr, bool with_prompt)
 {
     char input[MAX_LINE];
+    size_t len;
 
     if (with_prompt)
         printf(">> ");
     while (fgets(input, MAX_LINE, stdin) != NULL)
     {
         input[strcspn(input, "\n")] = 0;
-        if (strlen(input) == 1 && toupper(input[0]) == 'Q')
+        if ((len = strlen(input)) == 1 && toupper(input[0]) == 'Q')
             break;
 
         parse_input(vmr, input);
+        memset(input, 0, len); /* reset input buffer */
 
-        memset(input, 0, MAX_LINE); /* reset input buffer */
         if (with_prompt)
             printf(">> ");
     }
@@ -278,11 +275,11 @@ void parse_input(PT_VMR vmr, char *input)
 
     char *token, *p;
 
-    token = strtok_r(input, " \t;,", &p);
+    token = strtok_r(input, DELIMITERS, &p);
     while (token != NULL)
     {
         parse_command(vmr, token);
-        token = strtok_r(NULL, " \t;,", &p);
+        token = strtok_r(NULL, DELIMITERS, &p);
     }
 }
 
@@ -298,6 +295,13 @@ void parse_command(PT_VMR vmr, char *command)
 {
     log_debug("Parsing %s", command);
 
+    static const struct quickcommand quickcommands[] = {
+        {.name = "lock", .fullcommand = "command.lock=1"},
+        {.name = "unlock", .fullcommand = "command.lock=0"},
+        {.name = "show", .fullcommand = "command.show=1"},
+        {.name = "hide", .fullcommand = "command.show=0"},
+        {.name = "restart", .fullcommand = "command.restart=1"}};
+
     struct quickcommand *qc_ptr = command_in_quickcommands(command, quickcommands, (int)COUNT_OF(quickcommands));
     if (qc_ptr != NULL)
     {
@@ -369,7 +373,7 @@ void parse_command(PT_VMR vmr, char *command)
  */
 void get(PT_VMR vmr, char *command, struct result *res)
 {
-    clear_dirty(vmr);
+    clear(vmr, is_pdirty);
     if (get_parameter_float(vmr, command, &res->val.f) != 0)
     {
         res->type = STRING_T;

src/wrapper.c

@@ -61,7 +61,7 @@ long login(PT_VMR vmr, int kind)
 
     if (rep == 0)
     {
-        clear_dirty(vmr);
+        clear(vmr, is_pdirty);
     }
     return rep;
 }
@@ -156,10 +156,3 @@ long macrobutton_setstatus(PT_VMR vmr, long n, float val, long mode)
     log_trace("VBVMR_MacroButton_SetStatus(%ld, %d, %ld)", n, (int)val, mode);
     return vmr->VBVMR_MacroButton_SetStatus(n, val, mode);
 }
-
-void clear_dirty(PT_VMR vmr)
-{
-    Sleep(30);
-    while (is_pdirty(vmr))
-        Sleep(1);
-}