Skip to content

Commit 38f961c

Browse files
committed
Remove voicemeeter potato x64 type that does not exists ; Add RunVoicemeeterType enum ; Export unexported enums
1 parent f7d125a commit 38f961c

File tree

2 files changed

+27
-56
lines changed

2 files changed

+27
-56
lines changed

index.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const { dirname, join } = require("path");
22
const Registry = require("winreg");
33
const koffi = require("koffi");
44

5-
const { VoicemeeterDefaultConfig, VoicemeeterType, InterfaceType, MacroButtonState, MacroButtonTrigger, MacroButtonColor } = require("./voicemeeterEnums");
5+
const { VoicemeeterDefaultConfig, VoicemeeterType, RunVoicemeeterType, InterfaceType, LevelType, DeviceType, MacroButtonState, MacroButtonTrigger, MacroButtonColor } = require("./voicemeeterEnums");
66

77
const getDLLPath = () => {
88
const regKey = new Registry({
@@ -80,8 +80,8 @@ const voicemeeter = {
8080
this.isInitialised = true;
8181
},
8282

83-
runVoicemeeter(voicemeeterType) {
84-
if (libvoicemeeter.VBVMR_RunVoicemeeter(voicemeeterType) !== 0)
83+
runVoicemeeter(runVoicemeeterType) {
84+
if (libvoicemeeter.VBVMR_RunVoicemeeter(runVoicemeeterType) !== 0)
8585
throw "Running failed";
8686
},
8787

@@ -454,7 +454,10 @@ stripParametersNames.forEach((name) => {
454454

455455
module.exports = voicemeeter;
456456
module.exports.VoicemeeterType = VoicemeeterType;
457+
module.exports.RunVoicemeeterType = RunVoicemeeterType;
457458
module.exports.InterfaceType = InterfaceType;
459+
module.exports.LevelType = LevelType;
460+
module.exports.DeviceType = DeviceType;
458461
module.exports.MacroButtonState = MacroButtonState;
459462
module.exports.MacroButtonTrigger = MacroButtonTrigger;
460463
module.exports.MacroButtonColor = MacroButtonColor;

voicemeeterEnums.js

Lines changed: 21 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -102,65 +102,33 @@ const VoicemeeterDefaultConfig = { // key is VoicemeeterType
102102
id: 7,
103103
isVirtual: true
104104
}],
105-
},
106-
6: {
107-
strips: [{
108-
id: 0,
109-
name: "Hardware input 1"
110-
}, {
111-
id: 1,
112-
name: "Hardware input 2"
113-
}, {
114-
id: 2,
115-
name: "Hardware input 3"
116-
}, {
117-
id: 3,
118-
name: "Hardware input 4"
119-
}, {
120-
id: 4,
121-
name: "Hardware input 5"
122-
}, {
123-
id: 5,
124-
name: "Voicemeeter VAIO",
125-
isVirtual: true
126-
}, {
127-
id: 6,
128-
name: "Voicemeeter AUX",
129-
isVirtual: true
130-
}, {
131-
id: 7,
132-
name: "Voicemeeter VAIO 3",
133-
isVirtual: true
134-
}],
135-
buses: [{
136-
id: 0,
137-
}, {
138-
id: 1,
139-
}, {
140-
id: 2,
141-
}, {
142-
id: 3,
143-
}, {
144-
id: 4,
145-
}, {
146-
id: 5,
147-
isVirtual: true
148-
}, {
149-
id: 6,
150-
isVirtual: true
151-
}, {
152-
id: 7,
153-
isVirtual: true
154-
}],
155105
}
156106
}
157107

158108
const VoicemeeterType = {
159109
unknown: 0,
160110
voicemeeter: 1,
161111
voicemeeterBanana: 2,
162-
voicemeeterPotato: 3,
163-
voicemeeterPotato64: 6
112+
voicemeeterPotato: 3
113+
}
114+
115+
const RunVoicemeeterType = {
116+
VoicemeeterStandard: 1,
117+
VoicemeeterBanana: 2,
118+
VoicemeeterPotato: 3,
119+
VoicemeeterStandardx64: 4,
120+
VoicemeeterBananax64: 5,
121+
VoicemeeterPotatox64: 6,
122+
VBDeviceCheck: 10,
123+
VoicemeeterMacroButtons: 11,
124+
VMStreamerView: 12,
125+
VoicemeeterBUSMatrix8: 13,
126+
VoicemeeterBUSGEQ15: 14,
127+
VBAN2MIDI: 15,
128+
VBCABLE_ControlPanel: 20,
129+
VBVMAUX_ControlPanel: 21,
130+
VBVMVAIO3_ControlPanel: 22,
131+
VBVoicemeeterVAIO_ControlPanel: 23
164132
}
165133

166134
const InterfaceType = {
@@ -204,4 +172,4 @@ const MacroButtonColor = {
204172
red: 8
205173
}
206174

207-
module.exports = { VoicemeeterDefaultConfig, VoicemeeterType, InterfaceType, LevelType, DeviceType, MacroButtonState, MacroButtonTrigger, MacroButtonColor };
175+
module.exports = { VoicemeeterDefaultConfig, VoicemeeterType, RunVoicemeeterType, InterfaceType, LevelType, DeviceType, MacroButtonState, MacroButtonTrigger, MacroButtonColor };

0 commit comments

Comments
 (0)