From 96cfbbcc47a845cad3f3248c284703eca519650f Mon Sep 17 00:00:00 2001
From: graydon <weidong.gao@cretone.cn>
Date: 星期四, 24 七月 2025 17:36:56 +0800
Subject: [PATCH] 修正
---
src/tg/tg_scene.cpp | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/src/tg/tg_scene.cpp b/src/tg/tg_scene.cpp
index e233423..2804842 100644
--- a/src/tg/tg_scene.cpp
+++ b/src/tg/tg_scene.cpp
@@ -25,7 +25,8 @@
input_num = ana_input_num + dante_input_num;
output_num = dante_input_num + dante_output_num;
- sprintf(inport_str, "0-%d", input_num-1);
+ //port from 1 start.
+ sprintf(inport_str, "1-%d", input_num);
__MADD(299,PROC_INPUT,inport_str,inport_str,0, 1 ,¶meters.input, 0, ModuleInterfaceType::PHY_INPUT);
__MADD(298,PROC_METER,inport_str,"",0,1 ,NULL,0, ModuleInterfaceType::SOFT_MODULE); //tag:0-peak,1-rms
@@ -41,90 +42,90 @@
//expander
for(s32 i =0 ;i < input_num ; i++) {
- sprintf(inport_str, "%d|", i);
+ sprintf(inport_str, "%d|", i+1);
__MADD(1+i,PROC_EXPANDER, inport_str, inport_str, 0, 0, ¶meters.in1[i], 0, ModuleInterfaceType::SOFT_MODULE);
}
//compresser
for(s32 i =0 ;i < input_num ; i++) {
- sprintf(inport_str, "%d|", i);
+ sprintf(inport_str, "%d|", i+1);
__MADD(33+i,PROC_COMPRESS, inport_str, inport_str, 0, 0, ¶meters.in2[i], 0, ModuleInterfaceType::SOFT_MODULE);
}
//agc
for(s32 i =0 ;i < input_num ; i++) {
- sprintf(inport_str, "%d|", i);
+ sprintf(inport_str, "%d|", i+1);
__MADD(65+i,PROC_AGC, inport_str, inport_str, 0, 0, ¶meters.in3[i], 0, ModuleInterfaceType::SOFT_MODULE);
}
//eq
for(s32 i =0 ;i < input_num ; i++) {
- sprintf(inport_str, "%d|", i);
+ sprintf(inport_str, "%d|", i+1);
__MADD(97+i,PROC_EQ, inport_str, inport_str, 0, 0, ¶meters.in4[i], 8, ModuleInterfaceType::SOFT_MODULE);
}
//nhs
for(s32 i =0 ;i < input_num ; i++) {
- sprintf(inport_str, "%d|", i);
+ sprintf(inport_str, "%d|", i+1);
__MADD(129+i,PROC_FEEDBACK, inport_str, inport_str, 0, 0, ¶meters.in5[i], 8, ModuleInterfaceType::SOFT_MODULE);
}
//am
- sprintf(inport_str, "0-%d", input_num-1);
- sprintf(outport_str, "0-%d", input_num);
+ sprintf(inport_str, "1-%d", input_num);
+ sprintf(outport_str, "1-%d", input_num+1);
__MADD(161,PROC_AUTOMIXER,inport_str, outport_str,0, 0, ¶meters.automixer, 0, ModuleInterfaceType::SOFT_MODULE); //可替换
//aec selector
- sprintf(inport_str, "0-%d", input_num+ 1);//+1 add usb
- sprintf(outport_str, "%d|%d|", input_num+ 2, input_num+ 3);
+ sprintf(inport_str, "1-%d", input_num+ 2);//+1 add usb
+ sprintf(outport_str, "%d|%d|", input_num+ 3, input_num+ 4);
__MADD(162,PROC_SELECTOR, inport_str,outport_str, 0, 1, ¶meters.aec_selector, 0, ModuleInterfaceType::SOFT_MODULE); //add usb
//aec
- sprintf(inport_str, "%d|%d", input_num+ 2, input_num+ 3);
- sprintf(outport_str, "%d|", input_num+ 2);
+ sprintf(inport_str, "%d|%d", input_num+ 3, input_num+ 4);
+ sprintf(outport_str, "%d|", input_num+ 3);
__MADD(163,PROC_AEC,inport_str, outport_str ,0, 1, ¶meters.aec, 256, ModuleInterfaceType::SOFT_MODULE);
//ans selector
- sprintf(inport_str, "0-%d", input_num+ 2);
- sprintf(outport_str, "%d|", input_num+ 3);
+ sprintf(inport_str, "0-%d", input_num+ 3);
+ sprintf(outport_str, "%d|", input_num+ 4);
__MADD(164,PROC_SELECTOR,inport_str,outport_str, 1, 1 ,¶meters.ans_selector, 0, ModuleInterfaceType::SOFT_MODULE);
//ans
- sprintf(inport_str, "%d|", input_num+ 3);
- sprintf(outport_str, "%d|", input_num+ 3);
+ sprintf(inport_str, "%d|", input_num+ 4);
+ sprintf(outport_str, "%d|", input_num+ 4);
__MADD(165,PROC_ANS,inport_str,outport_str, 1, 0 ,¶meters.afc_ns,0, ModuleInterfaceType::SOFT_MODULE);
//mixer
- sprintf(inport_str, "0-%d", input_num+ 3);
- sprintf(outport_str, "0-%d", output_num);
+ sprintf(inport_str, "1-%d", input_num+ 4);
+ sprintf(outport_str, "1-%d", output_num+1);
__MADD(166,PROC_MIXER,"0-35","0-32",1, 1 ,¶meters.mixer, 0, ModuleInterfaceType::SOFT_MODULE);
//crossover
for(s32 i =0 ;i < output_num ; i++) {
- sprintf(outport_str, "%d|", i);
+ sprintf(outport_str, "%d|", i+1);
__MADD(167,PROC_CROSSOVER,outport_str, outport_str,1, 0, ¶meters.out1[i],2, ModuleInterfaceType::SOFT_MODULE);
}
//eq
for(s32 i =0 ;i < output_num ; i++) {
- sprintf(outport_str, "%d|", i);
+ sprintf(outport_str, "%d|", i+1);
__MADD(199,PROC_EQ,outport_str, outport_str,1, 0, ¶meters.out2[i], 8, ModuleInterfaceType::SOFT_MODULE);
}
//delay
for(s32 i =0 ;i < output_num ; i++) {
- sprintf(outport_str, "%d|", i);
+ sprintf(outport_str, "%d|", i+1);
__MADD(231,PROC_DELAY,outport_str, outport_str,1, 0, ¶meters.out3[i], 1200, ModuleInterfaceType::SOFT_MODULE);
}
//limit
for(s32 i =0 ;i < output_num ; i++) {
- sprintf(outport_str, "%d|", i);
+ sprintf(outport_str, "%d|", i+1);
__MADD(263,PROC_LIMIT,outport_str, outport_str,1, 0, ¶meters.out4[i],0, ModuleInterfaceType::SOFT_MODULE);
}
//output
- sprintf(outport_str, "0-%d", output_num-1);
+ sprintf(outport_str, "0-%d", output_num);
__MADD(295,PROC_OUTPUT,outport_str,outport_str,1, 1, ¶meters.output,0, ModuleInterfaceType::SOFT_MODULE);
//sysctrl
__MADD(296,PROC_SYSCTL,outport_str,outport_str,1, 1, ¶meters.sysctl,0, ModuleInterfaceType::PHY_OUTPUT);
--
Gitblit v1.9.3