From faba6b022b86f066d95b1cfdf752573724d5fbcd Mon Sep 17 00:00:00 2001
From: chenlh <2008get@163.com>
Date: 星期五, 29 八月 2025 19:08:13 +0800
Subject: [PATCH] 常规提交
---
src/tg/tg_scene.cpp | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/tg/tg_scene.cpp b/src/tg/tg_scene.cpp
index 2b13629..613fd87 100644
--- a/src/tg/tg_scene.cpp
+++ b/src/tg/tg_scene.cpp
@@ -13,7 +13,7 @@
tgScene::tgScene(hw_adapter_t* adapter):Scene(adapter)
{
- s8 inport_str[8],outport_str[8];
+ s8 inport_str[10],outport_str[10];
s8 ana_input_num, ana_output_num,dante_input_num,dante_output_num ;
s16 input_num, output_num ;
s32 n;
@@ -98,31 +98,32 @@
//mixer
sprintf(inport_str, "1-%d", input_num+ 4);
- sprintf(outport_str, "1-%d", output_num+1);
+ sprintf(outport_str, "%d-%d",input_num+5, input_num+output_num+6);
__MADD(166,PROC_MIXER,inport_str,outport_str,1, 1 ,¶meters.mixer, 0, ModuleInterfaceType::SOFT_MODULE); // .begin()+48
//crossover
for(s32 i =0 ;i < output_num ; i++) {
- sprintf(outport_str, "%d|", i+1);
- __MADD(167+i,PROC_CROSSOVER,outport_str, outport_str,1, 0, ¶meters.out1[i],2, ModuleInterfaceType::SOFT_MODULE);
+ sprintf(inport_str, "%d|", i+input_num+5);
+ __MADD(167+i,PROC_CROSSOVER,inport_str,inport_str,1, 0, ¶meters.out1[i],2, ModuleInterfaceType::SOFT_MODULE);
}
//eq
for(s32 i =0 ;i < output_num ; i++) {
- sprintf(outport_str, "%d|", i+1);
- __MADD(199+i,PROC_EQ,outport_str, outport_str,1, 0, ¶meters.out2[i], 8, ModuleInterfaceType::SOFT_MODULE);
+ sprintf(inport_str, "%d|", i+input_num+5);
+ __MADD(199+i,PROC_EQ,inport_str, inport_str,1, 0, ¶meters.out2[i], 8, ModuleInterfaceType::SOFT_MODULE);
}
//delay
for(s32 i =0 ;i < output_num ; i++) {
- sprintf(outport_str, "%d|", i+1);
- __MADD(231+i,PROC_DELAY,outport_str, outport_str,1, 0, ¶meters.out3[i], 1200, ModuleInterfaceType::SOFT_MODULE);
+ sprintf(inport_str, "%d|", i+input_num+5);
+ __MADD(231+i,PROC_DELAY,inport_str, inport_str,1, 0, ¶meters.out3[i], 1200, ModuleInterfaceType::SOFT_MODULE);
}
//limit
for(s32 i =0 ;i < output_num ; i++) {
+ sprintf(inport_str, "%d|", i+input_num+5);
sprintf(outport_str, "%d|", i+1);
- __MADD(263+i,PROC_LIMIT,outport_str, outport_str,1, 0, ¶meters.out4[i],0, ModuleInterfaceType::SOFT_MODULE);
+ __MADD(263+i,PROC_LIMIT,inport_str, outport_str,1, 0, ¶meters.out4[i],0, ModuleInterfaceType::SOFT_MODULE);
}
//output
@@ -132,8 +133,6 @@
__MADD(296,PROC_SYSCTL,outport_str,outport_str,1, 1, ¶meters.sysctl,0, ModuleInterfaceType::PHY_OUTPUT);
//meter
__MADD(297,PROC_METER,outport_str,"",1, 1, NULL, 0, ModuleInterfaceType::SOFT_MODULE);
-
- printf("lst size=%d\n", proc_list.size());
};
@@ -484,7 +483,7 @@
proc->tag =1200;
break;
case ModuleType::PROC_CROSSOVER:
- proc->tag =2;
+ proc->tag =1;
break;
case ModuleType::PROC_FEEDBACK:{
ptag_module pmodule = (ptag_module)proc->parameters;
--
Gitblit v1.9.3