~ubuntu-branches/debian/sid/bristol/sid

« back to all changes in this revision

Viewing changes to bristol/hammond.c

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2011-02-15 02:54:23 UTC
  • mfrom: (13.1.6 experimental)
  • Revision ID: james.westby@ubuntu.com-20110215025423-g8hcla5gyl08mae3
Tags: 0.60.8-2
* Upload to unstable.
* Relax JACK's build-deps to let this build in sid.

Show diffs side-by-side

added added

removed removed

Lines of Context:
226
226
                        buildHammondSound(operator, -1);
227
227
                        break;
228
228
                case 6: /* click */
229
 
                        param->param[index].float_val = value * 0.25;
 
229
                        param->param[index].float_val = value * value * 0.25;
230
230
                        break;
231
231
                case 7: /* Algo */
232
232
                        param->param[index].int_val = value * CONTROLLER_RANGE;
287
287
 
288
288
        wtp = local->wtp;
289
289
 
 
290
        /*
 
291
         * Go jumping through the wavetable, with each jump defined by the value
 
292
         * given on our input line.
 
293
         *
 
294
         * Make sure we fill one output buffer.
 
295
         *
 
296
         * The '-36' may look odd, but the tonewheel generator does not use MIDI
 
297
         * note indeces and this puts the key.key back into the gearing numbers.
 
298
         */
 
299
        if (param->param[7].int_val) {
 
300
                preach(ob, pb, voice->key.key - 36, param->param[2].mem,
 
301
                        param->param[3].mem, count, gain, damp, param->param[6].float_val,
 
302
                        voice->flags, voice->velocity);
 
303
        } else {
 
304
 
290
305
                /*
291
306
                 * Click may be in multiple stages - each click array is 2k samples,
292
307
                 * so if our sample block size is less than this we need to hit
316
331
                        clickset[voice->key.key] += count;
317
332
                }
318
333
 
319
 
        /*
320
 
         * Go jumping through the wavetable, with each jump defined by the value
321
 
         * given on our input line.
322
 
         *
323
 
         * Make sure we fill one output buffer.
324
 
         *
325
 
         * The '-36' may look odd, but the tonewheel generator does not use MIDI
326
 
         * note indeces and this puts the key.key back into the gearing numbers.
327
 
         */
328
 
        if (param->param[7].int_val) {
329
 
                preach(ob, pb, voice->key.key - 36, param->param[2].mem,
330
 
                        param->param[3].mem, count, gain, damp, param->param[6].float_val,
331
 
                        voice->flags, voice->velocity);
332
 
        } else {
333
334
                for (obp = 0; obp < count;)
334
335
                {
335
336
                        /*
452
453
        specs->spec.param[1].high = 1;
453
454
        specs->spec.param[1].flags = BRISTOL_ROTARY|BRISTOL_SLIDER;
454
455
 
455
 
        specs->spec.param[2].pname = "oscilator";
 
456
        specs->spec.param[2].pname = "oscillator";
456
457
        specs->spec.param[2].description = "Harmonic content definition";
457
458
        specs->spec.param[2].type = BRISTOL_INT;
458
459
        specs->spec.param[2].low = 0;