瀏覽代碼

Merge branch 'master' of klarke.webfactional.com:webapps/git/repos/libcm

master
kevin 8 年之前
父節點
當前提交
77726ebe50
共有 3 個文件被更改,包括 7 次插入4 次删除
  1. 1
    0
      dsp/cmDspBuiltIn.c
  2. 1
    0
      dsp/cmDspKr.h
  3. 5
    4
      dsp/cmDspPgm.c

+ 1
- 0
dsp/cmDspBuiltIn.c 查看文件

@@ -5838,6 +5838,7 @@ cmDspClassConsFunc_t _cmDspClassBuiltInArray[] =
5838 5838
   cmTakeSeqBldrClassCons,
5839 5839
   cmTakeSeqRendClassCons,
5840 5840
   cmReflectCalcClassCons,
5841
+  cmEchoCancelClassCons,
5841 5842
   NULL,
5842 5843
 };
5843 5844
 

+ 1
- 0
dsp/cmDspKr.h 查看文件

@@ -22,6 +22,7 @@ extern "C" {
22 22
   struct cmDspClass_str* cmTakeSeqBldrClassCons( cmDspCtx_t* ctx );
23 23
   struct cmDspClass_str* cmTakeSeqRendClassCons( cmDspCtx_t* ctx );
24 24
   struct cmDspClass_str* cmReflectCalcClassCons( cmDspCtx_t* ctx );
25
+  struct cmDspClass_str* cmEchoCancelClassCons( cmDspCtx_t* ctx );
25 26
 
26 27
 #ifdef __cplusplus
27 28
 }

+ 5
- 4
dsp/cmDspPgm.c 查看文件

@@ -51,7 +51,7 @@ cmDspRC_t _cmDspSysPgm_ReflectCalc( cmDspSysH_t h, void** userPtrPtr )
51 51
 
52 52
     // gain controls
53 53
   cmDspInst_t* igain = cmDspSysAllocInst( h,"Scalar", "In Gain",  5, kNumberDuiId, 0.0,  4.0, 0.01,  1.0);
54
-  cmDspInst_t* ogain = cmDspSysAllocInst( h,"Scalar", "Out Gain", 5, kNumberDuiId, 0.0,  4.0, 0.01,  1.0);
54
+  cmDspInst_t* ogain = cmDspSysAllocInst( h,"Scalar", "Out Gain", 5, kNumberDuiId, 0.0,  4.0, 0.01,  3.0);
55 55
 
56 56
   cmDspSysConnectAudio(h, ai0, "out", im0, "in");           // ain0 -> imtr0
57 57
   cmDspSysConnectAudio(h, ai1, "out", im1, "in");           // ain1 -> imtr1
@@ -2797,9 +2797,10 @@ cmDspRC_t _cmDspSysPgm_Goertzel( cmDspSysH_t h, void** userPtrPtr )
2797 2797
 cmDspRC_t _cmDspSysPgm_TakeSeqBldr( cmDspSysH_t h, void** userPtrPtr )
2798 2798
 {  
2799 2799
   cmDspRC_t       rc         = kOkDspRC;
2800
-  const cmChar_t* tksbFn     = "/home/kevin/src/cmkc/src/kc/data/takeSeqBldr0.js";
2801
-  const cmChar_t* deviceName = "Fastlane";
2802
-  const cmChar_t* portName   = "Fastlane MIDI A";
2800
+  //const cmChar_t* tksbFn     = "/User/kevin/src/cmkc/src/kc/data/takeSeqBldr0.js";
2801
+  const cmChar_t* tksbFn     =  "/Users/kevin/src/cmkc/src/kc/data/takeSeqBldr_osx.js";
2802
+  const cmChar_t* deviceName = "MOTU - Traveler mk3"; //"Fastlane";
2803
+  const cmChar_t* portName   = "MIDI Port";           // "Fastlane MIDI A";
2803 2804
 
2804 2805
   //const cmChar_t* deviceName = "DKV-M4";
2805 2806
   //const cmChar_t* portName   = "DKV-M4 MIDI 1";

Loading…
取消
儲存