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_adapter.cpp | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/tg/tg_adapter.cpp b/src/tg/tg_adapter.cpp
index 6b51fdb..6d90cec 100644
--- a/src/tg/tg_adapter.cpp
+++ b/src/tg/tg_adapter.cpp
@@ -6,31 +6,35 @@
{
//s32 phy_channel[] = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,18,19};
if(input) {
- s32 input_num = ana_input_num + dante_input_num ;
+// s32 input_num = ana_input_num + dante_input_num ;
+ s32 local_ch = ana_input_num + usb_input_num; // C H G 18
if(logic_channel < ana_input_num) {
//analog
return logic_channel + 1;
}
- else if(logic_channel < input_num) {
- //dante
- return 19 + (logic_channel-ana_input_num);
+ else if(logic_channel < local_ch) {
+ //usb
+ return 17 + (logic_channel + 2 - local_ch);
}
else {
- //usb
- return 17 + (logic_channel-input_num);
+ //dante
+ return 19 + (logic_channel - local_ch);
}
}
- else {
- s32 output_num = ana_output_num + dante_output_num ;
- //output
+ else { //output
+// s32 output_num = ana_output_num + dante_output_num ;
+ s32 local_ch = ana_output_num + usb_output_num; // C H G 18
+ //analog
if(logic_channel < ana_output_num) {
return logic_channel +1;
}
- else if(logic_channel < output_num) {
- return 19 + (logic_channel-ana_output_num);
+ else if(logic_channel < local_ch) {
+ //usb
+ return 17 + (logic_channel + 2 - local_ch);
}
else {
- return 17 + (logic_channel-output_num);
+ //dante
+ return 19 + (logic_channel - local_ch);
}
}
}
--
Gitblit v1.9.3