cml/libcm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmDspPgm.h/c : Added IntToSym example. Added initial set of shortened macros for programming.

Browse Source
This commit is contained in:
kevin 2020-07-27 17:41:34 -04:00
parent ebecf50417
commit 003a7deddf
3 changed files with 117 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/cmPP_NARG.h Normal file
View File

@ -0,0 +1,45 @@
#ifndef cmPP_NARG_H
#define cmPP_NARG_H
// Taken from here:
// https://groups.google.com/forum/#!topic/comp.std.c/d-6Mj5Lko_s
// and here:
// https://stackoverflow.com/questions/4421681/how-to-count-the-number-of-arguments-passed-to-a-function-that-accepts-a-variabl
#define PP_NARG(...) \
PP_NARG_(__VA_ARGS__,PP_RSEQ_N())
#define PP_NARG_(...) \
PP_128TH_ARG(__VA_ARGS__)
#define PP_128TH_ARG( \
_1, _2, _3, _4, _5, _6, _7, _8, _9,_10, \
_11,_12,_13,_14,_15,_16,_17,_18,_19,_20, \
_21,_22,_23,_24,_25,_26,_27,_28,_29,_30, \
_31,_32,_33,_34,_35,_36,_37,_38,_39,_40, \
_41,_42,_43,_44,_45,_46,_47,_48,_49,_50, \
_51,_52,_53,_54,_55,_56,_57,_58,_59,_60, \
_61,_62,_63,_64,_65,_66,_67,_68,_69,_70, \
_71,_72,_73,_74,_75,_76,_77,_78,_79,_80, \
_81,_82,_83,_84,_85,_86,_87,_88,_89,_90, \
_91,_92,_93,_94,_95,_96,_97,_98,_99,_100, \
_101,_102,_103,_104,_105,_106,_107,_108,_109,_110, \
_111,_112,_113,_114,_115,_116,_117,_118,_119,_120, \
_121,_122,_123,_124,_125,_126,_127,N,...) N
#define PP_RSEQ_N() \
127,126,125,124,123,122,121,120, \
119,118,117,116,115,114,113,112,111,110, \
109,108,107,106,105,104,103,102,101,100, \
99,98,97,96,95,94,93,92,91,90, \
89,88,87,86,85,84,83,82,81,80, \
79,78,77,76,75,74,73,72,71,70, \
69,68,67,66,65,64,63,62,61,60, \
59,58,57,56,55,54,53,52,51,50, \
49,48,47,46,45,44,43,42,41,40, \
39,38,37,36,35,34,33,32,31,30, \
29,28,27,26,25,24,23,22,21,20, \
19,18,17,16,15,14,13,12,11,10, \
9,8,7,6,5,4,3,2,1,0
#endif

75
src/dsp/cmDspPgm.c
View File

@ -21,6 +21,7 @@
#include "cmTime.h" #include "cmTime.h"
#include "cmAudioSys.h" #include "cmAudioSys.h"
#include "cmProcObj.h" #include "cmProcObj.h"
#include "cmPP_NARG.h"
#include "cmDspCtx.h" #include "cmDspCtx.h"
#include "cmDspClass.h" #include "cmDspClass.h"
#include "cmDspSys.h" #include "cmDspSys.h"
@ -2870,36 +2871,77 @@ cmDspRC_t _cmDspSysPgm_PortToSym( cmDspSysH_t h, void** userPtrPtr )
{ {
cmDspRC_t rc = kOkDspRC; cmDspRC_t rc = kOkDspRC;
cmDspInst_t* btn0 = cmDspSysAllocButton( h, "Btn0", 0.0 ); inst_t* btn0 = button( "Btn0", 0.0 );
cmDspInst_t* btn1 = cmDspSysAllocButton( h, "Btn1", 0.0 ); inst_t* btn1 = button( "Btn1", 0.0 );
cmDspInst_t* btn2 = cmDspSysAllocButton( h, "Btn2", 0.0 ); inst_t* btn2 = button( "Btn2", 0.0 );
cmDspInst_t* pts = cmDspSysAllocInst( h, "PortToSym", NULL, 3, "one", "two", "three"); inst_t* pts = inst( "PortToSym", NULL, "one", "two", "three");
cmDspInst_t* pr0 = cmDspSysAllocInst( h, "Printer", NULL, 1, "0:" ); inst_t* pr0 = inst( "Printer", NULL, "sym:" );
cmDspInst_t* pr1 = cmDspSysAllocInst( h, "Printer", NULL, 1, "1:" ); inst_t* pr1 = inst( "Printer", NULL, "btn:" );
inst_t* pr2 = inst( "Printer", NULL, "out:" );
// check for allocation errors // check for allocation errors
if((rc = cmDspSysLastRC(h)) != kOkDspRC ) if((rc = cmDspSysLastRC(h)) != kOkDspRC )
goto errLabel; goto errLabel;
cmDspSysInstallCb( h, btn0, "out", pts, "one",NULL); event( btn0, out, pts, one );
cmDspSysInstallCb( h, btn1, "out", pts, "two",NULL); event( btn1, out, pts, two );
cmDspSysInstallCb( h, btn2, "out", pts, "three",NULL); event( btn2, out, pts, three );
cmDspSysInstallCb( h, btn0, "out", pr1, "in",NULL); event( btn0, out, pr1, in );
cmDspSysInstallCb( h, btn1, "out", pr1, "in",NULL); event( btn1, out, pr1, in );
cmDspSysInstallCb( h, btn2, "out", pr1, "in",NULL); event( btn2, out, pr1, in );
cmDspSysInstallCb( h, pts, "one", pr0, "in", NULL );
cmDspSysInstallCb( h, pts, "two", pr0, "in", NULL );
cmDspSysInstallCb( h, pts, "three", pr0, "in", NULL );
event( pts, one, pr0, in );
event( pts, two, pr0, in );
event( pts, three, pr0, in );
event( pts, out, pr2, in );
errLabel: errLabel:
return rc; return rc;
} }
//------------------------------------------------------------------------------
//)
//( { label:cmDspPgm_IntToSym file_desc:"IntToSym example program." kw:[spgm] }
cmDspRC_t _cmDspSysPgm_IntToSym( cmDspSysH_t h, void** userPtrPtr )
{
cmDspRC_t rc = kOkDspRC;
inst_t* btn0 = button( "Btn0", 0.0 );
inst_t* btn1 = button( "Btn1", 1.0 );
inst_t* btn2 = button( "Btn2", 2.0 );
inst_t* pts = inst( "IntToSym", NULL, 1, "one", 2, "two", 3, "three");
inst_t* pr0 = inst( "Printer", NULL, "btn:" );
inst_t* pr1 = inst( "Printer", NULL, "sym:" );
inst_t* pr2 = inst( "Printer", NULL, "out:" );
// check for allocation errors
if((rc = cmDspSysLastRC(h)) != kOkDspRC )
goto errLabel;
event( btn0, out, pts, one );
event( btn1, out, pts, two );
event( btn2, out, pts, three );
event( btn0, out, pr0, in );
event( btn1, out, pr0, in );
event( btn2, out, pr0, in );
event( pts, one, pr1, in );
event( pts, two, pr1, in );
event( pts, three, pr1, in );
event( pts, out, pr2, in );
errLabel:
return rc;
}
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
//) //)
//( { label:cmDspPgm_Line file_desc:"Line generator example program." kw:[spgm] } //( { label:cmDspPgm_Line file_desc:"Line generator example program." kw:[spgm] }
@ -3288,6 +3330,7 @@ _cmDspSysPgm_t _cmDspSysPgmArray[] =
{ "line", _cmDspSysPgm_Line, NULL, NULL }, { "line", _cmDspSysPgm_Line, NULL, NULL },
{ "1Up", _cmDspSysPgm_1Up, NULL, NULL }, { "1Up", _cmDspSysPgm_1Up, NULL, NULL },
{ "PortToSym", _cmDspSysPgm_PortToSym, NULL, NULL }, { "PortToSym", _cmDspSysPgm_PortToSym, NULL, NULL },
{ "IntToSym", _cmDspSysPgm_IntToSym, NULL, NULL },
{ "preset", _cmDspSysPgm_Preset, NULL, NULL }, { "preset", _cmDspSysPgm_Preset, NULL, NULL },
{ "rsrcWr", _cmDspSysPgm_RsrcWr, NULL, NULL }, { "rsrcWr", _cmDspSysPgm_RsrcWr, NULL, NULL },
{ "router", _cmDspSysPgm_Router, NULL, NULL }, { "router", _cmDspSysPgm_Router, NULL, NULL },

13
src/dsp/cmDspSys.h
View File

@ -110,7 +110,6 @@ extern "C" {
cmDspRC_t cmDspSysNewPage( cmDspSysH_t h, const cmChar_t* title ); cmDspRC_t cmDspSysNewPage( cmDspSysH_t h, const cmChar_t* title );
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
// Connection Functions. // Connection Functions.
// //
@ -278,6 +277,18 @@ extern "C" {
//) //)
typedef cmDspInst_t inst_t;
#define inst( classLabel, instLabel, ... ) cmDspSysAllocInst( h, classLabel, instLabel, PP_NARG(__VA_ARGS__), __VA_ARGS__ )
#define button( label, real_val ) cmDspSysAllocButton( h, label, real_val )
#define scalar( label, rmin, rmax, rstep, rval ) cmDspSysAllocScalar( h, label, rmin, rmax, rstep, rval )
#define audio( src, sarg, dst, darg ) cmDspSysConnectAudio( h, src, #sarg, dst, #darg )
#define event( src, sarg, dst, darg ) cmDspSysInstallCb( h, src, #sarg, dst, #darg, NULL )
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif