From 1ac2340f684bf8c0b05fb571f5994b0755050671 Mon Sep 17 00:00:00 2001
From: chenlh <2008get@163.com>
Date: 星期四, 29 一月 2026 15:22:04 +0800
Subject: [PATCH] 更新删除输出第一通道后有电平无声音的情况

---
 src/tg/tg_scene.cpp |  286 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 148 insertions(+), 138 deletions(-)

diff --git a/src/tg/tg_scene.cpp b/src/tg/tg_scene.cpp
index 802f32e..7c43fb9 100644
--- a/src/tg/tg_scene.cpp
+++ b/src/tg/tg_scene.cpp
@@ -7,121 +7,135 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <vector>
 #include "tg_scene.h"
 #include "../protocol_internal.h"
 #include "../ModuleExport.h"
 
+
+
+tgScene::~tgScene()
+{
+	for (s32 i = 0; i < input_num; i++)
+		delete chin_mid[i];
+	for (s32 i = 0; i < output_num; i++)
+		delete chout_mid[i];
+	delete chin_mid;
+	delete chout_mid;
+	paramPtr.clear();
+}
+
 tgScene::tgScene(hw_adapter_t* adapter):Scene(adapter)
 {
+	s32 i;
 	s8 inport_str[16],outport_str[16];
-<<<<<<< HEAD
 	s8 ana_input_num, ana_output_num, loc_input_num, loc_output_num, dante_input_num, dante_output_num ;
 	s8 usb_input_num, usb_output_num;
-	s16 input_num, output_num ;
+//	s16 input_num, output_num ;
 	s32 n, new_idx = 300; //ID of the USB channel starts from 300.
-=======
-	s8 ana_input_num, ana_output_num,dante_input_num,dante_output_num ;
-	s8 usb_input_num = 2, usb_output_num = 2;
-	s16 input_num, output_num ;
-	s32 n, new_idx = 300; //usb 新增模块ID从300开始(与arm/pc协商一致)，使用new_idx递增.
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
 
 	s16 dual_dsp = adapter->get_system_is_dual_dsp();
 	s16 dsp_index = adapter->get_dsp_index();
 
-<<<<<<< HEAD
 	adapter->get_channel_num(&loc_input_num, &loc_output_num, &dante_input_num, &dante_output_num, &usb_input_num, &usb_output_num);
 	ana_input_num = loc_input_num - usb_input_num;
 	ana_output_num = loc_output_num - usb_output_num;
 
 	//鐗╃悊杈撳叆鍏�6+16+2
-=======
-	adapter->get_channel_num(&ana_input_num, &ana_output_num, &dante_input_num, &dante_output_num);
-
-	//新增加的2x2 usb是带处理的和输入，输出平级
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
 	input_num = ana_input_num + dante_input_num + usb_input_num; //2 USB
 	output_num = ana_output_num + dante_output_num + usb_output_num;
+	chin_mid = new s32*[input_num];
+	chout_mid = new s32*[output_num];
+	for (i = 0; i < input_num; i++) {
+		chin_mid[i] = new s32[6];
+	}
+	for (i = 0; i < output_num; i++) {
+		chout_mid[i] = new s32[5];
+	}
+	paramPtr.resize(new_idx + usb_input_num * 5 + usb_output_num * 4, nullptr);
 
 	tgScene_param_default(&parameters);
 
-<<<<<<< HEAD
-=======
-
-	//只有physic_type 为PHY_INPUT和PHY_OUTPUT的 才会调用XX_adapter.cpp下的get_physical_channel函数.
-	//所以这2两个模块类型 port_str 对应的是逻辑通道应该覆盖到所有物理通道包括模拟、dante、usb.
-	//逻辑通道也就是PC软件看到的通道顺序（ana+dante+usbL+usbR+am+aec+ans）.
-	//物理通道是DMA配置的顺序，get_physical_channel就是做逻辑通道到物理通道的映射.
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
 	sprintf(inport_str, "1-%d", input_num);
-	__MADD(299,PROC_INPUT,inport_str,inport_str,0, 1 ,&parameters.input,  0, ModuleInterfaceType::PHY_INPUT);
+	__MADD(299, PROC_INPUT,inport_str,inport_str,0, 1 ,&parameters.input,  0, ModuleInterfaceType::PHY_INPUT);
+	for (i = 0; i < input_num; i++)
+		chin_mid[i][0] = 299;
+
 
 	sprintf(inport_str, "1-%d", input_num);
-	__MADD(298,PROC_METER,inport_str,"",0,1 ,NULL,0, ModuleInterfaceType::SOFT_MODULE); //tag:0-peak,1-rms
+	__MADD(298, PROC_METER,inport_str,"",0,1 ,NULL,0, ModuleInterfaceType::SOFT_MODULE); //tag:0-peak,1-rms
 
-	//The number of DSPs is 1, but the number of input and output channels is greater than 16.
-	//It only processes analog input and output.
-	//However, for the channels that do not need to be processed, the level offset needs to be calculated.
-//	if(!dual_dsp && input_num >16) {
-//		n = ana_input_num;
-//	}
-//	else {
-//		n= input_num;
-//	}
+
 
 	//expander
 	for(s32 i =0 ;i < input_num ; i++) {
 		sprintf(inport_str, "%d|", i+1);
-		if(i < input_num - usb_input_num)
-			__MADD(1+i,PROC_EXPANDER, inport_str, inport_str, 0, 0, &parameters.in1[i], 0, ModuleInterfaceType::SOFT_MODULE);
-		else
-			__MADD(new_idx++,PROC_EXPANDER, inport_str, inport_str, 0, 0, &parameters.in1[i], 0, ModuleInterfaceType::SOFT_MODULE);
+		if(i < input_num - usb_input_num) {
+			__MADD(1+i, PROC_EXPANDER, inport_str, inport_str, 0, 0, &parameters.in1[i], 0, ModuleInterfaceType::SOFT_MODULE);
+			chin_mid[i][1] = 1+i;
+		}
+		else {
+			__MADD(new_idx, PROC_EXPANDER, inport_str, inport_str, 0, 0, &parameters.in1[i], 0, ModuleInterfaceType::SOFT_MODULE);
+			chin_mid[i][1] = new_idx++;
+		}
 	}
 
 	//compresser
 	for(s32 i =0 ;i < input_num ; i++) {
 		sprintf(inport_str, "%d|", i+1);
-		if(i < input_num - usb_input_num)
-			__MADD(33+i,PROC_COMPRESS, inport_str, inport_str, 0, 0, &parameters.in2[i], 0, ModuleInterfaceType::SOFT_MODULE);
-		else
-			__MADD(new_idx++,PROC_COMPRESS, inport_str, inport_str, 0, 0, &parameters.in2[i], 0, ModuleInterfaceType::SOFT_MODULE);
+		if(i < input_num - usb_input_num) {
+			__MADD(33+i, PROC_COMPRESS, inport_str, inport_str, 0, 0, &parameters.in2[i], 0, ModuleInterfaceType::SOFT_MODULE);
+			chin_mid[i][2] = 33+i;
+		}
+		else {
+			__MADD(new_idx, PROC_COMPRESS, inport_str, inport_str, 0, 0, &parameters.in2[i], 0, ModuleInterfaceType::SOFT_MODULE);
+			chin_mid[i][2] = new_idx++;
+		}
 	}
 
 	//agc
 	for(s32 i =0 ;i < input_num ; i++) {
 		sprintf(inport_str, "%d|", i+1);
-		if(i < input_num - usb_input_num)
-			__MADD(65+i,PROC_AGC, inport_str, inport_str, 0, 0, &parameters.in3[i], 0, ModuleInterfaceType::SOFT_MODULE);
-		else
-			__MADD(new_idx++,PROC_AGC, inport_str, inport_str, 0, 0, &parameters.in3[i], 0, ModuleInterfaceType::SOFT_MODULE);
+		if(i < input_num - usb_input_num) {
+			__MADD(65+i, PROC_AGC, inport_str, inport_str, 0, 0, &parameters.in3[i], 0, ModuleInterfaceType::SOFT_MODULE);
+			chin_mid[i][3] = 65+i;
+		}
+		else {
+			__MADD(new_idx, PROC_AGC, inport_str, inport_str, 0, 0, &parameters.in3[i], 0, ModuleInterfaceType::SOFT_MODULE);
+			chin_mid[i][3] = new_idx++;
+		}
 	}
 
 	//eq
 	for(s32 i =0 ;i < input_num ; i++) {
 		sprintf(inport_str, "%d|", i+1);
-		if(i < input_num - usb_input_num)
-			__MADD(97+i,PROC_EQ, inport_str, inport_str, 0, 0, &parameters.in4[i],  8, ModuleInterfaceType::SOFT_MODULE);
-		else
-			__MADD(new_idx++,PROC_EQ, inport_str, inport_str, 0, 0, &parameters.in4[i],  8, ModuleInterfaceType::SOFT_MODULE);
+		if(i < input_num - usb_input_num) {
+			__MADD(97+i, PROC_EQ, inport_str, inport_str, 0, 0, &parameters.in4[i],  8, ModuleInterfaceType::SOFT_MODULE);
+			chin_mid[i][4] = 97+i;
+		}
+		else {
+			__MADD(new_idx, PROC_EQ, inport_str, inport_str, 0, 0, &parameters.in4[i],  8, ModuleInterfaceType::SOFT_MODULE);
+			chin_mid[i][4] = new_idx++;
+		}
 	}
 
 	//nhs
 	for(s32 i =0 ;i < input_num ; i++) {
 		sprintf(inport_str, "%d|", i+1);
-		if(i < input_num - usb_input_num)
-			__MADD(129+i,PROC_FEEDBACK, inport_str, inport_str, 0, 0, &parameters.in5[i], 8, ModuleInterfaceType::SOFT_MODULE);
-		else
-			__MADD(new_idx++,PROC_FEEDBACK, inport_str, inport_str, 0, 0, &parameters.in5[i], 8, ModuleInterfaceType::SOFT_MODULE);
+		if(i < input_num - usb_input_num) {
+			__MADD(129+i, PROC_FEEDBACK, inport_str, inport_str, 0, 0, &parameters.in5[i], 8, ModuleInterfaceType::SOFT_MODULE);
+			chin_mid[i][5] = 129+i;
+		}
+		else {
+			__MADD(new_idx, PROC_FEEDBACK, inport_str, inport_str, 0, 0, &parameters.in5[i], 8, ModuleInterfaceType::SOFT_MODULE);
+			chin_mid[i][5] = new_idx++;
+		}
 	}
 
 	//am
 	sprintf(inport_str, "1-%d", input_num);
 	sprintf(outport_str, "1-%d", input_num+1);
-<<<<<<< HEAD
 	__MADD(161,PROC_AUTOMIXER,inport_str, outport_str, 0, 0, &parameters.automixer, 0, ModuleInterfaceType::SOFT_MODULE);  //驴脡脤忙禄禄
-=======
-	__MADD(161,PROC_AUTOMIXER,inport_str, outport_str, 0, 0, &parameters.automixer, 0, ModuleInterfaceType::SOFT_MODULE);  //可替换
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
 
 	//aec selector
 	sprintf(inport_str, "1-%d", input_num+ 1);
@@ -146,84 +160,78 @@
 	//mixer
 	sprintf(inport_str, "1-%d", input_num+ 3);
 	sprintf(outport_str, "%d-%d",input_num+4, input_num+output_num+4);
-<<<<<<< HEAD
-	__MADD(166,PROC_MIXER,inport_str,outport_str,1, 1 ,&parameters.mixer, 0, ModuleInterfaceType::SOFT_MODULE);    // .begin()+48
-=======
-	__MADD(166,PROC_MIXER,inport_str,outport_str,1, 1 ,&parameters.mixer, 0, ModuleInterfaceType::SOFT_MODULE);	// .begin()+48
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
+	__MADD(166,PROC_MIXER,inport_str,outport_str,1, 1 ,&parameters.mixer, 0, ModuleInterfaceType::SOFT_MODULE);
+
+	//dummy
+	for(s32 i =0 ;i < output_num ; i++) {
+		sprintf(inport_str, "%d|", i+input_num+4);
+		sprintf(outport_str, "%d|", i+1);
+		__MADD(500+i, DUMMY_OUTPUT, inport_str, outport_str, 1, 0, &parameters.aec, 2, ModuleInterfaceType::SOFT_MODULE); //棰勯槻鍒犻櫎浜嗙涓�釜杈撳嚭妯″潡鏃剁‖浠舵棤澹伴煶杈撳嚭
+	}
 
 	//crossover
 	for(s32 i =0 ;i < output_num ; i++) {
-		sprintf(inport_str, "%d|", i+input_num+4);
 		sprintf(outport_str, "%d|", i+1);
-		if(i < output_num - usb_output_num)
-			__MADD(167+i,PROC_CROSSOVER,inport_str,outport_str,1, 0, &parameters.out1[i],2, ModuleInterfaceType::SOFT_MODULE);
-		else
-			__MADD(new_idx++,PROC_CROSSOVER,inport_str,outport_str,1, 0, &parameters.out1[i],2, ModuleInterfaceType::SOFT_MODULE);
+		if(i < output_num - usb_output_num) {
+			__MADD(167+i, PROC_CROSSOVER, outport_str, outport_str, 1, 0, &parameters.out1[i],2, ModuleInterfaceType::SOFT_MODULE);
+			chout_mid[i][1] = 167+i;
+		}
+		else {
+			__MADD(new_idx, PROC_CROSSOVER, outport_str, outport_str, 1, 0, &parameters.out1[i],2, ModuleInterfaceType::SOFT_MODULE);
+			chout_mid[i][1] = new_idx++;
+		}
 	}
+//	printf("ou_adr ou1[2]:0x%x, ou1[3]:0x%x\n", &parameters.out1[2], &parameters.out1[3]);
 
 	//eq
 	for(s32 i =0 ;i < output_num ; i++) {
-<<<<<<< HEAD
 		sprintf(outport_str, "%d|", i+1);
-		if(i < output_num - usb_output_num)
-			__MADD(199+i,PROC_EQ,outport_str, outport_str,1, 0, &parameters.out2[i], 8, ModuleInterfaceType::SOFT_MODULE);
-		else
-			__MADD(new_idx++,PROC_EQ,outport_str, outport_str,1, 0, &parameters.out2[i], 8, ModuleInterfaceType::SOFT_MODULE);
-=======
-		sprintf(inport_str, "%d|", i+input_num+4);
-		sprintf(outport_str, "%d|", i+1);
-		if(i < output_num - usb_output_num)
-			__MADD(199+i,PROC_EQ,inport_str, outport_str,1, 0, &parameters.out2[i], 8, ModuleInterfaceType::SOFT_MODULE);
-		else
-			__MADD(new_idx++,PROC_EQ,inport_str, outport_str,1, 0, &parameters.out2[i], 8, ModuleInterfaceType::SOFT_MODULE);
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
+		if(i < output_num - usb_output_num) {
+			__MADD(199+i, PROC_EQ, outport_str, outport_str,1, 0, &parameters.out2[i], 8, ModuleInterfaceType::SOFT_MODULE);
+			chout_mid[i][2] = 199+i;
+		}
+		else {
+			__MADD(new_idx, PROC_EQ, outport_str, outport_str,1, 0, &parameters.out2[i], 8, ModuleInterfaceType::SOFT_MODULE);
+			chout_mid[i][2] = new_idx++;
+		}
 	}
 
 	//delay
 	for(s32 i =0 ;i < output_num ; i++) {
-<<<<<<< HEAD
 		sprintf(outport_str, "%d|", i+1);
-		if(i < output_num - usb_output_num)
-			__MADD(231+i,PROC_DELAY,outport_str, outport_str,1, 0, &parameters.out3[i], 1200, ModuleInterfaceType::SOFT_MODULE);
-		else
-			__MADD(new_idx++,PROC_DELAY,outport_str, outport_str,1, 0, &parameters.out3[i], 1200, ModuleInterfaceType::SOFT_MODULE);
-=======
-		sprintf(inport_str, "%d|", i+input_num+4);
-		sprintf(outport_str, "%d|", i+1);
-		if(i < output_num - usb_output_num)
-			__MADD(231+i,PROC_DELAY,inport_str, outport_str,1, 0, &parameters.out3[i], 1200, ModuleInterfaceType::SOFT_MODULE);
-		else
-			__MADD(new_idx++,PROC_DELAY,inport_str, outport_str,1, 0, &parameters.out3[i], 1200, ModuleInterfaceType::SOFT_MODULE);
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
+		if(i < output_num - usb_output_num) {
+			__MADD(231+i,PROC_DELAY, outport_str, outport_str,1, 0, &parameters.out3[i], 1200, ModuleInterfaceType::SOFT_MODULE);
+			chout_mid[i][3] = 231+i;
+		}
+		else {
+			__MADD(new_idx,PROC_DELAY, outport_str, outport_str,1, 0, &parameters.out3[i], 1200, ModuleInterfaceType::SOFT_MODULE);
+			chout_mid[i][3] = new_idx++;
+		}
 	}
 
 	//limit
 	for(s32 i =0 ;i < output_num ; i++) {
-<<<<<<< HEAD
 		sprintf(outport_str, "%d|", i+1);
-		if(i < output_num - usb_output_num)
-			__MADD(263+i,PROC_LIMIT,outport_str, outport_str,1, 0, &parameters.out4[i],0, ModuleInterfaceType::SOFT_MODULE);
-		else
-			__MADD(new_idx++,PROC_LIMIT,outport_str, outport_str,1, 0, &parameters.out4[i],0, ModuleInterfaceType::SOFT_MODULE);
-=======
-		sprintf(inport_str, "%d|", i+input_num+4);
-		sprintf(outport_str, "%d|", i+1);
-		if(i < output_num - usb_output_num)
-			__MADD(263+i,PROC_LIMIT,inport_str, outport_str,1, 0, &parameters.out4[i],0, ModuleInterfaceType::SOFT_MODULE);
-		else
-			__MADD(new_idx,PROC_LIMIT,inport_str, outport_str,1, 0, &parameters.out4[i],0, ModuleInterfaceType::SOFT_MODULE);
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
+		if(i < output_num - usb_output_num) {
+			__MADD(263+i, PROC_LIMIT, outport_str, outport_str,1, 0, &parameters.out4[i],0, ModuleInterfaceType::SOFT_MODULE);
+			chout_mid[i][4] = 263+i;
+		}
+		else {
+			__MADD(new_idx, PROC_LIMIT, outport_str, outport_str,1, 0, &parameters.out4[i],0, ModuleInterfaceType::SOFT_MODULE);
+			chout_mid[i][4] = new_idx++;
+		}
 	}
 
 	//output
 	sprintf(outport_str, "1-%d", output_num);
 	__MADD(295,PROC_OUTPUT,outport_str,outport_str,1, 1, &parameters.output,0, ModuleInterfaceType::SOFT_MODULE);
-	//sysctrl
-	__MADD(296,PROC_SYSCTL,outport_str,outport_str,1, 1, &parameters.sysctl,0, ModuleInterfaceType::PHY_OUTPUT);
-	//meter
-	__MADD(297,PROC_METER,outport_str,"",1, 1, NULL, 0, ModuleInterfaceType::SOFT_MODULE);
+	for (i = 0; i < output_num; i++)
+		chout_mid[i][0] = 295;
 
+	//sysctrl
+	__MADD(296,PROC_SYSCTL,outport_str,outport_str,1, 1, &parameters.sysctl,0, ModuleInterfaceType::SOFT_MODULE);
+	//meter
+	__MADD(297,PROC_METER,outport_str,outport_str,1, 1, &parameters.output, 0, ModuleInterfaceType::PHY_OUTPUT);
 
 };
 
@@ -232,6 +240,7 @@
 {
 	int j;
 	int allbypass = 1;
+	ptag_module pmodu = (ptag_module)param_ptr;
 	switch(proc_type) {
 
 		case PROC_INPUT:
@@ -246,19 +255,21 @@
 				pInput->input[j].gain =0;
 				pInput->input[j].mute = 0;
 				pInput->input[j].type=0;
-				pInput->input[j].phase =0 ;
+				pInput->input[j].phase =0;
 				pInput->input[j].mingain = -8000;
 				pInput->input[j].maxgain = 1200;
 			}
 		break;
 
 		case PROC_METER:
-			ptag_Meter pMeter = (ptag_Meter)param_ptr;
+			pmodu->proc_type = PROC_METER;
+			ptag_Meter pMeter = (ptag_Meter)pmodu->proc_ins;
 			pMeter->input_num = 8;
 		break;
 
 		case PROC_SHELF:
-			ptag_shelf pshelf = (ptag_shelf)param_ptr;
+			pmodu->proc_type = PROC_SHELF;
+			ptag_shelf pshelf = (ptag_shelf)pmodu->proc_ins;
 			pshelf->highshelf.bypass = allbypass;
 			pshelf->highshelf.freq = 500;
 			pshelf->highshelf.gain = -4500;
@@ -271,16 +282,18 @@
 
 		case PROC_GEQ:
 			int j;
-			ptag_geq pGEQ = (ptag_geq)param_ptr;
+			pmodu->proc_type = PROC_GEQ;
+			ptag_geq pGEQ = (ptag_geq)pmodu->proc_ins;
 			pGEQ->bypass = allbypass;
-			pGEQ->q = 2;
+			pGEQ->q_index = 2;
 			pGEQ->nsections = 31;
 			for(j=0;j<31;j++){
 				pGEQ->eq_attr[j].gain = 0;
 			}
 			break;
 		case PROC_EQ:
-			ptag_eq pEQ = (ptag_eq)param_ptr;
+			pmodu->proc_type = PROC_EQ;
+			ptag_eq pEQ = (ptag_eq)pmodu->proc_ins;
 			u16  freq[]={40,80,200,500,1000,2000,4000,8000,10000,12500,16000,20000};
 			pEQ->bypass = allbypass;
 			pEQ->nsection = MAX_EQ_SECTION;
@@ -294,7 +307,8 @@
 		break;
 
 		case PROC_EXPANDER:
-			ptag_expander pExpander = (ptag_expander)param_ptr;
+			pmodu->proc_type = PROC_EXPANDER;
+			ptag_expander pExpander = (ptag_expander)pmodu->proc_ins;
 			pExpander->bypass = allbypass;
 			pExpander->threshold = -6000;
 			pExpander->ratio = 100;
@@ -303,7 +317,8 @@
 		break;
 
 		case PROC_COMPRESS:
-			ptag_compress pcompress = (ptag_compress)param_ptr;
+			pmodu->proc_type = PROC_COMPRESS;
+			ptag_compress pcompress = (ptag_compress)pmodu->proc_ins;
 			pcompress->bypass = allbypass;
 			pcompress->threshold = -4800;
 			pcompress->ratio = 100;
@@ -314,7 +329,8 @@
 		break;
 
 		case PROC_LIMIT:
-			ptag_compress limiter = (ptag_compress)param_ptr;
+			pmodu->proc_type = PROC_LIMIT;
+			ptag_compress limiter = (ptag_compress)pmodu->proc_ins;
 			limiter->bypass = allbypass;
 			limiter->threshold = 0;
 			limiter->ratio = 10000;
@@ -340,13 +356,15 @@
 		break;
 
 		case PROC_DELAY:
-			ptag_delay pDelay = (ptag_delay)param_ptr;
+			pmodu->proc_type = PROC_DELAY;
+			ptag_delay pDelay = (ptag_delay)pmodu->proc_ins;
 			pDelay->bypass = allbypass;
 			pDelay->ms  = 1;
 		break;
 
 		case PROC_CROSSOVER:
-			ptag_crossover pCross = (ptag_crossover)param_ptr;
+			pmodu->proc_type = PROC_CROSSOVER;
+			ptag_crossover pCross = (ptag_crossover)pmodu->proc_ins;
 			pCross->highpass.bypass = allbypass;
 			pCross->highpass.freq = 500;//454;
 			pCross->highpass.taps = 18;//48;
@@ -394,7 +412,8 @@
 		break;
 
 		case PROC_FEEDBACK:
-			ptag_feedback pfb = (ptag_feedback)param_ptr;
+			pmodu->proc_type = PROC_FEEDBACK;
+			ptag_feedback pfb = (ptag_feedback)pmodu->proc_ins;
 			pfb->bypass = allbypass;
 			pfb->panic_threshold = 0;
 			pfb->flt_depth = 1800;
@@ -413,7 +432,8 @@
 		break;
 
 		case PROC_ANS:
-			ptag_ans pans = (ptag_ans)param_ptr;
+			pmodu->proc_type = PROC_ANS;
+			ptag_ans pans = (ptag_ans)pmodu->proc_ins;
 			pans->bypass = allbypass;
 			pans->mode = 0;
 		break;
@@ -475,7 +495,8 @@
 		break;
 
 		case PROC_DUCKER:
-			ptag_ducker pducker = (ptag_ducker)param_ptr;
+			pmodu->proc_type = PROC_DUCKER;
+			ptag_ducker pducker = (ptag_ducker)pmodu->proc_ins;
 			pducker->bypass = allbypass;
 			pducker->threshold = -4500;
 			pducker->depth = -2000;
@@ -492,14 +513,12 @@
 		break;
 
 		case PROC_FIR:
-<<<<<<< HEAD
-			ptag_fir pfir = (ptag_fir)param_ptr;
+			pmodu->proc_type = PROC_FIR;
+			ptag_fir pfir = (ptag_fir)pmodu->proc_ins;
 			pfir->bypass = allbypass;
 			pfir->taps = 1024;
 			memset((void*)pfir->coeffs, 0, sizeof(pfir->coeffs));
 			pfir->coeffs[0] = 1;
-=======
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
 		break;
 
 		default:
@@ -545,7 +564,6 @@
 s32 tgScene::set_parameters_content(uvoid* param, s32 size)
 {
 	tag_parameters* pp = (tag_parameters*)param;
-<<<<<<< HEAD
 	int L[24] = {0};
 	if(pp->magic != 0xbcba || size != sizeof(tag_parameters)) {
 		printf("preset param error!\n");
@@ -567,11 +585,7 @@
 		printf("tag_sysctl:%d, %d\n", sizeof(tag_sysctl), L[17]=sizeof(tag_sysctl)+L[16]);
 		printf("tag_group:%d, %d\n", sizeof(tag_group), L[18]=sizeof(tag_group)+L[17]);*/
 
-		printf("Len parameters:%d, Len recv:%d\n", L[19]=sizeof(tag_parameters), size);
-=======
-	if(pp->magic != 0xbcba || size != sizeof(tag_parameters)) {
-		printf("preset param error!\n");
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
+		dbg_printf("Len parameters:%d, Len recv:%d\n", L[19]=sizeof(tag_parameters), size);
 		return -1;
 	}
 	memcpy(&parameters, param, sizeof(tag_parameters));
@@ -639,11 +653,7 @@
 
 s32 tgScene::update_module()
 {
-<<<<<<< HEAD
 	s8 ana_input_num, ana_output_num,dante_input_num,dante_output_num, usb_input_num, usb_output_num ;
-=======
-	s8 ana_input_num, ana_output_num,dante_input_num,dante_output_num ;
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
 	s16 input_num, output_num ;
 	s16 dual_dsp = hw_adapter->get_system_is_dual_dsp();
 	s16 dsp_index = hw_adapter->get_dsp_index();

--
Gitblit v1.9.3