add login timeout

print the API version to info string

README.md

@@ -28,22 +28,26 @@ Where:
 
 Examples:
 
-Launch basic GUI, set debug level to INFO, Toggle Strip 0 Mute, then print its new value
+Launch basic GUI, set log level to INFO, Toggle Strip 0 Mute, then print its new value
 
 `./vmrcli.exe -kbasic -D2 !strip[0].mute strip[0].mute`
 
-Launch banana GUI, set debug level to DEBUG, set Strip 0 label to podmic then print Strip 2 label
+Launch banana GUI, set log level to DEBUG, set Strip 0 label to podmic then print Strip 2 label
 
-`vmrcli.exe -kbanana -D1 strip[0].label=podmic strip[2].label`
+`./vmrcli.exe -kbanana -D1 strip[0].label=podmic strip[2].label`
 
 ## `Script files`
 
-Scripts can be loaded from text files, for example:
+Scripts can be loaded from text files, for example in Powershell:
 
 ```powershell
-./vbantxt-cli -D1 $(Get-Content .\example_commands.txt)
+./vmrcli.exe -D1 $(Get-Content .\example_commands.txt)
 ```
 
+## `Official Documentation`
+
+- [Voicemeeter Remote C API](https://github.com/onyx-and-iris/Voicemeeter-SDK/blob/main/VoicemeeterRemoteAPI.pdf)
+
 ## `Special Thanks`
 
 - [rxi](https://github.com/rxi) for writing the [log.c](https://github.com/rxi/log.c) package

include/cdll.h

@@ -1,9 +1,9 @@
-#include <windows.h>
-#include "VoicemeeterRemote.h"
-
 #ifndef __CDLL_H__
 #define __CDLL_H__
 
+#include <windows.h>
+#include "VoicemeeterRemote.h"
+
 long initialize_dll_interfaces(T_VBVMR_INTERFACE *iVMR);
 
 #endif /*__CDLL_H__*/

include/vmr.h

@@ -1,9 +1,9 @@
-#include <stdbool.h>
-#include "voicemeeterRemote.h"
-
 #ifndef __VMR_H__
 #define __VMR_H__
 
+#include <stdbool.h>
+#include "voicemeeterRemote.h"
+
 enum kind
 {
     BASIC = 1,

src/vmr.c

@@ -1,17 +1,19 @@
 #include <windows.h>
 #include <stdio.h>
+#include <time.h>
 #include "vmr.h"
 #include "log.h"
 
 long login(T_VBVMR_INTERFACE *iVMR, int kind)
 {
     int rep;
+    long v;
 
     rep = iVMR->VBVMR_Login();
     Sleep(20);
     if (rep == 1)
     {
-        rep = run_voicemeeter(iVMR, kind);
+        run_voicemeeter(iVMR, kind);
         switch (kind)
         {
         case BASIC:
@@ -28,11 +30,27 @@ long login(T_VBVMR_INTERFACE *iVMR, int kind)
             break;
         }
 
-        Sleep(1200);
+        time_t endwait;
+        int timeout = 2;
+
+        endwait = time(NULL) + timeout;
+        while (time(NULL) < endwait)
+        {
+            if ((rep = version(iVMR, &v)) == 0)
+                break;
+            Sleep(20);
+        }
     }
     if (rep == 0)
     {
-        log_info("Successfully logged into the Voicemeeter API");
+        version(iVMR, &v);
+        long v1 = (v & 0xFF000000) >> 24,
+             v2 = (v & 0x00FF0000) >> 16,
+             v3 = (v & 0x0000FF00) >> 8,
+             v4 = (v & 0x000000FF);
+        char version_s[128];
+        sprintf(version_s, "%i.%i.%i.%i", (int)v1, (int)v2, (int)v3, (int)v4);
+        log_info("Successfully logged into the Voicemeeter API v%s", version_s);
         clear_dirty(iVMR);
     }
     return rep;
@@ -51,6 +69,7 @@ long logout(T_VBVMR_INTERFACE *iVMR)
 
 long run_voicemeeter(T_VBVMR_INTERFACE *iVMR, int kind)
 {
+    log_trace("VBVMR_RunVoicemeeter(%d)", kind);
     return iVMR->VBVMR_RunVoicemeeter((long)kind);
 }
 
@@ -61,36 +80,43 @@ long type(T_VBVMR_INTERFACE *iVMR, long *type)
 
 long version(T_VBVMR_INTERFACE *iVMR, long *version)
 {
-    return iVMR->VBVMR_GetVoicemeeterType(version);
+    log_trace("VBVMR_GetVoicemeeterType(<long> *v)");
+    return iVMR->VBVMR_GetVoicemeeterVersion(version);
 }
 
 bool is_pdirty(T_VBVMR_INTERFACE *iVMR)
 {
+    log_trace("VBVMR_IsParametersDirty()");
     return iVMR->VBVMR_IsParametersDirty() == 1;
 }
 
 long get_parameter_float(T_VBVMR_INTERFACE *iVMR, char *param, float *f)
 {
+    log_trace("VBVMR_GetParameterFloat(%s, <float> *f)", param, f);
     return iVMR->VBVMR_GetParameterFloat(param, f);
 }
 
 long get_parameter_string(T_VBVMR_INTERFACE *iVMR, char *param, char *s)
 {
+    log_trace("VBVMR_GetParameterStringA(%s, <char> *s)", param, s);
     return iVMR->VBVMR_GetParameterStringA(param, s);
 }
 
 long set_parameter_float(T_VBVMR_INTERFACE *iVMR, char *param, float val)
 {
+    log_trace("VBVMR_SetParameterFloat(%s, %.2f)", param, val);
     return iVMR->VBVMR_SetParameterFloat(param, val);
 }
 
 long set_parameter_string(T_VBVMR_INTERFACE *iVMR, char *param, char *s)
 {
+    log_trace("VBVMR_SetParameterStringA(%s, %s)", param, s);
     return iVMR->VBVMR_SetParameterStringA(param, s);
 }
 
 long set_parameters(T_VBVMR_INTERFACE *iVMR, char *command)
 {
+    log_trace("VBVMR_SetParameters(%s)", command);
     return iVMR->VBVMR_SetParameters(command);
 }
 

src/vmrcli.c

@@ -42,10 +42,10 @@ int main(int argc, char *argv[])
     if (argc == 1)
     {
         help();
-        return EXIT_SUCCESS;
+        exit(EXIT_SUCCESS);
     }
 
-    log_set_level(LOG_INFO);
+    log_set_level(LOG_WARN);
 
     while ((opt = getopt(argc, argv, "k:ihD:")) != -1)
     {
@@ -62,10 +62,18 @@ int main(int argc, char *argv[])
             help();
             exit(EXIT_SUCCESS);
         case 'D':
-            if ((dvalue = atoi(optarg)) && dvalue >= LOG_TRACE && dvalue <= LOG_FATAL)
+            dvalue = atoi(optarg);
+            if (dvalue >= LOG_TRACE && dvalue <= LOG_FATAL)
             {
                 log_set_level(dvalue);
             }
+            else
+            {
+                fputs(
+                    "-D arg out of range, expected value from 0 up to 5\n"
+                    "Log level will default to LOG_WARN (3).\n",
+                    stderr);
+            }
             break;
         default:
             abort();
@@ -104,7 +112,7 @@ int main(int argc, char *argv[])
 void help()
 {
     puts(
-        "Usage: ./vmrcli.exe [-i] [-k] <api commands>\n"
+        "Usage: ./vmrcli.exe [-i] [-k] [-D] <api commands>\n"
         "Where: \n"
         "\ti: Enable interactive mode\n"
         "\tk: The kind of Voicemeeter (basic, banana, potato)\n"
@@ -177,7 +185,7 @@ void interactive(T_VBVMR_INTERFACE *vmr)
             char command[MAX_LINE];
             int i = 0;
 
-            while (!isspace(*p) && *p != EOF)
+            while (!isspace(*p))
                 command[i++] = *p++;
             command[i] = '\0';
             p++; /* shift to next char */
@@ -218,13 +226,13 @@ void parse_command(T_VBVMR_INTERFACE *vmr, char *command)
         switch (res.type)
         {
         case FLOAT_T:
-            printf("%.2f\n", res.val.f);
+            printf("%.1f\n", res.val.f);
             break;
         case STRING_T:
             puts(res.val.s);
             break;
         default:
-            fputs("Unknown result...", stderr);
+            fputs("Unexpected result type", stderr);
             break;
         }
     }