onyx_online/vmrcli
1
0
Fork 0
mirror of https://github.com/onyx-and-iris/vmrcli.git synced 2026-04-20 10:13:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: onyx_online:v0.4.0
Branches Tags
onyx_online:main onyx_online:fix-parser
onyx_online:v0.14.1 onyx_online:v0.14.0 onyx_online:v0.13.0 onyx_online:v0.12.0 onyx_online:v0.11.0 onyx_online:v0.10.0 onyx_online:v0.9.0 onyx_online:v0.8.0 onyx_online:v0.7.1 onyx_online:v0.7.0 onyx_online:v0.6.0 onyx_online:v0.5.0 onyx_online:v0.4.0 onyx_online:v0.3.0 onyx_online:v0.2.1 onyx_online:v0.2.0 onyx_online:0.1.0
...
compare: onyx_online:a28db25bcca7265b24cc1917feba0662fb8cbc50
Branches Tags
onyx_online:main onyx_online:fix-parser
onyx_online:v0.14.1 onyx_online:v0.14.0 onyx_online:v0.13.0 onyx_online:v0.12.0 onyx_online:v0.11.0 onyx_online:v0.10.0 onyx_online:v0.9.0 onyx_online:v0.8.0 onyx_online:v0.7.1 onyx_online:v0.7.0 onyx_online:v0.6.0 onyx_online:v0.5.0 onyx_online:v0.4.0 onyx_online:v0.3.0 onyx_online:v0.2.1 onyx_online:v0.2.0 onyx_online:0.1.0

8 Commits
v0.4.0 ... a28db25bcc

Author SHA1 Message Date
onyx-and-iris
a28db25bcc define mb function pointers in the iVMR interface. 
add trace logs for login, logout and mb functions
 2024-07-04 12:19:04 +01:00
onyx-and-iris
83a85fd7c5 add new typedef struct *PT_VMR 
use it to pass around references to the iVMR instance
 2024-07-04 09:14:14 +01:00
onyx-and-iris
f6437fcbe7 make static 2024-07-03 17:52:08 +01:00
onyx-and-iris
fb54c4a492 fixes compiler error 'Incompatible pointer types' 2024-07-03 15:25:16 +01:00
onyx-and-iris
8aeb793a41 fixes compiler error 'Forward declaration of enums' 2024-07-03 15:24:44 +01:00
onyx-and-iris
b6b4b04a8a upd includes 2024-07-03 13:57:58 +01:00
onyx-and-iris
b7fa15d87d log_warn an incorrect -D arg. 
log_fatal possible exit points.
 2024-07-03 12:58:34 +01:00
onyx-and-iris
b95c40265c fix s flag in help message 2024-07-02 17:59:44 +01:00
8 changed files with 625 additions and 723 deletions
Expand all files Collapse all files

531
include/VoicemeeterRemote.h
View File

@@ -1,5 +1,5 @@
/******************************************************************************/ /******************************************************************************/
/* Voicemeeter Remote API. V.Burel©2015-2023 */ /* Voicemeeter Remote API. V.Burel<EFBFBD>2015-2023 */
/******************************************************************************/ /******************************************************************************/
/* This Library allows communication with Voicemeeter applications */ /* This Library allows communication with Voicemeeter applications */
/* 4 Client Applications can be connected to remote Voicemeeter. */ /* 4 Client Applications can be connected to remote Voicemeeter. */
@@ -19,25 +19,24 @@
/* long = 32 bit integer */ /* long = 32 bit integer */
/******************************************************************************/ /******************************************************************************/
#ifndef __VOICEMEETER_REMOTE_H__ #ifndef __VOICEMEETER_REMOTE_H__
#define __VOICEMEETER_REMOTE_H__ #define __VOICEMEETER_REMOTE_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C"
{
#endif #endif
#define VBVMR_RESULT_OK 0 #define VBVMR_RESULT_OK 0
/******************************************************************************/ /******************************************************************************/
/* */ /* */
/* Login */ /* Login */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
/** @name Communication Login / logout /** @name Communication Login / logout
* @{ */ * @{ */
/** /**
@brief Open Communication Pipe With Voicemeeter (typically called on software startup). @brief Open Communication Pipe With Voicemeeter (typically called on software startup).
@@ -47,15 +46,14 @@ extern "C" {
-2: unexpected login (logout was expected before). -2: unexpected login (logout was expected before).
*/ */
long __stdcall VBVMR_Login(void); long __stdcall VBVMR_Login(void);
/** /**
@brief Close Communication Pipe With Voicemeeter (typically called on software end). @brief Close Communication Pipe With Voicemeeter (typically called on software end).
@return : 0 if ok. @return : 0 if ok.
*/ */
long __stdcall VBVMR_Logout(void); long __stdcall VBVMR_Logout(void);
/** /**
@brief Run Voicemeeter Application (get installation directory and run Voicemeeter Application). @brief Run Voicemeeter Application (get installation directory and run Voicemeeter Application).
@@ -65,29 +63,18 @@ long __stdcall VBVMR_Logout(void);
-2: unknown vType number -2: unknown vType number
*/ */
long __stdcall VBVMR_RunVoicemeeter(long vType); long __stdcall VBVMR_RunVoicemeeter(long vType);
/** @} */
/** @} */ /******************************************************************************/
/* */
/* General Information */
/* */
/******************************************************************************/
/** @name General Information
* @{ */
/******************************************************************************/
/* */
/* General Information */
/* */
/******************************************************************************/
/** @name General Information
* @{ */
/** /**
@brief Get Voicemeeter Type @brief Get Voicemeeter Type
@@ -117,7 +104,7 @@ long __stdcall VBVMR_RunVoicemeeter(long vType);
-2: no server. -2: no server.
*/ */
long __stdcall VBVMR_GetVoicemeeterType(long * pType); long __stdcall VBVMR_GetVoicemeeterType(long *pType);
/** /**
@brief Get Voicemeeter Version @brief Get Voicemeeter Version
@@ -132,36 +119,18 @@ long __stdcall VBVMR_GetVoicemeeterType(long * pType);
-2: no server. -2: no server.
*/ */
long __stdcall VBVMR_GetVoicemeeterVersion(long * pVersion); long __stdcall VBVMR_GetVoicemeeterVersion(long *pVersion);
/** @} */
/** @} */ /******************************************************************************/
/* */
/* Get parameters */
/* */
/******************************************************************************/
/** @name Getting Parameters
* @{ */
/******************************************************************************/
/* */
/* Get parameters */
/* */
/******************************************************************************/
/** @name Getting Parameters
* @{ */
/** /**
@brief Check if parameters have changed. @brief Check if parameters have changed.
@@ -174,7 +143,7 @@ long __stdcall VBVMR_GetVoicemeeterVersion(long * pVersion);
-2: no server. -2: no server.
*/ */
long __stdcall VBVMR_IsParametersDirty(void); long __stdcall VBVMR_IsParametersDirty(void);
/** /**
@brief get parameter value. @brief get parameter value.
@@ -187,7 +156,7 @@ long __stdcall VBVMR_IsParametersDirty(void);
-5: structure mismatch -5: structure mismatch
*/ */
long __stdcall VBVMR_GetParameterFloat(char * szParamName, float * pValue); long __stdcall VBVMR_GetParameterFloat(char *szParamName, float *pValue);
/** /**
@brief get parameter value. @brief get parameter value.
@@ -200,27 +169,19 @@ long __stdcall VBVMR_GetParameterFloat(char * szParamName, float * pValue);
-5: structure mismatch -5: structure mismatch
*/ */
long __stdcall VBVMR_GetParameterStringA(char * szParamName, char * szString); long __stdcall VBVMR_GetParameterStringA(char *szParamName, char *szString);
long __stdcall VBVMR_GetParameterStringW(char * szParamName, unsigned short * wszString); long __stdcall VBVMR_GetParameterStringW(char *szParamName, unsigned short *wszString);
/** @} */ /** @} */
/******************************************************************************/
/* */
/* Get levels */
/* */
/******************************************************************************/
/** @name Getting RT Data
* @{ */
/******************************************************************************/
/* */
/* Get levels */
/* */
/******************************************************************************/
/** @name Getting RT Data
* @{ */
/** /**
@brief Get Current levels. @brief Get Current levels.
@@ -281,8 +242,7 @@ long __stdcall VBVMR_GetParameterStringW(char * szParamName, unsigned short * ws
-4: out of range -4: out of range
*/ */
long __stdcall VBVMR_GetLevel(long nType, long nuChannel, float * pValue); long __stdcall VBVMR_GetLevel(long nType, long nuChannel, float *pValue);
/** /**
@brief Get MIDI message from M.I.D.I. input device used by Voicemeeter M.I.D.I. mapping. @brief Get MIDI message from M.I.D.I. input device used by Voicemeeter M.I.D.I. mapping.
@@ -301,9 +261,7 @@ long __stdcall VBVMR_GetLevel(long nType, long nuChannel, float * pValue);
-6: no MIDI data -6: no MIDI data
*/ */
long __stdcall VBVMR_GetMidiMessage(unsigned char *pMIDIBuffer, long nbByteMax);
long __stdcall VBVMR_GetMidiMessage(unsigned char *pMIDIBuffer, long nbByteMax);
/** /**
@brief Send MIDI message to M.I.D.I. output device used by Voicemeeter M.I.D.I. mapping. @brief Send MIDI message to M.I.D.I. output device used by Voicemeeter M.I.D.I. mapping.
@@ -319,29 +277,18 @@ long __stdcall VBVMR_GetMidiMessage(unsigned char *pMIDIBuffer, long nbByteMax);
-5: cannot send MIDI data -5: cannot send MIDI data
*/ */
long __stdcall VBVMR_SendMidiMessage(unsigned char *pMIDIBuffer, long nbByte);
long __stdcall VBVMR_SendMidiMessage(unsigned char *pMIDIBuffer, long nbByte); /** @} */
/******************************************************************************/
/* */
/* Set Parameters */
/* */
/******************************************************************************/
/** @} */ /** @name Setting Parameters
* @{ */
/******************************************************************************/
/* */
/* Set Parameters */
/* */
/******************************************************************************/
/** @name Setting Parameters
* @{ */
/** /**
@brief Set a single float 32 bits parameters . @brief Set a single float 32 bits parameters .
@@ -359,9 +306,7 @@ long __stdcall VBVMR_SendMidiMessage(unsigned char *pMIDIBuffer, long nbByte);
-3: unknown parameter -3: unknown parameter
*/ */
long __stdcall VBVMR_SetParameterFloat(char * szParamName, float Value); long __stdcall VBVMR_SetParameterFloat(char *szParamName, float Value);
/** /**
@brief Set a single string parameters . @brief Set a single string parameters .
@@ -379,12 +324,8 @@ long __stdcall VBVMR_SetParameterFloat(char * szParamName, float Value);
*/ */
long __stdcall VBVMR_SetParameterStringA(char *szParamName, char *szString);
long __stdcall VBVMR_SetParameterStringA(char * szParamName, char * szString); long __stdcall VBVMR_SetParameterStringW(char *szParamName, unsigned short *wszString);
long __stdcall VBVMR_SetParameterStringW(char * szParamName, unsigned short * wszString);
/** /**
@brief Set one or several parameters by a script ( < 48 kB ). @brief Set one or several parameters by a script ( < 48 kB ).
@@ -407,29 +348,17 @@ long __stdcall VBVMR_SetParameterStringW(char * szParamName, unsigned short * ws
-4: unexpected error -4: unexpected error
*/ */
long __stdcall VBVMR_SetParameters(char * szParamScript); long __stdcall VBVMR_SetParameters(char *szParamScript);
long __stdcall VBVMR_SetParametersW(unsigned short * szParamScript); long __stdcall VBVMR_SetParametersW(unsigned short *szParamScript);
/** @} */
/** @} */ /******************************************************************************/
/* DEVICES ENUMERATOR */
/******************************************************************************/
/** @name Device Enumeration Functions
* @{ */
/******************************************************************************/
/* DEVICES ENUMERATOR */
/******************************************************************************/
/** @name Device Enumeration Functions
* @{ */
#define VBVMR_DEVTYPE_MME 1 #define VBVMR_DEVTYPE_MME 1
#define VBVMR_DEVTYPE_WDM 3 #define VBVMR_DEVTYPE_WDM 3
@@ -441,7 +370,7 @@ long __stdcall VBVMR_SetParametersW(unsigned short * szParamScript);
@return : return number of device found. @return : return number of device found.
*/ */
long __stdcall VBVMR_Output_GetDeviceNumber(void); long __stdcall VBVMR_Output_GetDeviceNumber(void);
/** /**
@brief Return pointer on Output Device Descriptor according index @brief Return pointer on Output Device Descriptor according index
@@ -452,15 +381,15 @@ long __stdcall VBVMR_Output_GetDeviceNumber(void);
@return : 0: OK (no error). @return : 0: OK (no error).
*/ */
long __stdcall VBVMR_Output_GetDeviceDescA(long zindex, long * nType, char * szDeviceName, char * szHardwareId); long __stdcall VBVMR_Output_GetDeviceDescA(long zindex, long *nType, char *szDeviceName, char *szHardwareId);
long __stdcall VBVMR_Output_GetDeviceDescW(long zindex, long * nType, unsigned short * wszDeviceName, unsigned short * wszHardwareId); long __stdcall VBVMR_Output_GetDeviceDescW(long zindex, long *nType, unsigned short *wszDeviceName, unsigned short *wszHardwareId);
/** /**
@brief Get number of Audio Input Device available on the system @brief Get number of Audio Input Device available on the system
@return : return number of device found. @return : return number of device found.
*/ */
long __stdcall VBVMR_Input_GetDeviceNumber(void); long __stdcall VBVMR_Input_GetDeviceNumber(void);
/** /**
@brief Return pointer on Input Device Descriptor according index @brief Return pointer on Input Device Descriptor according index
@@ -471,50 +400,40 @@ long __stdcall VBVMR_Input_GetDeviceNumber(void);
@return : 0: OK (no error). @return : 0: OK (no error).
*/ */
long __stdcall VBVMR_Input_GetDeviceDescA(long zindex, long * nType, char * szDeviceName, char * szHardwareId); long __stdcall VBVMR_Input_GetDeviceDescA(long zindex, long *nType, char *szDeviceName, char *szHardwareId);
long __stdcall VBVMR_Input_GetDeviceDescW(long zindex, long * nType, unsigned short * wszDeviceName, unsigned short * wszHardwareId); long __stdcall VBVMR_Input_GetDeviceDescW(long zindex, long *nType, unsigned short *wszDeviceName, unsigned short *wszHardwareId);
/** @} */
/******************************************************************************/
/* VB-AUDIO CALLBACK */
/******************************************************************************/
/* 4x Functions to process all voicemeeter audio input and output channels */
/* */
/* VBVMR_AudioCallbackRegister :to register your audio callback(s) */
/* VBVMR_AudioCallbackStart :to start the audio stream */
/* VBVMR_AudioCallbackStop :to stop the audio stream */
/* VBVMR_AudioCallbackUnregister :to unregister / Release callback(s) */
/******************************************************************************/
/** @} */ /** @name VB-Audio Callback Functions
* @{ */
typedef struct tagVBVMR_AUDIOINFO
{
/******************************************************************************/
/* VB-AUDIO CALLBACK */
/******************************************************************************/
/* 4x Functions to process all voicemeeter audio input and output channels */
/* */
/* VBVMR_AudioCallbackRegister :to register your audio callback(s) */
/* VBVMR_AudioCallbackStart :to start the audio stream */
/* VBVMR_AudioCallbackStop :to stop the audio stream */
/* VBVMR_AudioCallbackUnregister :to unregister / Release callback(s) */
/******************************************************************************/
/** @name VB-Audio Callback Functions
* @{ */
typedef struct tagVBVMR_AUDIOINFO
{
long samplerate; long samplerate;
long nbSamplePerFrame; long nbSamplePerFrame;
} VBVMR_T_AUDIOINFO, *VBVMR_PT_AUDIOINFO, *VBVMR_LPT_AUDIOINFO; } VBVMR_T_AUDIOINFO, *VBVMR_PT_AUDIOINFO, *VBVMR_LPT_AUDIOINFO;
typedef struct tagVBVMR_AUDIOBUFFER
{
long audiobuffer_sr; //Sampling Rate
long audiobuffer_nbs; //number of sample per frame
long audiobuffer_nbi; //number of inputs
long audiobuffer_nbo; //number of outputs
float * audiobuffer_r[128]; //nbi input pointers containing frame of nbs sample (of 32bits float)
float * audiobuffer_w[128]; //nbo output pointers containing frame of nbs sample (of 32bits float)
} VBVMR_T_AUDIOBUFFER, *VBVMR_PT_AUDIOBUFFER, *VBVMR_LPT_AUDIOBUFFER;
typedef struct tagVBVMR_AUDIOBUFFER
{
long audiobuffer_sr; // Sampling Rate
long audiobuffer_nbs; // number of sample per frame
long audiobuffer_nbi; // number of inputs
long audiobuffer_nbo; // number of outputs
float *audiobuffer_r[128]; // nbi input pointers containing frame of nbs sample (of 32bits float)
float *audiobuffer_w[128]; // nbo output pointers containing frame of nbs sample (of 32bits float)
} VBVMR_T_AUDIOBUFFER, *VBVMR_PT_AUDIOBUFFER, *VBVMR_LPT_AUDIOBUFFER;
/** /**
@brief VB-AUDIO Callback is called for different task to Initialize, perform and end your process. @brief VB-AUDIO Callback is called for different task to Initialize, perform and end your process.
@@ -533,23 +452,21 @@ typedef struct tagVBVMR_AUDIOBUFFER
@return : 0: always 0 (unused). @return : 0: always 0 (unused).
*/ */
typedef long(__stdcall *T_VBVMR_VBAUDIOCALLBACK)(void *lpUser, long nCommand, void *lpData, long nnn);
typedef long (__stdcall *T_VBVMR_VBAUDIOCALLBACK)(void * lpUser, long nCommand, void * lpData, long nnn); #define VBVMR_CBCOMMAND_STARTING 1 // command to initialize data according SR and buffer size
// info = (VBVMR_LPT_AUDIOINFO)lpData
#define VBVMR_CBCOMMAND_ENDING 2 // command to release data
#define VBVMR_CBCOMMAND_CHANGE 3 // If change in audio stream, you will have to restart audio
#define VBVMR_CBCOMMAND_STARTING 1 //command to initialize data according SR and buffer size #define VBVMR_CBCOMMAND_BUFFER_IN 10 // input insert
//info = (VBVMR_LPT_AUDIOINFO)lpData #define VBVMR_CBCOMMAND_BUFFER_OUT 11 // bus output insert
#define VBVMR_CBCOMMAND_BUFFER_MAIN 20 // all i/o
// audiobuffer = (VBVMR_LPT_AUDIOBUFFER)lpData
// nnn = synchro = 1 if synchro with Voicemeeter
#define VBVMR_CBCOMMAND_ENDING 2 //command to release data /*
#define VBVMR_CBCOMMAND_CHANGE 3 //If change in audio stream, you will have to restart audio
#define VBVMR_CBCOMMAND_BUFFER_IN 10 //input insert
#define VBVMR_CBCOMMAND_BUFFER_OUT 11 //bus output insert
#define VBVMR_CBCOMMAND_BUFFER_MAIN 20 //all i/o
//audiobuffer = (VBVMR_LPT_AUDIOBUFFER)lpData
//nnn = synchro = 1 if synchro with Voicemeeter
/*
----------------------------------------------------- -----------------------------------------------------
AUDIO BUFFER for VBVMR_CBCOMMAND_BUFFER_IN AUDIO BUFFER for VBVMR_CBCOMMAND_BUFFER_IN
----------------------------------------------------- -----------------------------------------------------
@@ -572,9 +489,9 @@ typedef long (__stdcall *T_VBVMR_VBAUDIOCALLBACK)(void * lpUser, long nCommand,
| 00 | 01 | 02 | 03 | 04 | 05 | 06 | 07 | 08 | 09 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | 32 | 33 | | 00 | 01 | 02 | 03 | 04 | 05 | 06 | 07 | 08 | 09 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | 32 | 33 |
----------------------------------------------------- -----------------------------------------------------
AUDIO BUFFER for VBVMR_CBCOMMAND_BUFFER_OUT AUDIO BUFFER for VBVMR_CBCOMMAND_BUFFER_OUT
----------------------------------------------------- -----------------------------------------------------
VOICEMEETER VOICEMEETER
| Output A1 / A2 | Virtual Output | | Output A1 / A2 | Virtual Output |
@@ -603,9 +520,9 @@ typedef long (__stdcall *T_VBVMR_VBAUDIOCALLBACK)(void * lpUser, long nCommand,
| 40 | 41 | 42 | 43 | 44 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | 60 | 61 | 62 | 63 | | 40 | 41 | 42 | 43 | 44 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | 60 | 61 | 62 | 63 |
----------------------------------------------------- -----------------------------------------------------
AUDIO BUFFER for VBVMR_CBCOMMAND_BUFFER_MAIN AUDIO BUFFER for VBVMR_CBCOMMAND_BUFFER_MAIN
----------------------------------------------------- -----------------------------------------------------
VOICEMEETER VOICEMEETER
| Strip 1 | Strip 2 | Virtual Input | | Strip 1 | Strip 2 | Virtual Input |
@@ -656,7 +573,7 @@ typedef long (__stdcall *T_VBVMR_VBAUDIOCALLBACK)(void * lpUser, long nCommand,
| 40 | 41 | 42 | 43 | 44 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | 60 | 61 | 62 | 63 | | 40 | 41 | 42 | 43 | 44 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | 60 | 61 | 62 | 63 |
*/ */
/** /**
@brief register your audio callback function to receive real time audio buffer @brief register your audio callback function to receive real time audio buffer
@@ -678,11 +595,11 @@ typedef long (__stdcall *T_VBVMR_VBAUDIOCALLBACK)(void * lpUser, long nCommand,
1: callback already registered (by another application). 1: callback already registered (by another application).
*/ */
long __stdcall VBVMR_AudioCallbackRegister(long mode, T_VBVMR_VBAUDIOCALLBACK pCallback, void * lpUser, char szClientName[64]); long __stdcall VBVMR_AudioCallbackRegister(long mode, T_VBVMR_VBAUDIOCALLBACK pCallback, void *lpUser, char szClientName[64]);
#define VBVMR_AUDIOCALLBACK_IN 0x00000001 //to process input insert #define VBVMR_AUDIOCALLBACK_IN 0x00000001 // to process input insert
#define VBVMR_AUDIOCALLBACK_OUT 0x00000002 //to process output bus insert #define VBVMR_AUDIOCALLBACK_OUT 0x00000002 // to process output bus insert
#define VBVMR_AUDIOCALLBACK_MAIN 0x00000004 //to receive all i/o #define VBVMR_AUDIOCALLBACK_MAIN 0x00000004 // to receive all i/o
/** /**
@brief Start / Stop Audio processing @brief Start / Stop Audio processing
@@ -693,9 +610,8 @@ long __stdcall VBVMR_AudioCallbackRegister(long mode, T_VBVMR_VBAUDIOCALLBACK pC
-2: no callback registred. -2: no callback registred.
*/ */
long __stdcall VBVMR_AudioCallbackStart(void); long __stdcall VBVMR_AudioCallbackStart(void);
long __stdcall VBVMR_AudioCallbackStop(void); long __stdcall VBVMR_AudioCallbackStop(void);
/** /**
@brief unregister your callback to release voicemeeter virtual driver @brief unregister your callback to release voicemeeter virtual driver
@@ -706,25 +622,18 @@ long __stdcall VBVMR_AudioCallbackStop(void);
1: callback already unregistered. 1: callback already unregistered.
*/ */
long __stdcall VBVMR_AudioCallbackUnregister(void); long __stdcall VBVMR_AudioCallbackUnregister(void);
/** @} */
/******************************************************************************/
/* */
/* Macro Buttons */
/* */
/******************************************************************************/
/** @} */ /** @name Macro Buttons functions
* @{ */
/******************************************************************************/
/* */
/* Macro Buttons */
/* */
/******************************************************************************/
/** @name Macro Buttons functions
* @{ */
/** /**
@brief Check if Macro Buttons states changed. @brief Check if Macro Buttons states changed.
@@ -737,7 +646,7 @@ long __stdcall VBVMR_AudioCallbackUnregister(void);
-2: no server. -2: no server.
*/ */
long __stdcall VBVMR_MacroButton_IsDirty(void); long __stdcall VBVMR_MacroButton_IsDirty(void);
/** /**
@brief get current status of a given button. @brief get current status of a given button.
@@ -751,7 +660,7 @@ long __stdcall VBVMR_MacroButton_IsDirty(void);
-5: structure mismatch -5: structure mismatch
*/ */
long __stdcall VBVMR_MacroButton_GetStatus(long nuLogicalButton, float * pValue, long bitmode); long __stdcall VBVMR_MacroButton_GetStatus(long nuLogicalButton, float *pValue, long bitmode);
/** /**
@brief set current button value. @brief set current button value.
@@ -765,72 +674,59 @@ long __stdcall VBVMR_MacroButton_GetStatus(long nuLogicalButton, float * pValue,
-5: structure mismatch -5: structure mismatch
*/ */
long __stdcall VBVMR_MacroButton_SetStatus(long nuLogicalButton, float fValue, long bitmode); long __stdcall VBVMR_MacroButton_SetStatus(long nuLogicalButton, float fValue, long bitmode);
#define VBVMR_MACROBUTTON_MODE_DEFAULT 0x00000000 //PUSH or RELEASE button #define VBVMR_MACROBUTTON_MODE_DEFAULT 0x00000000 // PUSH or RELEASE button
#define VBVMR_MACROBUTTON_MODE_STATEONLY 0x00000002 //change Displayed State only #define VBVMR_MACROBUTTON_MODE_STATEONLY 0x00000002 // change Displayed State only
#define VBVMR_MACROBUTTON_MODE_TRIGGER 0x00000003 //change Trigger State #define VBVMR_MACROBUTTON_MODE_TRIGGER 0x00000003 // change Trigger State
#define VBVMR_MACROBUTTON_MODE_COLOR 0x00000004 //change color #define VBVMR_MACROBUTTON_MODE_COLOR 0x00000004 // change color
/** @} */
/******************************************************************************/
/* 'C' STRUCTURED INTERFACE */
/******************************************************************************/
/** @} */ typedef long long(__stdcall *T_VBVMR_Login)(void);
typedef long long(__stdcall *T_VBVMR_Logout)(void);
typedef long long(__stdcall *T_VBVMR_RunVoicemeeter)(long vType);
typedef long long(__stdcall *T_VBVMR_GetVoicemeeterType)(long *pType);
typedef long long(__stdcall *T_VBVMR_GetVoicemeeterVersion)(long *pVersion);
typedef long long(__stdcall *T_VBVMR_IsParametersDirty)(void);
typedef long long(__stdcall *T_VBVMR_GetParameterFloat)(char *szParamName, float *pValue);
typedef long long(__stdcall *T_VBVMR_GetParameterStringA)(char *szParamName, char *szString);
typedef long long(__stdcall *T_VBVMR_GetParameterStringW)(char *szParamName, unsigned short *wszString);
typedef long long(__stdcall *T_VBVMR_GetLevel)(long nType, long nuChannel, float *pValue);
typedef long long(__stdcall *T_VBVMR_GetMidiMessage)(unsigned char *pMIDIBuffer, long nbByteMax);
typedef long long(__stdcall *T_VBVMR_SendMidiMessage)(unsigned char *pMIDIBuffer, long nbByteMax);
typedef long long(__stdcall *T_VBVMR_SetParameterFloat)(char *szParamName, float Value);
typedef long long(__stdcall *T_VBVMR_SetParameters)(char *szParamScript);
typedef long long(__stdcall *T_VBVMR_SetParametersW)(unsigned short *szParamScript);
typedef long long(__stdcall *T_VBVMR_SetParameterStringA)(char *szParamName, char *szString);
typedef long long(__stdcall *T_VBVMR_SetParameterStringW)(char *szParamName, unsigned short *wszString);
typedef long long(__stdcall *T_VBVMR_Output_GetDeviceNumber)(void);
typedef long long(__stdcall *T_VBVMR_Output_GetDeviceDescA)(long zindex, long *nType, char *szDeviceName, char *szHardwareId);
typedef long long(__stdcall *T_VBVMR_Output_GetDeviceDescW)(long zindex, long *nType, unsigned short *wszDeviceName, unsigned short *wszHardwareId);
typedef long long(__stdcall *T_VBVMR_Input_GetDeviceNumber)(void);
typedef long long(__stdcall *T_VBVMR_Input_GetDeviceDescA)(long zindex, long *nType, char *szDeviceName, char *szHardwareId);
typedef long long(__stdcall *T_VBVMR_Input_GetDeviceDescW)(long zindex, long *nType, unsigned short *wszDeviceName, unsigned short *wszHardwareId);
typedef long long(__stdcall *T_VBVMR_AudioCallbackRegister)(long mode, T_VBVMR_VBAUDIOCALLBACK pCallback, void *lpUser, char szClientName[64]);
typedef long long(__stdcall *T_VBVMR_AudioCallbackStart)(void);
typedef long long(__stdcall *T_VBVMR_AudioCallbackStop)(void);
typedef long long(__stdcall *T_VBVMR_AudioCallbackUnregister)(void);
typedef long long(__stdcall *T_VBVMR_MacroButton_IsDirty)(void);
typedef long long(__stdcall *T_VBVMR_MacroButton_GetStatus)(long nuLogicalButton, float *pValue, long bitmode);
typedef long long(__stdcall *T_VBVMR_MacroButton_SetStatus)(long nuLogicalButton, float fValue, long bitmode);
typedef struct tagVBVMR_INTERFACE
/******************************************************************************/ {
/* 'C' STRUCTURED INTERFACE */
/******************************************************************************/
typedef long (__stdcall *T_VBVMR_Login)(void);
typedef long (__stdcall *T_VBVMR_Logout)(void);
typedef long (__stdcall *T_VBVMR_RunVoicemeeter)(long vType);
typedef long (__stdcall *T_VBVMR_GetVoicemeeterType)(long * pType);
typedef long (__stdcall *T_VBVMR_GetVoicemeeterVersion)(long * pVersion);
typedef long (__stdcall *T_VBVMR_IsParametersDirty)(void);
typedef long (__stdcall *T_VBVMR_GetParameterFloat)(char * szParamName, float * pValue);
typedef long (__stdcall *T_VBVMR_GetParameterStringA)(char * szParamName, char * szString);
typedef long (__stdcall *T_VBVMR_GetParameterStringW)(char * szParamName, unsigned short * wszString);
typedef long (__stdcall *T_VBVMR_GetLevel)(long nType, long nuChannel, float * pValue);
typedef long (__stdcall *T_VBVMR_GetMidiMessage)(unsigned char *pMIDIBuffer, long nbByteMax);
typedef long (__stdcall *T_VBVMR_SendMidiMessage)(unsigned char *pMIDIBuffer, long nbByteMax);
typedef long (__stdcall *T_VBVMR_SetParameterFloat)(char * szParamName, float Value);
typedef long (__stdcall *T_VBVMR_SetParameters)(char * szParamScript);
typedef long (__stdcall *T_VBVMR_SetParametersW)(unsigned short * szParamScript);
typedef long (__stdcall *T_VBVMR_SetParameterStringA)(char * szParamName, char * szString);
typedef long (__stdcall *T_VBVMR_SetParameterStringW)(char * szParamName, unsigned short * wszString);
typedef long (__stdcall *T_VBVMR_Output_GetDeviceNumber)(void);
typedef long (__stdcall *T_VBVMR_Output_GetDeviceDescA)(long zindex, long * nType, char * szDeviceName, char * szHardwareId);
typedef long (__stdcall *T_VBVMR_Output_GetDeviceDescW)(long zindex, long * nType, unsigned short * wszDeviceName, unsigned short * wszHardwareId);
typedef long (__stdcall *T_VBVMR_Input_GetDeviceNumber)(void);
typedef long (__stdcall *T_VBVMR_Input_GetDeviceDescA)(long zindex, long * nType, char * szDeviceName, char * szHardwareId);
typedef long (__stdcall *T_VBVMR_Input_GetDeviceDescW)(long zindex, long * nType, unsigned short * wszDeviceName, unsigned short * wszHardwareId);
typedef long (__stdcall *T_VBVMR_AudioCallbackRegister)(long mode, T_VBVMR_VBAUDIOCALLBACK pCallback, void * lpUser, char szClientName[64]);
typedef long (__stdcall *T_VBVMR_AudioCallbackStart)(void);
typedef long (__stdcall *T_VBVMR_AudioCallbackStop)(void);
typedef long (__stdcall *T_VBVMR_AudioCallbackUnregister)(void);
typedef long (__stdcall *T_VBVMR_MacroButton_IsDirty)(void);
typedef long (__stdcall *T_VBVMR_MacroButton_GetStatus)(long nuLogicalButton, float * pValue, long bitmode);
typedef long (__stdcall *T_VBVMR_MacroButton_SetStatus)(long nuLogicalButton, float fValue, long bitmode);
typedef struct tagVBVMR_INTERFACE
{
T_VBVMR_Login VBVMR_Login; T_VBVMR_Login VBVMR_Login;
T_VBVMR_Logout VBVMR_Logout; T_VBVMR_Logout VBVMR_Logout;
T_VBVMR_RunVoicemeeter VBVMR_RunVoicemeeter; T_VBVMR_RunVoicemeeter VBVMR_RunVoicemeeter;
@@ -867,34 +763,27 @@ typedef struct tagVBVMR_INTERFACE
T_VBVMR_MacroButton_GetStatus VBVMR_MacroButton_GetStatus; T_VBVMR_MacroButton_GetStatus VBVMR_MacroButton_GetStatus;
T_VBVMR_MacroButton_SetStatus VBVMR_MacroButton_SetStatus; T_VBVMR_MacroButton_SetStatus VBVMR_MacroButton_SetStatus;
} T_VBVMR_INTERFACE, *PT_VBVMR_INTERFACE, *LPT_VBVMR_INTERFACE, *PT_VMR;
} T_VBVMR_INTERFACE, *PT_VBVMR_INTERFACE, *LPT_VBVMR_INTERFACE;
#ifdef VBUSE_LOCALLIB #ifdef VBUSE_LOCALLIB
// internal used (not public) // internal used (not public)
void __stdcall VBVMR_SetHinstance(HINSTANCE hinst); void __stdcall VBVMR_SetHinstance(HINSTANCE hinst);
#endif #endif
/******************************************************************************/
/* VBAN RT PACKET */
/******************************************************************************/
/******************************************************************************/
/* VBAN RT PACKET */
/******************************************************************************/
#pragma pack(1) #pragma pack(1)
// short = 2 bytes // short = 2 bytes
// char = 1 byte // char = 1 byte
// COMPATIBILITY: defined structure cannot be changed. // COMPATIBILITY: defined structure cannot be changed.
// some field could be added at the end of the structure to keep the compatibility in the time. // some field could be added at the end of the structure to keep the compatibility in the time.
typedef struct tagVBAN_VMRT_PACKET //packedt ident: 0 typedef struct tagVBAN_VMRT_PACKET // packedt ident: 0
{ {
unsigned char voicemeeterType; // 1 = Voicemeeter, 2= Voicemeeter Banana, 3 Potato unsigned char voicemeeterType; // 1 = Voicemeeter, 2= Voicemeeter Banana, 3 Potato
unsigned char reserved; // unused unsigned char reserved; // unused
unsigned short buffersize; // main stream buffer size unsigned short buffersize; // main stream buffer size
@@ -917,9 +806,9 @@ typedef struct tagVBAN_VMRT_PACKET //packedt ident: 0
short busGaindB100[8]; // Bus Gain in dB * 100 short busGaindB100[8]; // Bus Gain in dB * 100
char stripLabelUTF8c60[8][60]; // Strip Label char stripLabelUTF8c60[8][60]; // Strip Label
char busLabelUTF8c60[8][60]; // Bus Label char busLabelUTF8c60[8][60]; // Bus Label
} T_VBAN_VMRT_PACKET, *PT_VBAN_VMRT_PACKET, *LPT_VBAN_VMRT_PACKET; } T_VBAN_VMRT_PACKET, *PT_VBAN_VMRT_PACKET, *LPT_VBAN_VMRT_PACKET;
#define expected_size_T_VBAN_VMRT_PACKET 1384 //1436 max #define expected_size_T_VBAN_VMRT_PACKET 1384 // 1436 max
#pragma pack() #pragma pack()
@@ -971,16 +860,15 @@ typedef struct tagVBAN_VMRT_PACKET //packedt ident: 0
#define VMRTSTATE_MODE_SEL 0x10000000 #define VMRTSTATE_MODE_SEL 0x10000000
#define VMRTSTATE_MODE_MONITOR 0x20000000 #define VMRTSTATE_MODE_MONITOR 0x20000000
#pragma pack(1) #pragma pack(1)
// long = 4 bytes // long = 4 bytes
// short = 2 bytes // short = 2 bytes
// char = 1 byte // char = 1 byte
// float = 4 bytes // float = 4 bytes
typedef struct tagVBAN_VMPARAM_STRIP typedef struct tagVBAN_VMPARAM_STRIP
{ {
long mode; long mode;
float dblevel; // x 100 float dblevel; // x 100
short Audibility; // x 100 short Audibility; // x 100
@@ -992,7 +880,7 @@ typedef struct tagVBAN_VMPARAM_STRIP
short EQgain2; // x 100 short EQgain2; // x 100
short EQgain3; // x 100 short EQgain3; // x 100
//first channel parametric EQ // first channel parametric EQ
char PEQ_eqOn[6]; // 0 or 1 char PEQ_eqOn[6]; // 0 or 1
char PEQ_eqtype[6]; // see define below char PEQ_eqtype[6]; // see define below
float PEQ_eqgain[6]; float PEQ_eqgain[6];
@@ -1036,7 +924,7 @@ typedef struct tagVBAN_VMPARAM_STRIP
short Pitch_formant_med; // x 100 short Pitch_formant_med; // x 100
short Pitch_formant_high; // x 100 short Pitch_formant_high; // x 100
} T_VBAN_VMPARAM_STRIP, *PT_VBAN_VMPARAM_STRIP, *LPT_VBAN_VMPARAM_STRIP; } T_VBAN_VMPARAM_STRIP, *PT_VBAN_VMPARAM_STRIP, *LPT_VBAN_VMPARAM_STRIP;
#define VMRT_EQTYPE_PEQ 0 #define VMRT_EQTYPE_PEQ 0
#define VMRT_EQTYPE_NOTCH 1 #define VMRT_EQTYPE_NOTCH 1
@@ -1046,12 +934,11 @@ typedef struct tagVBAN_VMPARAM_STRIP
#define VMRT_EQTYPE_LOSHELF 5 #define VMRT_EQTYPE_LOSHELF 5
#define VMRT_EQTYPE_HISHELF 6 #define VMRT_EQTYPE_HISHELF 6
#define expected_size_T_VBAN_VMPARAM_STRIP (8 + (8 * sizeof(short)) + (2 * 6) + (3 * 6 * sizeof(float)) + ((11 + 9 + 6 + 7) * sizeof(short)))
// 170
#define expected_size_T_VBAN_VMPARAM_STRIP (8+ (8 * sizeof(short)) + (2*6) + (3 * 6 * sizeof(float)) + ((11 + 9 + 6 + 7) * sizeof(short))) typedef struct tagVBAN_VMPARAMSTRIP_PACKET // packedt ident: 1
//170 {
typedef struct tagVBAN_VMPARAMSTRIP_PACKET //packedt ident: 1
{
unsigned char voicemeeterType; // 1 = Voicemeeter, 2= Voicemeeter Banana, 3 Potato unsigned char voicemeeterType; // 1 = Voicemeeter, 2= Voicemeeter Banana, 3 Potato
unsigned char reserved; // unused unsigned char reserved; // unused
unsigned short buffersize; // main stream buffer size unsigned short buffersize; // main stream buffer size
@@ -1059,35 +946,29 @@ typedef struct tagVBAN_VMPARAMSTRIP_PACKET //packedt ident: 1
unsigned long optionBits; // unused unsigned long optionBits; // unused
unsigned long samplerate; // main stream samplerate unsigned long samplerate; // main stream samplerate
T_VBAN_VMPARAM_STRIP Strips[8]; // all input strips T_VBAN_VMPARAM_STRIP Strips[8]; // all input strips
} T_VBAN_VMPARAMSTRIP_PACKET, *PT_VBAN_VMPARAMSTRIP_PACKET, *LPT_VBAN_VMPARAMSTRIP_PACKET; } T_VBAN_VMPARAMSTRIP_PACKET, *PT_VBAN_VMPARAMSTRIP_PACKET, *LPT_VBAN_VMPARAMSTRIP_PACKET;
#pragma pack() #pragma pack()
#define expected_size_T_VBAN_VMPARAMSTRIP_PACKET ((4 * 4) + (expected_size_T_VBAN_VMPARAM_STRIP * 8)) //1436 max #define expected_size_T_VBAN_VMPARAMSTRIP_PACKET ((4 * 4) + (expected_size_T_VBAN_VMPARAM_STRIP * 8)) // 1436 max
//1376 // 1376
/******************************************************************************/ /******************************************************************************/
/* LOCAL FUNCTIONS */ /* LOCAL FUNCTIONS */
/******************************************************************************/ /******************************************************************************/
long VBVMR_LocalInit(void);
long VBVMR_LocalEnd(void);
void * VBVMR_GetRequestVB0STREAMPTR(void);
long VBVMR_SetParametersWEx(unsigned short * szParamScript, long fCopyToClient);
long VBVMR_LoginEx(long properties);
long VBVMR_MB_PushSettings(void * lpParam);
long VBVMR_LocalInit(void);
long VBVMR_LocalEnd(void);
void *VBVMR_GetRequestVB0STREAMPTR(void);
long VBVMR_SetParametersWEx(unsigned short *szParamScript, long fCopyToClient);
long VBVMR_LoginEx(long properties);
long VBVMR_MB_PushSettings(void *lpParam);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /*__VOICEMEETER_REMOTE_H__*/ #endif /*__VOICEMEETER_REMOTE_H__*/

3
include/cdll.h
View File

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

2
include/util.h
View File

@@ -3,7 +3,7 @@
void remove_name_in_path(char *szPath); void remove_name_in_path(char *szPath);
int replace_multiple_space_with_one(char *s, size_t len); 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); char *version_as_string(char *, long v, int n);
#endif /* __UTIL_H__ */ #endif /* __UTIL_H__ */

31
include/vmr.h
View File

@@ -6,6 +6,7 @@
enum kind enum kind
{ {
UNKNOWN = -1,
BASIC = 1, BASIC = 1,
BANANA, BANANA,
POTATO, POTATO,
@@ -16,23 +17,23 @@ enum kind
STREAMERVIEW 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__ */ #endif /* __VMR_H__ */

104
src/cdll.c
View File

@@ -1,5 +1,6 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <windows.h>
#include "cdll.h" #include "cdll.h"
#include "util.h" #include "util.h"
@@ -58,11 +59,11 @@ bool __cdecl registry_get_voicemeeter_folder(char *szDir)
/*******************************************************************************/ /*******************************************************************************/
/** GET DLL INTERFACE **/ /** GET DLL INTERFACE **/
/*******************************************************************************/ /*******************************************************************************/
long initialize_dll_interfaces(T_VBVMR_INTERFACE *iVMR) long initialize_dll_interfaces(PT_VMR vmr)
{ {
HMODULE G_H_Module = NULL; HMODULE G_H_Module = NULL;
char szDllName[1024]; char szDllName[1024];
memset(iVMR, 0, sizeof(T_VBVMR_INTERFACE)); memset(vmr, 0, sizeof(T_VBVMR_INTERFACE));
// get Voicemeeter installation directory // get Voicemeeter installation directory
if (!registry_get_voicemeeter_folder(szDllName)) if (!registry_get_voicemeeter_folder(szDllName))
@@ -82,78 +83,89 @@ long initialize_dll_interfaces(T_VBVMR_INTERFACE *iVMR)
return -101; return -101;
// Get function pointers // 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 // check pointers are valid
if (iVMR->VBVMR_Login == NULL) if (vmr->VBVMR_Login == NULL)
return -1; return -1;
if (iVMR->VBVMR_Logout == NULL) if (vmr->VBVMR_Logout == NULL)
return -2; return -2;
if (iVMR->VBVMR_RunVoicemeeter == NULL) if (vmr->VBVMR_RunVoicemeeter == NULL)
return -2; return -2;
if (iVMR->VBVMR_GetVoicemeeterType == NULL) if (vmr->VBVMR_GetVoicemeeterType == NULL)
return -3; return -3;
if (iVMR->VBVMR_GetVoicemeeterVersion == NULL) if (vmr->VBVMR_GetVoicemeeterVersion == NULL)
return -4; return -4;
if (iVMR->VBVMR_IsParametersDirty == NULL) if (vmr->VBVMR_IsParametersDirty == NULL)
return -5; return -5;
if (iVMR->VBVMR_GetParameterFloat == NULL) if (vmr->VBVMR_GetParameterFloat == NULL)
return -6; return -6;
if (iVMR->VBVMR_GetParameterStringA == NULL) if (vmr->VBVMR_GetParameterStringA == NULL)
return -7; return -7;
if (iVMR->VBVMR_GetParameterStringW == NULL) if (vmr->VBVMR_GetParameterStringW == NULL)
return -8; return -8;
if (iVMR->VBVMR_GetLevel == NULL) if (vmr->VBVMR_GetLevel == NULL)
return -9; return -9;
if (iVMR->VBVMR_SetParameterFloat == NULL) if (vmr->VBVMR_SetParameterFloat == NULL)
return -10; return -10;
if (iVMR->VBVMR_SetParameters == NULL) if (vmr->VBVMR_SetParameters == NULL)
return -11; return -11;
if (iVMR->VBVMR_SetParametersW == NULL) if (vmr->VBVMR_SetParametersW == NULL)
return -12; return -12;
if (iVMR->VBVMR_SetParameterStringA == NULL) if (vmr->VBVMR_SetParameterStringA == NULL)
return -13; return -13;
if (iVMR->VBVMR_SetParameterStringW == NULL) if (vmr->VBVMR_SetParameterStringW == NULL)
return -14; return -14;
if (iVMR->VBVMR_GetMidiMessage == NULL) if (vmr->VBVMR_GetMidiMessage == NULL)
return -15; return -15;
if (iVMR->VBVMR_Output_GetDeviceNumber == NULL) if (vmr->VBVMR_Output_GetDeviceNumber == NULL)
return -30; return -30;
if (iVMR->VBVMR_Output_GetDeviceDescA == NULL) if (vmr->VBVMR_Output_GetDeviceDescA == NULL)
return -31; return -31;
if (iVMR->VBVMR_Output_GetDeviceDescW == NULL) if (vmr->VBVMR_Output_GetDeviceDescW == NULL)
return -32; return -32;
if (iVMR->VBVMR_Input_GetDeviceNumber == NULL) if (vmr->VBVMR_Input_GetDeviceNumber == NULL)
return -33; return -33;
if (iVMR->VBVMR_Input_GetDeviceDescA == NULL) if (vmr->VBVMR_Input_GetDeviceDescA == NULL)
return -34; return -34;
if (iVMR->VBVMR_Input_GetDeviceDescW == NULL) if (vmr->VBVMR_Input_GetDeviceDescW == NULL)
return -35; 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; return 0;
} }

4
src/util.c
View File

@@ -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 * @param n maximum number of characters to be written to the buffer
* @return char* The kind of Voicemeeter as a string * @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", "Basic",
"Banana", "Banana",
"Potato", "Potato",

35
src/vmr.c
View File

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

58
src/vmrcli.c
View File

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