minor bump

remove replace_blanks_with_single_space()

README.md

@@ -13,7 +13,7 @@
 ## `Use`
 
 ```powershell
-./vmrcli.exe [-h] [-i] [-k] [-D] [-v] [-p] [-m] [-s] <api commands>
+.\vmrcli.exe [-h] [-i] [-k] [-D] [-v] [-c] [-m] [-s] <api commands>
 ```
 
 Where:
@@ -23,7 +23,7 @@ Where:
 - `k`: The kind of Voicemeeter (basic, banana or potato). Use this to launch the GUI.
 - `D`: Set log level 0=TRACE, 1=DEBUG, 2=INFO, 3=WARN, 4=ERROR, 5=FATAL
 - `v`: Enable extra console output (toggle, set messages)
-- `p`: Load a user configuration (given the file name or a full path)
+- `c`: Load a user configuration (give the full file path)
 - `m`: Launch the MacroButtons application
 - `s`: Launch the StreamerView application
 
@@ -38,13 +38,13 @@ Examples:
 Launch basic GUI, set log level to INFO, Toggle Strip 0 Mute, print its new value, then decrease Bus 0 Gain by 3.8
 
 ```powershell
-./vmrcli.exe -kbasic -D2 !strip[0].mute strip[0].mute bus[0].gain-=3.8
+.\vmrcli.exe -kbasic -D2 !strip[0].mute strip[0].mute bus[0].gain-=3.8
 ```
 
 Launch banana GUI, set log level to DEBUG, set Strip 0 label to podmic then print Strip 2 label
 
 ```powershell
-./vmrcli.exe -kbanana -D1 strip[0].label=podmic strip[2].label
+.\vmrcli.exe -kbanana -D1 strip[0].label=podmic strip[2].label
 ```
 
 ## `Interactive Mode`
@@ -52,7 +52,7 @@ Launch banana GUI, set log level to DEBUG, set Strip 0 label to podmic then prin
 Running the following command in Powershell:
 
 ```powershell
-./vmrcli.exe -i
+.\vmrcli.exe -i
 ```
 
 Will open an interactive prompt:
@@ -69,10 +69,16 @@ API commands follow the same rules as listed above. Entering `Q` or `q` will exi
 Scripts can be loaded from text files, for example in Powershell:
 
 ```powershell
-./vmrcli.exe -D1 $(Get-Content .\example_commands.txt)
+.\vmrcli.exe -D1 $(Get-Content .\example_commands.txt)
 ```
 
-Multiple API commands can be in a single line but they should be space separated.
+You may also pipe a scripts contents to the CLI:
+
+```powershell
+$(Get-Content .\example_commands.txt) | .\vmrcli.exe -D1 -i
+```
+
+Multiple API commands can be in a single line, they may be delimited by space, `;` or `,`.
 
 ## `Build`
 

include/cdll.h

@@ -1,8 +0,0 @@
-#ifndef __CDLL_H__
-#define __CDLL_H__
-
-#include "VoicemeeterRemote.h"
-
-PT_VMR create_interface();
-
-#endif /*__CDLL_H__*/

include/ivmr.h

@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) 2024 Onyx and Iris
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the MIT license. See `ivmr.c` for details.
+ */
+
+#ifndef __IVMR_H__
+#define __IVMR_H__
+
+#include "VoicemeeterRemote.h"
+
+PT_VMR create_interface();
+
+#endif /* __IVMR_H__ */

include/util.h

@@ -1,9 +1,15 @@
+/**
+ * Copyright (c) 2024 Onyx and Iris
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the MIT license. See `util.c` for details.
+ */
+
 #ifndef __UTIL_H__
 #define __UTIL_H__
 
-void remove_name_in_path(char *szPath);
-int replace_multiple_space_with_one(char *s, size_t len);
+void remove_last_part_of_path(char *fullpath);
 char *kind_as_string(char *s, int kind, int n);
-char *version_as_string(char *, long v, int n);
+char *version_as_string(char *s, long v, int n);
 
 #endif /* __UTIL_H__ */

include/wrapper.h

@@ -1,5 +1,12 @@
-#ifndef __VMR_H__
-#define __VMR_H__
+/**
+ * Copyright (c) 2024 Onyx and Iris
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the MIT license. See `wrapper.c` for details.
+ */
+
+#ifndef __WRAPPER_H__
+#define __WRAPPER_H__
 
 #include <stdbool.h>
 #include "voicemeeterRemote.h"
@@ -36,4 +43,4 @@ long macrobutton_setstatus(PT_VMR vmr, long n, float val, long mode);
 
 void clear_dirty(PT_VMR vmr);
 
-#endif /* __VMR_H__ */
+#endif /* __WRAPPER_H__ */

src/ivmr.c

@@ -1,7 +1,22 @@
+/**
+ * @file ivmr.c
+ * @author Vincent Burel, Onyx and Iris (code@onyxandiris.online)
+ * @brief Functions for initializing the iVMR interface.
+ * Defines a single public function that returns a pointer to the interface.
+ * @version 0.6.0
+ * @date 2024-07-06
+ *
+ * @copyright Vincent Burel(c)2015-2021 All Rights Reserved
+ * https://github.com/vburel2018/Voicemeeter-SDK/blob/main/LICENSE
+ *
+ * Copyright (c) 2024 Onyx and Iris
+ * https://github.com/onyx-and-iris/vmrcli/blob/main/LICENSE
+ */
+
 #include <stdbool.h>
 #include <stdio.h>
 #include <windows.h>
-#include "cdll.h"
+#include "ivmr.h"
 #include "util.h"
 #include "log.h"
 
@@ -10,6 +25,11 @@ static T_VBVMR_INTERFACE iVMR;
 static long initialize_dll_interfaces(PT_VMR vmr);
 static bool registry_get_voicemeeter_folder(char *szDir);
 
+/**
+ * @brief Create an interface object
+ *
+ * @return PT_VMR Pointer to the iVMR interface
+ */
 PT_VMR create_interface()
 {
     PT_VMR vmr = &iVMR;
@@ -191,7 +211,7 @@ static bool registry_get_voicemeeter_folder(char *szDir)
     if (rep != ERROR_SUCCESS)
         return false;
     // remove name to get the path only
-    remove_name_in_path(sss);
+    remove_last_part_of_path(sss);
     if (nnsize > 512)
         nnsize = 512;
     strncpy(szDir, sss, nnsize);

src/util.c

@@ -1,74 +1,43 @@
+/**
+ * @file util.c
+ * @author Onyx and Iris (code@onyxandiris.online)
+ * @brief Utility functions.
+ * @version 0.6.0
+ * @date 2024-07-06
+ *
+ * @copyright Copyright (c) 2024
+ * https://github.com/onyx-and-iris/vmrcli/blob/main/LICENSE
+ */
+
 #include <stddef.h>
 #include <stdio.h>
-#include "vmr.h"
+#include <string.h>
+#include <ctype.h>
+#include "wrapper.h"
 #include "util.h"
 
 /**
  * @brief Removes the last part of a path
  *
- * @param szPath
+ * @param fullpath The entire path
  */
-void remove_name_in_path(char *szPath)
+void remove_last_part_of_path(char *fullpath)
 {
-    char *p = szPath;
+    char *p;
 
-    while (*p++)
-        ;
-    while (p > szPath && *p != '\\')
-        p--;
-    if (*p == '\\')
+    if ((p = strrchr(fullpath, '\\')) != NULL)
+    {
         *p = '\0';
     }
-
-/**
- * @brief replaces multiple newlines and tabs with single spaces
- *
- * @param s the string to be reduced
- * @param len current length of the string
- * @return int new length of the string
- */
-int replace_multiple_space_with_one(char *s, size_t len)
-{
-    int j = 0;
-    int count = 0;
-
-    if (len == 1 && (s[0] == ' ' || s[0] == '\t'))
-    {
-        s[0] = '\0';
-        return len;
-    }
-
-    if (len < 2)
-        return len;
-
-    for (int i = 0; s[i] != '\0'; i++)
-    {
-        if (s[i] == ' ' || s[i] == '\t')
-        {
-            count++;
-        }
-
-        if (s[i] != ' ' && s[i] != '\t')
-        {
-            if (count >= 1)
-            {
-                count = 0;
-                s[j++] = ' ';
-            }
-            s[j++] = s[i];
-        }
-    }
-    s[j] = '\0';
-    return j;
 }
 
 /**
- * @brief
+ * @brief Converts Voicemeeter's kind into a string.
  *
  * @param s Pointer to a character buffer
  * @param kind The kind of Voicemeeter.
- * @param n maximum number of characters to be written to the buffer
- * @return char* The kind of Voicemeeter as a string
+ * @param n Maximum number of characters to be written to the buffer
+ * @return char* String representation of the kind of Voicemeeter.
  */
 char *kind_as_string(char *s, int kind, int n)
 {
@@ -85,12 +54,12 @@ char *kind_as_string(char *s, int kind, int n)
 }
 
 /**
- * @brief returns Voicemeeter's version as a string
+ * @brief Converts Voicemeeter's version into a string.
  *
- * @param s string buffer the version will be written to
- * @param v unprocessed version as a long int
- * @param n maximum number of characters to be written to the buffer
- * @return char*
+ * @param s Pointer to a character buffer
+ * @param v Unprocessed version as a long int
+ * @param n Maximum number of characters to be written to the buffer
+ * @return char* String representation of the Voicemeeter version
  */
 char *version_as_string(char *s, long v, int n)
 {

src/vmrcli.c

@@ -1,20 +1,30 @@
+/**
+ * @file vmrcli.c
+ * @author Onyx and Iris (code@onyxandiris.online)
+ * @brief A Voicemeeter Remote Command Line Interface
+ * @version 0.6.0
+ * @date 2024-07-06
+ *
+ * @copyright Copyright (c) 2024
+ * https://github.com/onyx-and-iris/vmrcli/blob/main/LICENSE
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <getopt.h>
 #include <string.h>
 #include <ctype.h>
-#include "cdll.h"
-#include "vmr.h"
+#include <windows.h>
+#include "ivmr.h"
+#include "wrapper.h"
 #include "log.h"
 #include "util.h"
 
 #define MAX_LINE 512
 
 /**
- * @brief An enum used to define the kind of value
- * a 'get' call returns.
- *
+ * @enum The kind of values a get call may return.
  */
 enum
 {
@@ -23,8 +33,7 @@ enum
 };
 
 /**
- * @brief A struct holding the result of a get call.
- *
+ * @struct A struct holding the result of a get call.
  */
 struct result
 {
@@ -41,7 +50,7 @@ static bool vflag = false;
 void help(void);
 enum kind set_kind(char *kval);
 void interactive(PT_VMR vmr);
-void parse_input(PT_VMR vmr, char *input, int len);
+void parse_input(PT_VMR vmr, char *input);
 void parse_command(PT_VMR vmr, char *command);
 void get(PT_VMR vmr, char *command, struct result *res);
 
@@ -50,10 +59,10 @@ int main(int argc, char *argv[])
     bool iflag = false,
          mflag = false,
          sflag = false,
-         pflag = false;
+         cflag = false;
     int opt;
     int dvalue;
-    char *pvalue;
+    char *cvalue;
     enum kind kind = BANANAX64;
 
     if (argc == 1)
@@ -64,7 +73,7 @@ int main(int argc, char *argv[])
 
     log_set_level(LOG_WARN);
 
-    while ((opt = getopt(argc, argv, "hk:msp:iD:v")) != -1)
+    while ((opt = getopt(argc, argv, "hk:msc:iD:v")) != -1)
     {
         switch (opt)
         {
@@ -85,9 +94,9 @@ int main(int argc, char *argv[])
         case 's':
             sflag = true;
             break;
-        case 'p':
-            pflag = true;
-            pvalue = optarg;
+        case 'c':
+            cflag = true;
+            cvalue = optarg;
             break;
         case 'i':
             iflag = true;
@@ -134,10 +143,12 @@ int main(int argc, char *argv[])
         run_voicemeeter(vmr, STREAMERVIEW);
     }
 
-    if (pflag)
+    if (cflag)
     {
-        log_info("Profile %s loaded", pvalue);
-        set_parameter_string(vmr, "command.load", pvalue);
+        log_info("Profile %s loaded", cvalue);
+        set_parameter_string(vmr, "command.load", cvalue);
+        Sleep(300);
+        clear_dirty(vmr);
     }
 
     if (iflag)
@@ -149,7 +160,7 @@ int main(int argc, char *argv[])
     {
         for (int i = optind; i < argc; i++)
         {
-            parse_input(vmr, argv[i], strlen(argv[i]));
+            parse_input(vmr, argv[i]);
         }
     }
 
@@ -167,27 +178,27 @@ int main(int argc, char *argv[])
 
 /**
  * @brief prints the help message
- *
  */
 void help()
 {
     puts(
-        "Usage: ./vmrcli.exe [-h] [-i] [-k] [-D] [-v] [-p] [-m] [-s] <api commands>\n"
+        "Usage: .\\vmrcli.exe [-h] [-i] [-k] [-D] [-v] [-c] [-m] [-s] <api commands>\n"
         "Where: \n"
         "\th: Prints the help message\n"
         "\ti: Enable interactive mode\n"
         "\tk: The kind of Voicemeeter (basic, banana, potato)\n"
         "\tD: Set log level 0=TRACE, 1=DEBUG, 2=INFO, 3=WARN, 4=ERROR, 5=FATAL\n"
         "\tv: Enable extra console output (toggle, set messages)\n"
-        "\tp: Load a user configuration (given the file name or a full path)\n"
+        "\tc: Load a user configuration (give the full file path)\n"
         "\tm: Launch the MacroButtons application\n"
         "\ts: Launch the StreamerView application");
 }
 
 /**
- * @brief Set the kind object
+ * @brief Set the kind of Voicemeeter based on the value of -k flag.
+ * For 64 bit systems the value is promoted to X64.
  *
- * @param kval
+ * @param kval Value of the -k flag
  * @return enum kind
  */
 enum kind set_kind(char *kval)
@@ -224,46 +235,42 @@ enum kind set_kind(char *kval)
  * Break if 'Q' is entered on the interactive prompt.
  * Each line is passed to parse_input()
  *
- * @param vmr The API interface as a struct
+ * @param vmr Pointer to the iVMR interface
  */
 void interactive(PT_VMR vmr)
 {
     char input[MAX_LINE];
-    size_t len;
 
     printf(">> ");
     while (fgets(input, MAX_LINE, stdin) != NULL)
     {
         input[strcspn(input, "\n")] = 0;
-        len = strlen(input);
-        if (len == 1 && toupper(input[0]) == 'Q')
+        if (strlen(input) == 1 && toupper(input[0]) == 'Q')
             break;
 
-        parse_input(vmr, input, len);
+        parse_input(vmr, input);
 
-        memset(input, '\0', MAX_LINE); /* reset input buffer */
+        memset(input, 0, MAX_LINE); /* reset input buffer */
         printf(">> ");
     }
 }
 
 /**
- * @brief Walks through each line split by a space delimiter.
+ * @brief Walks through each line split by " \t;," delimiters.
  * Each token is passed to parse_command()
  *
- * @param vmr The API interface as a struct
+ * @param vmr Pointer to the iVMR interface
  * @param input Each input line, from stdin or CLI args
- * @param len The length of the input line
  */
-void parse_input(PT_VMR vmr, char *input, int len)
+void parse_input(PT_VMR vmr, char *input)
 {
-    char *token;
+    char *token, *p;
 
-    replace_multiple_space_with_one(input, len);
-    token = strtok(input, " ");
+    token = strtok_r(input, " \t;,", &p);
     while (token != NULL)
     {
         parse_command(vmr, token);
-        token = strtok(NULL, " ");
+        token = strtok_r(NULL, " \t;,", &p);
     }
 }
 
@@ -272,7 +279,7 @@ void parse_input(PT_VMR vmr, char *input, int len)
  * See command type definitions in:
  * https://github.com/onyx-and-iris/vmrcli?tab=readme-ov-file#api-commands
  *
- * @param vmr The API interface as a struct
+ * @param vmr Pointer to the iVMR interface
  * @param command Each token from the input line as its own command string
  */
 void parse_command(PT_VMR vmr, char *command)
@@ -320,6 +327,7 @@ void parse_command(PT_VMR vmr, char *command)
             printf("%s: %.1f\n", command, res.val.f);
             break;
         case STRING_T:
+            if (res.val.s[0] != '\0')
                 printf("%s: %ls\n", command, res.val.s);
             break;
         default:
@@ -329,9 +337,10 @@ void parse_command(PT_VMR vmr, char *command)
 }
 
 /**
- * @brief
+ * @brief Get the value of a float or string parameter.
+ * Stores its type and value into a result struct
  *
- * @param vmr The API interface as a struct
+ * @param vmr Pointer to the iVMR interface
  * @param command A parsed 'get' command as a string
  * @param res A struct holding the result of the API call.
  */

src/wrapper.c

@@ -1,21 +1,32 @@
+/**
+ * @file wrapper.c
+ * @author Onyx and Iris (code@onyxandiris.online)
+ * @brief Provides public functions that wrap the iVMR calls
+ * @version 0.6.0
+ * @date 2024-07-06
+ *
+ * @copyright Copyright (c) 2024
+ * https://github.com/onyx-and-iris/vmrcli/blob/main/LICENSE
+ */
+
 #include <windows.h>
 #include <stdio.h>
 #include <time.h>
-#include "vmr.h"
+#include "wrapper.h"
 #include "log.h"
 #include "util.h"
 
-#define VERSION_STR_LEN 128
 #define KIND_STR_LEN 64
+#define VERSION_STR_LEN 32
 
 /**
  * @brief Logs into the API.
  * Tests for valid connection for up to 2 seconds.
  * If successful initializes the dirty parameters.
  *
- * @param vmr
- * @param kind
- * @return long
+ * @param vmr Pointer to the iVMR interface
+ * @param kind The kind of Voicemeeter Gui to launch.
+ * @return long VBVMR_Login return value
  */
 long login(PT_VMR vmr, int kind)
 {
@@ -59,7 +70,7 @@ long login(PT_VMR vmr, int kind)
  * @brief Logs out of the API giving a short wait to allow a
  * final instruction to complete.
  *
- * @param vmr The API interface as a struct
+ * @param vmr Pointer to the iVMR interface
  * @return long VBVMR_Logout return value
  */
 long logout(PT_VMR vmr)