Skip to content

Commit

Permalink
Fix regression that broke LR pan feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
istnv committed Nov 7, 2024
1 parent 61a67ff commit 9c30303
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
22 changes: 12 additions & 10 deletions buildStripDefs.js
Original file line number Diff line number Diff line change
Expand Up @@ -306,11 +306,11 @@ export function buildStripDefs(self) {
},
]
panActions[panID].callback = async (action, context) => {
const opt = action.options
let opt = action.options
const aId = action.actionId
const nVal = opt.type == '/ch/' ? pad0(opt.num) : opt.num
const strip = opt.type + nVal + '/mix/pan'
if ('_' != aId.slice(-2, 1)) {
if ('_' != aId.substr(-2, 1)) {
// direct set
opt.pan = (opt.pan / 2 + 50) / 100
}
Expand All @@ -330,11 +330,13 @@ export function buildStripDefs(self) {
}
} else {
// Main LR
const strip = (theStrip.panID == 'mPan' ? '/lr' : '/rtn/aux') + '/mix/pan'
panActions[panID].callback = async (action, context) => {
const opt = action.options
const strip = (theStrip.panID == 'mPan' ? '/lr' : '/rtn/aux') + '/mix/pan'
let opt = action.options
const aId = action.actionId
if ('_' != aId.slice(-2, 1)) {
let junk = aId.substr(-2, 1)

if ('_' != aId.substr(-2, 1)) {
// direct set
opt.pan = (opt.pan / 2 + 50) / 100
}
Expand Down Expand Up @@ -378,7 +380,7 @@ export function buildStripDefs(self) {
}
const bVal = pad0(opt.busNum)
const strip = opt.type + nVal + 'mix/' + bVal + '/pan'
if ('_' != aId.slice(-2, 1)) {
if ('_' != aId.substr(-2, 1)) {
// direct set
opt.pan = (opt.pan / 2 + 50) / 100
}
Expand Down Expand Up @@ -1000,14 +1002,11 @@ export function buildStripDefs(self) {
// add channel type to send actions
if (theStrip.hasLevel) {
makeLevelActions('send', 'Send', chID + '/', theStrip)
makePanActions(chID + '/', theStrip, true)
}

if (theStrip.hasPan) {
makePanActions(chID + '/', theStrip)
if (theStrip.hasLevel) {
makePanActions(chID + '/', theStrip, true)
}
//makePanVars(chID, stripID, theStrip)
}

if (d == 0) {
Expand Down Expand Up @@ -1087,6 +1086,9 @@ export function buildStripDefs(self) {
if (theStrip.hasLevel) {
makeSendVars(chID, stripID, theStrip)
}
if (theStrip.hasPan) {
makePanVars(chID, stripID, theStrip)
}
} else {
for (let c = theStrip.min; c <= theStrip.max; c++) {
let theID = chID + '/' + pad0(c, d) + muteSfx
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "behringer-xair",
"version": "2.6.0",
"version": "2.6.1",
"type": "module",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit 9c30303

Please sign in to comment.