← Back to branch summary

~ubuntu-branches/ubuntu/quantal/vice/quantal

« back to all changes in this revision

Viewing changes to src/plus4/ted-sound.c

  • Committer: Bazaar Package Importer
  • Author(s): Laszlo Boszormenyi (GCS)
  • Date: 2009-03-31 00:37:15 UTC
  • mfrom: (1.1.7 upstream) (9.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20090331003715-i5yisvcfv7mgz3eh
Tags: 2.1.dfsg-1
http://bugs.debian.org/495937
http://bugs.debian.org/501181
* New major upstream release (closes: #495937).
* Add desktop files (closes: #501181).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plus4/ted-sound.c
96
96
 
97
97
    if (snd.digital) {
98
98
        for (i = 0; i < nr; i++) {
99
 
            pbuf[i * interleave] += (SDWORD)(snd.volume *
 
99
            pbuf[i * interleave] = sound_audio_mix(pbuf[i * interleave], (snd.volume *
100
100
                                   (snd.voice0_output_enabled
101
 
                                   + snd.voice1_output_enabled));
 
101
                                   + snd.voice1_output_enabled)));
102
102
        }
103
103
    } else {
104
104
        for (i = 0; i < nr; i++) {
176
176
                && (!(snd.noise_shift_register & 1)))
177
177
                volume += snd.volume;
178
178
 
179
 
            pbuf[i * interleave] += volume;
 
179
            pbuf[i * interleave] = sound_audio_mix(pbuf[i * interleave], volume);
180
180
        }
181
181
    }
182
182
    return 0;