Changeset 7258c6a in buchla-68k for ram/tundsp.c
- Timestamp:
- 07/09/2017 04:45:34 PM (7 years ago)
- Branches:
- master
- Children:
- 8618599
- Parents:
- 0292fbb
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
ram/tundsp.c
r0292fbb r7258c6a 21 21 #define TUN_VAL 100 /* default value for tunval in cents */ 22 22 23 extern short stcrow, stccol, cxval, cyval;24 25 extern short curtun; /* current tuning table */26 extern short submenu; /* submenu cursor switch */27 extern short tunmod; /* tuning table modified */28 extern short tunval; /* tuning table generator value */29 extern short ttcmdsv; /* tuning table editing state variable */30 extern short tdnamsw; /* tuning editor displaying typewriter */31 32 extern short oldtun[]; /* previous tuning table for undo */33 extern short tuntab[]; /* current tuning table */34 extern short tunlib[][128]; /* tuning table library */35 36 extern short panlkey[]; /* local key tunings */37 extern short lclkmap[]; /* local key to MIDI key map */38 39 extern chartuncurn[]; /* current tuning table name */40 extern chartunname[][32]; /* tuning table names */41 extern charsfdsp[];42 43 extern u nsigned*obj0, *obj2;44 45 extern charbfs[];46 extern char*tdbxlb[];47 48 extern short tdbox[][8];49 50 extern u nsigned*tunob;23 extern int16_t stcrow, stccol, cxval, cyval; 24 25 extern int16_t curtun; /* current tuning table */ 26 extern int16_t submenu; /* submenu cursor switch */ 27 extern int16_t tunmod; /* tuning table modified */ 28 extern int16_t tunval; /* tuning table generator value */ 29 extern int16_t ttcmdsv; /* tuning table editing state variable */ 30 extern int16_t tdnamsw; /* tuning editor displaying typewriter */ 31 32 extern int16_t oldtun[]; /* previous tuning table for undo */ 33 extern int16_t tuntab[]; /* current tuning table */ 34 extern int16_t tunlib[][128]; /* tuning table library */ 35 36 extern int16_t panlkey[]; /* local key tunings */ 37 extern int16_t lclkmap[]; /* local key to MIDI key map */ 38 39 extern int8_t tuncurn[]; /* current tuning table name */ 40 extern int8_t tunname[][32]; /* tuning table names */ 41 extern int8_t sfdsp[]; 42 43 extern uint16_t *obj0, *obj2; 44 45 extern int8_t bfs[]; 46 extern int8_t *tdbxlb[]; 47 48 extern int16_t tdbox[][8]; 49 50 extern uint16_t *tunob; 51 51 52 52 extern struct octent *tdoct; … … 56 56 */ 57 57 58 short tunpal[16][3] = { /* color palette */58 int16_t tunpal[16][3] = { /* color palette */ 59 59 60 60 {0, 0, 0}, /* 0 */ … … 77 77 78 78 /* 12345678901234567890123456789012 */ 79 static chardfltnam[] = "Local 3rds + MIDI 12 tone scale ";80 81 char*tdlabl[] = {79 static int8_t dfltnam[] = "Local 3rds + MIDI 12 tone scale "; 80 81 int8_t *tdlabl[] = { 82 82 83 83 "C", "#", "D", "#", "E", "F", "#", "G", … … 96 96 */ 97 97 98 void gettun( short n)98 void gettun(int16_t n) 99 99 { 100 100 memcpyw(tuntab, tunlib[n], 128); … … 110 110 */ 111 111 112 void puttun( short n)112 void puttun(int16_t n) 113 113 { 114 114 memcpyw(tunlib[n], tuntab, 128); … … 127 127 */ 128 128 129 void inittt( short n)130 { 131 register short i;129 void inittt(int16_t n) 130 { 131 register int16_t i; 132 132 133 133 for (i = 0; i < 128; i++) … … 150 150 void inittl(void) 151 151 { 152 register short i;152 register int16_t i; 153 153 154 154 for (i = 0; i < NTUNS; i++) … … 170 170 */ 171 171 172 void tt_trcp( short start, short finish, short dest)173 { 174 register short i;175 register longv;172 void tt_trcp(int16_t start, int16_t finish, int16_t dest) 173 { 174 register int16_t i; 175 register int32_t v; 176 176 177 177 memcpyw(oldtun, tuntab, 128); /* preserve old table for undo */ … … 183 183 /* reverse copy */ 184 184 185 v = oldtun[i] + ( long)tunval; /* transpose */186 187 if (v GT ( long)PITCHMAX) /* limit */188 v = ( long)PITCHMAX;189 else if (v LT ( long)PITCHMIN)190 v = ( long)PITCHMIN;191 192 tuntab[dest++] = ( short)v; /* store the value */185 v = oldtun[i] + (int32_t)tunval; /* transpose */ 186 187 if (v GT (int32_t)PITCHMAX) /* limit */ 188 v = (int32_t)PITCHMAX; 189 else if (v LT (int32_t)PITCHMIN) 190 v = (int32_t)PITCHMIN; 191 192 tuntab[dest++] = (int16_t)v; /* store the value */ 193 193 } 194 194 … … 199 199 /* forward copy */ 200 200 201 v = oldtun[i] + ( long)tunval; /* transpose */202 203 if (v GT ( long)PITCHMAX) /* limit */204 v = ( long)PITCHMAX;205 else if (v LT ( long)PITCHMIN)206 v = ( long)PITCHMIN;207 208 tuntab[dest++] = ( short)v; /* store the value */201 v = oldtun[i] + (int32_t)tunval; /* transpose */ 202 203 if (v GT (int32_t)PITCHMAX) /* limit */ 204 v = (int32_t)PITCHMAX; 205 else if (v LT (int32_t)PITCHMIN) 206 v = (int32_t)PITCHMIN; 207 208 tuntab[dest++] = (int16_t)v; /* store the value */ 209 209 } 210 210 } … … 223 223 */ 224 224 225 short tt_intp(short from, short to)226 { 227 register short i, j, k, n;228 register longt;225 int16_t tt_intp(int16_t from, int16_t to) 226 { 227 register int16_t i, j, k, n; 228 register int32_t t; 229 229 230 230 memcpyw(oldtun, tuntab, 128); /* preserve old table for undo */ … … 243 243 244 244 k = tuntab[from]; 245 t = ((( long)tuntab[to] - (long)k) << 16) / n;245 t = (((int32_t)tuntab[to] - (int32_t)k) << 16) / n; 246 246 j = 1 + from; 247 247 n--; 248 248 249 249 for (i = 0; i < n ; i++) 250 tuntab[j++] = ( short)((t * (1 + i)) >> 16) + k;250 tuntab[j++] = (int16_t)((t * (1 + i)) >> 16) + k; 251 251 252 252 tunmod = TRUE; … … 263 263 */ 264 264 265 short tt_incr(short from, short to)266 { 267 register short i;268 register longv;265 int16_t tt_incr(int16_t from, int16_t to) 266 { 267 register int16_t i; 268 register int32_t v; 269 269 270 270 memcpyw(oldtun, tuntab, 128); /* preserve old table for undo */ … … 278 278 } 279 279 280 v = ( long)oldtun[from]; /* initial value */280 v = (int32_t)oldtun[from]; /* initial value */ 281 281 282 282 if (from++ EQ to) /* interval has to be at least 1 */ … … 285 285 for (i = from; i LE to; i++) { 286 286 287 v += ( long)tunval; /* increment */288 289 if (v GT ( long)PITCHMAX) /* limit */290 v = ( long)PITCHMAX;291 else if (v LT ( long)PITCHMIN)292 v = ( long)PITCHMIN;293 294 tuntab[i] = ( short)v; /* store the value */287 v += (int32_t)tunval; /* increment */ 288 289 if (v GT (int32_t)PITCHMAX) /* limit */ 290 v = (int32_t)PITCHMAX; 291 else if (v LT (int32_t)PITCHMIN) 292 v = (int32_t)PITCHMIN; 293 294 tuntab[i] = (int16_t)v; /* store the value */ 295 295 } 296 296 … … 309 309 */ 310 310 311 void td_trcp( short mode)312 { 313 register u nsignedcx;311 void td_trcp(int16_t mode) 312 { 313 register uint16_t cx; 314 314 315 315 cx = exp_c(mode ? TDSELD : tdbox[6][4]); … … 325 325 */ 326 326 327 void td_incr( short mode)328 { 329 register u nsignedcx;327 void td_incr(int16_t mode) 328 { 329 register uint16_t cx; 330 330 331 331 cx = exp_c(mode ? TDSELD : tdbox[6][4]); … … 340 340 */ 341 341 342 void td_intp( short mode)343 { 344 register u nsignedcx;342 void td_intp(int16_t mode) 343 { 344 register uint16_t cx; 345 345 346 346 cx = exp_c(mode ? TDSELD : tdbox[6][4]); … … 361 361 void advtcur(void) 362 362 { 363 register short newcol;363 register int16_t newcol; 364 364 365 365 if (infield(stcrow, stccol, curfet)) … … 385 385 void bsptcur(void) 386 386 { 387 register short newcol;387 register int16_t newcol; 388 388 389 389 if (infield(stcrow, stccol, curfet)) … … 411 411 */ 412 412 413 void dsttval( short row, short col, short val, unsigned fg, unsignedbg)414 { 415 register u nsignedcfg, cbg;413 void dsttval(int16_t row, int16_t col, int16_t val, uint16_t fg, uint16_t bg) 414 { 415 register uint16_t cfg, cbg; 416 416 417 417 cfg = exp_c(fg); … … 441 441 */ 442 442 443 void tdswin( short n)444 { 445 register short cx, i, tv;446 charts;443 void tdswin(int16_t n) 444 { 445 register int16_t cx, i, tv; 446 int8_t ts; 447 447 448 448 cx = exp_c(tdbox[n][5]); … … 589 589 void twins(void) 590 590 { 591 register short i;591 register int16_t i; 592 592 593 593 for (i = 0; i < 8; i++)
Note:
See TracChangeset
for help on using the changeset viewer.