Compare commits

...

4 Commits

Author SHA1 Message Date
760924def8 upd README 2024-06-27 01:18:25 +01:00
7b7d4fc2c7 add log trace messages to vmr.c 2024-06-27 01:18:17 +01:00
0b6e0800ce default log level to LOG_WARN
write message to stderr if -D flag out of range
2024-06-27 01:17:59 +01:00
4488a386b8 move includes into header guards 2024-06-27 01:17:09 +01:00
5 changed files with 25 additions and 11 deletions

View File

@ -38,7 +38,7 @@ Launch banana GUI, set log level to DEBUG, set Strip 0 label to podmic then prin
## `Script files` ## `Script files`
Scripts can be loaded from text files, for example: Scripts can be loaded from text files, for example in Powershell:
```powershell ```powershell
./vmrcli.exe -D1 $(Get-Content .\example_commands.txt) ./vmrcli.exe -D1 $(Get-Content .\example_commands.txt)

View File

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

View File

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

View File

@ -51,6 +51,7 @@ long logout(T_VBVMR_INTERFACE *iVMR)
long run_voicemeeter(T_VBVMR_INTERFACE *iVMR, int kind) long run_voicemeeter(T_VBVMR_INTERFACE *iVMR, int kind)
{ {
log_trace("VBVMR_RunVoicemeeter(%d)", kind);
return iVMR->VBVMR_RunVoicemeeter((long)kind); return iVMR->VBVMR_RunVoicemeeter((long)kind);
} }
@ -71,26 +72,31 @@ bool is_pdirty(T_VBVMR_INTERFACE *iVMR)
long get_parameter_float(T_VBVMR_INTERFACE *iVMR, char *param, float *f) long get_parameter_float(T_VBVMR_INTERFACE *iVMR, char *param, float *f)
{ {
log_trace("VBVMR_GetParameterFloat(%s, %f)", param, f);
return iVMR->VBVMR_GetParameterFloat(param, f); return iVMR->VBVMR_GetParameterFloat(param, f);
} }
long get_parameter_string(T_VBVMR_INTERFACE *iVMR, char *param, char *s) long get_parameter_string(T_VBVMR_INTERFACE *iVMR, char *param, char *s)
{ {
log_trace("VBVMR_GetParameterStringA(%s, %s)", param, s);
return iVMR->VBVMR_GetParameterStringA(param, s); return iVMR->VBVMR_GetParameterStringA(param, s);
} }
long set_parameter_float(T_VBVMR_INTERFACE *iVMR, char *param, float val) long set_parameter_float(T_VBVMR_INTERFACE *iVMR, char *param, float val)
{ {
log_trace("VBVMR_SetParameterFloat(%s, %f)", param, val);
return iVMR->VBVMR_SetParameterFloat(param, val); return iVMR->VBVMR_SetParameterFloat(param, val);
} }
long set_parameter_string(T_VBVMR_INTERFACE *iVMR, char *param, char *s) 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); return iVMR->VBVMR_SetParameterStringA(param, s);
} }
long set_parameters(T_VBVMR_INTERFACE *iVMR, char *command) long set_parameters(T_VBVMR_INTERFACE *iVMR, char *command)
{ {
log_trace("VBVMR_SetParameters(%s)", command);
return iVMR->VBVMR_SetParameters(command); return iVMR->VBVMR_SetParameters(command);
} }

View File

@ -42,10 +42,10 @@ int main(int argc, char *argv[])
if (argc == 1) if (argc == 1)
{ {
help(); 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) while ((opt = getopt(argc, argv, "k:ihD:")) != -1)
{ {
@ -62,10 +62,18 @@ int main(int argc, char *argv[])
help(); help();
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
case 'D': 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); 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; break;
default: default:
abort(); abort();
@ -224,7 +232,7 @@ void parse_command(T_VBVMR_INTERFACE *vmr, char *command)
puts(res.val.s); puts(res.val.s);
break; break;
default: default:
fputs("Unknown result...", stderr); fputs("Unexpected result type", stderr);
break; break;
} }
} }