define mb function pointers in the iVMR interface.

add trace logs for login, logout and mb functions

include/cdll.h

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

include/util.h

@@ -3,7 +3,7 @@
 
 void remove_name_in_path(char *szPath);
 int replace_multiple_space_with_one(char *s, size_t len);
-char *kind_as_string(char *s, enum kind kind, int n);
+char *kind_as_string(char *s, int kind, int n);
 char *version_as_string(char *, long v, int n);
 
 #endif /* __UTIL_H__ */

include/vmr.h

@@ -6,6 +6,7 @@
 
 enum kind
 {
+    UNKNOWN = -1,
     BASIC = 1,
     BANANA,
     POTATO,
@@ -16,23 +17,23 @@ enum kind
     STREAMERVIEW
 };
 
-long login(T_VBVMR_INTERFACE *vmr, int kind);
+long login(PT_VMR vmr, int kind);
-long logout(T_VBVMR_INTERFACE *vmr);
+long logout(PT_VMR vmr);
-long run_voicemeeter(T_VBVMR_INTERFACE *vmr, int kind);
+long run_voicemeeter(PT_VMR vmr, int kind);
-long type(T_VBVMR_INTERFACE *vmr, long *type);
+long type(PT_VMR vmr, long *type);
-long version(T_VBVMR_INTERFACE *vmr, long *version);
+long version(PT_VMR vmr, long *version);
 
-bool is_pdirty(T_VBVMR_INTERFACE *vmr);
+bool is_pdirty(PT_VMR vmr);
-long get_parameter_float(T_VBVMR_INTERFACE *vmr, char *param, float *f);
+long get_parameter_float(PT_VMR vmr, char *param, float *f);
-long get_parameter_string(T_VBVMR_INTERFACE *vmr, char *param, unsigned short *s);
+long get_parameter_string(PT_VMR vmr, char *param, unsigned short *s);
-long set_parameter_float(T_VBVMR_INTERFACE *vmr, char *param, float val);
+long set_parameter_float(PT_VMR vmr, char *param, float val);
-long set_parameter_string(T_VBVMR_INTERFACE *vmr, char *param, char *s);
+long set_parameter_string(PT_VMR vmr, char *param, char *s);
-long set_parameters(T_VBVMR_INTERFACE *vmr, char *command);
+long set_parameters(PT_VMR vmr, char *command);
 
-bool is_mdirty(T_VBVMR_INTERFACE *vmr);
+bool is_mdirty(PT_VMR vmr);
-long macrobutton_getstatus(T_VBVMR_INTERFACE *vmr, long n, float *val, long mode);
+long macrobutton_getstatus(PT_VMR vmr, long n, float *val, long mode);
-long macrobutton_setstatus(T_VBVMR_INTERFACE *vmr, long n, float val, long mode);
+long macrobutton_setstatus(PT_VMR vmr, long n, float val, long mode);
 
-void clear_dirty(T_VBVMR_INTERFACE *vmr);
+void clear_dirty(PT_VMR vmr);
 
 #endif /* __VMR_H__ */

src/cdll.c

@@ -1,5 +1,6 @@
 #include <stdbool.h>
 #include <stdio.h>
+#include <windows.h>
 #include "cdll.h"
 #include "util.h"
 
@@ -58,11 +59,11 @@ bool __cdecl registry_get_voicemeeter_folder(char *szDir)
 /*******************************************************************************/
 /**                                GET DLL INTERFACE                          **/
 /*******************************************************************************/
-long initialize_dll_interfaces(T_VBVMR_INTERFACE *iVMR)
+long initialize_dll_interfaces(PT_VMR vmr)
 {
     HMODULE G_H_Module = NULL;
     char szDllName[1024];
-    memset(iVMR, 0, sizeof(T_VBVMR_INTERFACE));
+    memset(vmr, 0, sizeof(T_VBVMR_INTERFACE));
 
     // get Voicemeeter installation directory
     if (!registry_get_voicemeeter_folder(szDllName))
@@ -82,78 +83,89 @@ long initialize_dll_interfaces(T_VBVMR_INTERFACE *iVMR)
         return -101;
 
     // Get function pointers
-    iVMR->VBVMR_Login = (T_VBVMR_Login)GetProcAddress(G_H_Module, "VBVMR_Login");
+    vmr->VBVMR_Login = (T_VBVMR_Login)GetProcAddress(G_H_Module, "VBVMR_Login");
-    iVMR->VBVMR_Logout = (T_VBVMR_Logout)GetProcAddress(G_H_Module, "VBVMR_Logout");
+    vmr->VBVMR_Logout = (T_VBVMR_Logout)GetProcAddress(G_H_Module, "VBVMR_Logout");
-    iVMR->VBVMR_RunVoicemeeter = (T_VBVMR_RunVoicemeeter)GetProcAddress(G_H_Module, "VBVMR_RunVoicemeeter");
+    vmr->VBVMR_RunVoicemeeter = (T_VBVMR_RunVoicemeeter)GetProcAddress(G_H_Module, "VBVMR_RunVoicemeeter");
-    iVMR->VBVMR_GetVoicemeeterType = (T_VBVMR_GetVoicemeeterType)GetProcAddress(G_H_Module, "VBVMR_GetVoicemeeterType");
+    vmr->VBVMR_GetVoicemeeterType = (T_VBVMR_GetVoicemeeterType)GetProcAddress(G_H_Module, "VBVMR_GetVoicemeeterType");
-    iVMR->VBVMR_GetVoicemeeterVersion = (T_VBVMR_GetVoicemeeterVersion)GetProcAddress(G_H_Module, "VBVMR_GetVoicemeeterVersion");
+    vmr->VBVMR_GetVoicemeeterVersion = (T_VBVMR_GetVoicemeeterVersion)GetProcAddress(G_H_Module, "VBVMR_GetVoicemeeterVersion");
 
-    iVMR->VBVMR_IsParametersDirty = (T_VBVMR_IsParametersDirty)GetProcAddress(G_H_Module, "VBVMR_IsParametersDirty");
+    vmr->VBVMR_IsParametersDirty = (T_VBVMR_IsParametersDirty)GetProcAddress(G_H_Module, "VBVMR_IsParametersDirty");
-    iVMR->VBVMR_GetParameterFloat = (T_VBVMR_GetParameterFloat)GetProcAddress(G_H_Module, "VBVMR_GetParameterFloat");
+    vmr->VBVMR_GetParameterFloat = (T_VBVMR_GetParameterFloat)GetProcAddress(G_H_Module, "VBVMR_GetParameterFloat");
-    iVMR->VBVMR_GetParameterStringA = (T_VBVMR_GetParameterStringA)GetProcAddress(G_H_Module, "VBVMR_GetParameterStringA");
+    vmr->VBVMR_GetParameterStringA = (T_VBVMR_GetParameterStringA)GetProcAddress(G_H_Module, "VBVMR_GetParameterStringA");
-    iVMR->VBVMR_GetParameterStringW = (T_VBVMR_GetParameterStringW)GetProcAddress(G_H_Module, "VBVMR_GetParameterStringW");
+    vmr->VBVMR_GetParameterStringW = (T_VBVMR_GetParameterStringW)GetProcAddress(G_H_Module, "VBVMR_GetParameterStringW");
-    iVMR->VBVMR_GetLevel = (T_VBVMR_GetLevel)GetProcAddress(G_H_Module, "VBVMR_GetLevel");
+    vmr->VBVMR_GetLevel = (T_VBVMR_GetLevel)GetProcAddress(G_H_Module, "VBVMR_GetLevel");
-    iVMR->VBVMR_GetMidiMessage = (T_VBVMR_GetMidiMessage)GetProcAddress(G_H_Module, "VBVMR_GetMidiMessage");
+    vmr->VBVMR_GetMidiMessage = (T_VBVMR_GetMidiMessage)GetProcAddress(G_H_Module, "VBVMR_GetMidiMessage");
 
-    iVMR->VBVMR_SetParameterFloat = (T_VBVMR_SetParameterFloat)GetProcAddress(G_H_Module, "VBVMR_SetParameterFloat");
+    vmr->VBVMR_SetParameterFloat = (T_VBVMR_SetParameterFloat)GetProcAddress(G_H_Module, "VBVMR_SetParameterFloat");
-    iVMR->VBVMR_SetParameters = (T_VBVMR_SetParameters)GetProcAddress(G_H_Module, "VBVMR_SetParameters");
+    vmr->VBVMR_SetParameters = (T_VBVMR_SetParameters)GetProcAddress(G_H_Module, "VBVMR_SetParameters");
-    iVMR->VBVMR_SetParametersW = (T_VBVMR_SetParametersW)GetProcAddress(G_H_Module, "VBVMR_SetParametersW");
+    vmr->VBVMR_SetParametersW = (T_VBVMR_SetParametersW)GetProcAddress(G_H_Module, "VBVMR_SetParametersW");
-    iVMR->VBVMR_SetParameterStringA = (T_VBVMR_SetParameterStringA)GetProcAddress(G_H_Module, "VBVMR_SetParameterStringA");
+    vmr->VBVMR_SetParameterStringA = (T_VBVMR_SetParameterStringA)GetProcAddress(G_H_Module, "VBVMR_SetParameterStringA");
-    iVMR->VBVMR_SetParameterStringW = (T_VBVMR_SetParameterStringW)GetProcAddress(G_H_Module, "VBVMR_SetParameterStringW");
+    vmr->VBVMR_SetParameterStringW = (T_VBVMR_SetParameterStringW)GetProcAddress(G_H_Module, "VBVMR_SetParameterStringW");
 
-    iVMR->VBVMR_Output_GetDeviceNumber = (T_VBVMR_Output_GetDeviceNumber)GetProcAddress(G_H_Module, "VBVMR_Output_GetDeviceNumber");
+    vmr->VBVMR_Output_GetDeviceNumber = (T_VBVMR_Output_GetDeviceNumber)GetProcAddress(G_H_Module, "VBVMR_Output_GetDeviceNumber");
-    iVMR->VBVMR_Output_GetDeviceDescA = (T_VBVMR_Output_GetDeviceDescA)GetProcAddress(G_H_Module, "VBVMR_Output_GetDeviceDescA");
+    vmr->VBVMR_Output_GetDeviceDescA = (T_VBVMR_Output_GetDeviceDescA)GetProcAddress(G_H_Module, "VBVMR_Output_GetDeviceDescA");
-    iVMR->VBVMR_Output_GetDeviceDescW = (T_VBVMR_Output_GetDeviceDescW)GetProcAddress(G_H_Module, "VBVMR_Output_GetDeviceDescW");
+    vmr->VBVMR_Output_GetDeviceDescW = (T_VBVMR_Output_GetDeviceDescW)GetProcAddress(G_H_Module, "VBVMR_Output_GetDeviceDescW");
-    iVMR->VBVMR_Input_GetDeviceNumber = (T_VBVMR_Input_GetDeviceNumber)GetProcAddress(G_H_Module, "VBVMR_Input_GetDeviceNumber");
+    vmr->VBVMR_Input_GetDeviceNumber = (T_VBVMR_Input_GetDeviceNumber)GetProcAddress(G_H_Module, "VBVMR_Input_GetDeviceNumber");
-    iVMR->VBVMR_Input_GetDeviceDescA = (T_VBVMR_Input_GetDeviceDescA)GetProcAddress(G_H_Module, "VBVMR_Input_GetDeviceDescA");
+    vmr->VBVMR_Input_GetDeviceDescA = (T_VBVMR_Input_GetDeviceDescA)GetProcAddress(G_H_Module, "VBVMR_Input_GetDeviceDescA");
-    iVMR->VBVMR_Input_GetDeviceDescW = (T_VBVMR_Input_GetDeviceDescW)GetProcAddress(G_H_Module, "VBVMR_Input_GetDeviceDescW");
+    vmr->VBVMR_Input_GetDeviceDescW = (T_VBVMR_Input_GetDeviceDescW)GetProcAddress(G_H_Module, "VBVMR_Input_GetDeviceDescW");
+
+    vmr->VBVMR_MacroButton_IsDirty = (T_VBVMR_MacroButton_IsDirty)GetProcAddress(G_H_Module, "VBVMR_MacroButton_IsDirty");
+    vmr->VBVMR_MacroButton_GetStatus = (T_VBVMR_MacroButton_GetStatus)GetProcAddress(G_H_Module, "VBVMR_MacroButton_GetStatus");
+    vmr->VBVMR_MacroButton_SetStatus = (T_VBVMR_MacroButton_SetStatus)GetProcAddress(G_H_Module, "VBVMR_MacroButton_SetStatus");
 
     // check pointers are valid
-    if (iVMR->VBVMR_Login == NULL)
+    if (vmr->VBVMR_Login == NULL)
         return -1;
-    if (iVMR->VBVMR_Logout == NULL)
+    if (vmr->VBVMR_Logout == NULL)
         return -2;
-    if (iVMR->VBVMR_RunVoicemeeter == NULL)
+    if (vmr->VBVMR_RunVoicemeeter == NULL)
         return -2;
-    if (iVMR->VBVMR_GetVoicemeeterType == NULL)
+    if (vmr->VBVMR_GetVoicemeeterType == NULL)
         return -3;
-    if (iVMR->VBVMR_GetVoicemeeterVersion == NULL)
+    if (vmr->VBVMR_GetVoicemeeterVersion == NULL)
         return -4;
-    if (iVMR->VBVMR_IsParametersDirty == NULL)
+    if (vmr->VBVMR_IsParametersDirty == NULL)
         return -5;
-    if (iVMR->VBVMR_GetParameterFloat == NULL)
+    if (vmr->VBVMR_GetParameterFloat == NULL)
         return -6;
-    if (iVMR->VBVMR_GetParameterStringA == NULL)
+    if (vmr->VBVMR_GetParameterStringA == NULL)
         return -7;
-    if (iVMR->VBVMR_GetParameterStringW == NULL)
+    if (vmr->VBVMR_GetParameterStringW == NULL)
         return -8;
-    if (iVMR->VBVMR_GetLevel == NULL)
+    if (vmr->VBVMR_GetLevel == NULL)
         return -9;
-    if (iVMR->VBVMR_SetParameterFloat == NULL)
+    if (vmr->VBVMR_SetParameterFloat == NULL)
         return -10;
-    if (iVMR->VBVMR_SetParameters == NULL)
+    if (vmr->VBVMR_SetParameters == NULL)
         return -11;
-    if (iVMR->VBVMR_SetParametersW == NULL)
+    if (vmr->VBVMR_SetParametersW == NULL)
         return -12;
-    if (iVMR->VBVMR_SetParameterStringA == NULL)
+    if (vmr->VBVMR_SetParameterStringA == NULL)
         return -13;
-    if (iVMR->VBVMR_SetParameterStringW == NULL)
+    if (vmr->VBVMR_SetParameterStringW == NULL)
         return -14;
-    if (iVMR->VBVMR_GetMidiMessage == NULL)
+    if (vmr->VBVMR_GetMidiMessage == NULL)
         return -15;
 
-    if (iVMR->VBVMR_Output_GetDeviceNumber == NULL)
+    if (vmr->VBVMR_Output_GetDeviceNumber == NULL)
         return -30;
-    if (iVMR->VBVMR_Output_GetDeviceDescA == NULL)
+    if (vmr->VBVMR_Output_GetDeviceDescA == NULL)
         return -31;
-    if (iVMR->VBVMR_Output_GetDeviceDescW == NULL)
+    if (vmr->VBVMR_Output_GetDeviceDescW == NULL)
         return -32;
-    if (iVMR->VBVMR_Input_GetDeviceNumber == NULL)
+    if (vmr->VBVMR_Input_GetDeviceNumber == NULL)
         return -33;
-    if (iVMR->VBVMR_Input_GetDeviceDescA == NULL)
+    if (vmr->VBVMR_Input_GetDeviceDescA == NULL)
         return -34;
-    if (iVMR->VBVMR_Input_GetDeviceDescW == NULL)
+    if (vmr->VBVMR_Input_GetDeviceDescW == NULL)
         return -35;
 
+    if (vmr->VBVMR_MacroButton_IsDirty == NULL)
+        return -36;
+    if (vmr->VBVMR_MacroButton_GetStatus == NULL)
+        return -37;
+    if (vmr->VBVMR_MacroButton_SetStatus == NULL)
+        return -38;
+
     return 0;
 }

src/util.c

@@ -70,9 +70,9 @@ int replace_multiple_space_with_one(char *s, size_t len)
  * @param n maximum number of characters to be written to the buffer
  * @return char* The kind of Voicemeeter as a string
  */
-char *kind_as_string(char *s, enum kind kind, int n)
+char *kind_as_string(char *s, int kind, int n)
 {
-    char *kinds[] = {
+    static const char *kinds[] = {
         "Basic",
         "Banana",
         "Potato",

src/vmr.c

@@ -17,11 +17,12 @@
  * @param kind
  * @return long
  */
-long login(T_VBVMR_INTERFACE *vmr, int kind)
+long login(PT_VMR vmr, int kind)
 {
     int rep;
     long v;
 
+    log_trace("VBVMR_Login()");
     rep = vmr->VBVMR_Login();
     if (rep == 1)
     {
@@ -61,87 +62,91 @@ long login(T_VBVMR_INTERFACE *vmr, int kind)
  * @param vmr The API interface as a struct
  * @return long VBVMR_Logout return value
  */
-long logout(T_VBVMR_INTERFACE *vmr)
+long logout(PT_VMR vmr)
 {
     int rep;
 
     Sleep(20); /* give time for last command */
+    log_trace("VBVMR_Logout()");
     rep = vmr->VBVMR_Logout();
     if (rep == 0)
         log_info("Successfully logged out of the Voicemeeter API");
     return rep;
 }
 
-long run_voicemeeter(T_VBVMR_INTERFACE *vmr, int kind)
+long run_voicemeeter(PT_VMR vmr, int kind)
 {
     log_trace("VBVMR_RunVoicemeeter(%d)", kind);
     return vmr->VBVMR_RunVoicemeeter((long)kind);
 }
 
-long type(T_VBVMR_INTERFACE *vmr, long *type)
+long type(PT_VMR vmr, long *type)
 {
     log_trace("VBVMR_GetVoicemeeterType(<long> *t)");
     return vmr->VBVMR_GetVoicemeeterType(type);
 }
 
-long version(T_VBVMR_INTERFACE *vmr, long *version)
+long version(PT_VMR vmr, long *version)
 {
     log_trace("VBVMR_GetVoicemeeterVersion(<long> *v)");
     return vmr->VBVMR_GetVoicemeeterVersion(version);
 }
 
-bool is_pdirty(T_VBVMR_INTERFACE *vmr)
+bool is_pdirty(PT_VMR vmr)
 {
     log_trace("VBVMR_IsParametersDirty()");
     return vmr->VBVMR_IsParametersDirty() == 1;
 }
 
-long get_parameter_float(T_VBVMR_INTERFACE *vmr, char *param, float *f)
+long get_parameter_float(PT_VMR vmr, char *param, float *f)
 {
     log_trace("VBVMR_GetParameterFloat(%s, <float> *f)", param);
     return vmr->VBVMR_GetParameterFloat(param, f);
 }
 
-long get_parameter_string(T_VBVMR_INTERFACE *vmr, char *param, unsigned short *s)
+long get_parameter_string(PT_VMR vmr, char *param, unsigned short *s)
 {
     log_trace("VBVMR_GetParameterStringW(%s, <unsigned short> *s)", param);
     return vmr->VBVMR_GetParameterStringW(param, s);
 }
 
-long set_parameter_float(T_VBVMR_INTERFACE *vmr, char *param, float val)
+long set_parameter_float(PT_VMR vmr, char *param, float val)
 {
     log_trace("VBVMR_SetParameterFloat(%s, %.1f)", param, val);
     return vmr->VBVMR_SetParameterFloat(param, val);
 }
 
-long set_parameter_string(T_VBVMR_INTERFACE *vmr, char *param, char *s)
+long set_parameter_string(PT_VMR vmr, char *param, char *s)
 {
     log_trace("VBVMR_SetParameterStringA(%s, %s)", param, s);
     return vmr->VBVMR_SetParameterStringA(param, s);
 }
 
-long set_parameters(T_VBVMR_INTERFACE *vmr, char *command)
+long set_parameters(PT_VMR vmr, char *command)
 {
     log_trace("VBVMR_SetParameters(%s)", command);
     return vmr->VBVMR_SetParameters(command);
 }
 
-bool is_mdirty(T_VBVMR_INTERFACE *vmr)
+bool is_mdirty(PT_VMR vmr)
 {
+    log_trace("VBVMR_MacroButton_IsDirty()");
     return vmr->VBVMR_MacroButton_IsDirty() == 1;
 }
 
-long macrobutton_getstatus(T_VBVMR_INTERFACE *vmr, long n, float *val, long mode)
+long macrobutton_getstatus(PT_VMR vmr, long n, float *val, long mode)
 {
+    log_trace("VBVMR_MacroButton_GetStatus(%ld, <float> *v, %ld)", n, mode);
     return vmr->VBVMR_MacroButton_GetStatus(n, val, mode);
 }
 
-long macrobutton_setstatus(T_VBVMR_INTERFACE *vmr, long n, float val, long mode)
+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(T_VBVMR_INTERFACE *vmr)
+void clear_dirty(PT_VMR vmr)
 {
     Sleep(30);
     while (is_pdirty(vmr))

src/vmrcli.c

@@ -2,6 +2,8 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <getopt.h>
+#include <string.h>
+#include <ctype.h>
 #include "cdll.h"
 #include "vmr.h"
 #include "log.h"
@@ -34,23 +36,23 @@ struct result
     } val;
 };
 
+static T_VBVMR_INTERFACE iVMR;
+bool vflag = false;
+
 void help(void);
 enum kind set_kind(char *kval);
-int init_voicemeeter(T_VBVMR_INTERFACE *vmr, int kind);
+int init_voicemeeter(PT_VMR vmr, enum kind kind);
-void interactive(T_VBVMR_INTERFACE *vmr);
+void interactive(PT_VMR vmr);
-void parse_input(T_VBVMR_INTERFACE *vmr, char *input, int len);
+void parse_input(PT_VMR vmr, char *input, int len);
-void parse_command(T_VBVMR_INTERFACE *vmr, char *command);
+void parse_command(PT_VMR vmr, char *command);
-void get(T_VBVMR_INTERFACE *vmr, char *command, struct result *res);
+void get(PT_VMR vmr, char *command, struct result *res);
-
-bool vflag = false;
 
 int main(int argc, char *argv[])
 {
-    bool iflag = false;
+    bool iflag = false,
-    bool mflag = false;
+         mflag = false,
-    bool sflag = false;
+         sflag = false;
     int opt;
-    char *kvalue = "";
     int dvalue;
     enum kind kind = BANANAX64;
 
@@ -70,8 +72,12 @@ int main(int argc, char *argv[])
             help();
             exit(EXIT_SUCCESS);
         case 'k':
-            kvalue = optarg;
+            kind = set_kind(optarg);
-            kind = set_kind(kvalue);
+            if (kind == UNKNOWN)
+            {
+                log_fatal("Unknown Voicemeeter kind '%s'", optarg);
+                exit(EXIT_FAILURE);
+            }
             break;
         case 'm':
             mflag = true;
@@ -90,7 +96,7 @@ int main(int argc, char *argv[])
             }
             else
             {
-                log_error(
+                log_warn(
                     "-D arg out of range, expected value from 0 up to 5\n"
                     "Log level will default to LOG_WARN (3).\n");
             }
@@ -103,8 +109,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    T_VBVMR_INTERFACE iVMR;
+    PT_VMR vmr = &iVMR;
-    T_VBVMR_INTERFACE *vmr = &iVMR;
 
     int rep = init_voicemeeter(vmr, kind);
     if (rep != 0)
@@ -159,7 +164,7 @@ void help()
         "\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"
         "\tm: Launch the MacroButtons application\n"
-        "\tm: Launch the StreamerView application");
+        "\ts: Launch the StreamerView application");
 }
 
 /**
@@ -193,8 +198,7 @@ enum kind set_kind(char *kval)
     }
     else
     {
-        log_error("Unknown Voicemeeter kind '%s'\n", kval);
+        return UNKNOWN;
-        exit(EXIT_FAILURE);
     }
 }
 
@@ -206,18 +210,18 @@ enum kind set_kind(char *kval)
  * @param kind
  * @return int
  */
-int init_voicemeeter(T_VBVMR_INTERFACE *vmr, int kind)
+int init_voicemeeter(PT_VMR vmr, enum kind kind)
 {
     int rep = initialize_dll_interfaces(vmr);
     if (rep < 0)
     {
         if (rep == -100)
         {
-            log_error("Voicemeeter is not installed");
+            log_fatal("Voicemeeter is not installed");
         }
         else
         {
-            log_error("Error loading Voicemeeter dll with code %d\n", rep);
+            log_fatal("Error loading Voicemeeter dll with code %d\n", rep);
         }
         return rep;
     }
@@ -225,7 +229,7 @@ int init_voicemeeter(T_VBVMR_INTERFACE *vmr, int kind)
     rep = login(vmr, kind);
     if (rep != 0)
     {
-        log_error("Error logging into Voicemeeter");
+        log_fatal("Error logging into Voicemeeter");
         return rep;
     }
 
@@ -239,7 +243,7 @@ int init_voicemeeter(T_VBVMR_INTERFACE *vmr, int kind)
  *
  * @param vmr The API interface as a struct
  */
-void interactive(T_VBVMR_INTERFACE *vmr)
+void interactive(PT_VMR vmr)
 {
     char input[MAX_LINE];
     size_t len;
@@ -267,7 +271,7 @@ void interactive(T_VBVMR_INTERFACE *vmr)
  * @param input Each input line, from stdin or CLI args
  * @param len The length of the input line
  */
-void parse_input(T_VBVMR_INTERFACE *vmr, char *input, int len)
+void parse_input(PT_VMR vmr, char *input, int len)
 {
     char *token;
 
@@ -288,7 +292,7 @@ void parse_input(T_VBVMR_INTERFACE *vmr, char *input, int len)
  * @param vmr The API interface as a struct
  * @param command Each token from the input line as its own command string
  */
-void parse_command(T_VBVMR_INTERFACE *vmr, char *command)
+void parse_command(PT_VMR vmr, char *command)
 {
     log_debug("Parsing %s", command);
 
@@ -348,7 +352,7 @@ void parse_command(T_VBVMR_INTERFACE *vmr, char *command)
  * @param command A parsed 'get' command as a string
  * @param res A struct holding the result of the API call.
  */
-void get(T_VBVMR_INTERFACE *vmr, char *command, struct result *res)
+void get(PT_VMR vmr, char *command, struct result *res)
 {
     clear_dirty(vmr);
     if (get_parameter_float(vmr, command, &res->val.f) != 0)