← Back to branch summary

~ubuntu-branches/ubuntu/karmic/timidity/karmic

« back to all changes in this revision

Viewing changes to timidity/instrum.c

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Wenning
  • Date: 2009-05-08 22:55:09 UTC
  • mfrom: (2.1.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090508225509-9ays3b9pm70vongw
Tags: 2.13.2-22ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/control: Remove libarts1-dev from build depends and update
    timidity package description.
  - debian/rules: Remove arts from list of output options.
  - debian/timidity.default: Enable MIDI sequencer by default

Show diffs side-by-side

added added

removed removed

Lines of Context:
timidity/instrum.c
1043
1043
        char infomsg[256];
1044
1044
        
1045
1045
#ifndef CFG_FOR_SF
1046
 
        if (play_system_mode == GS_SYSTEM_MODE && (b == 64 || b == 65))
 
1046
        if (play_system_mode == GS_SYSTEM_MODE && (b == 64 || b == 65)) {
1047
1047
                if (! dr)       /* User Instrument */
1048
1048
                        recompute_userinst(b, prog);
1049
1049
                else            /* User Drumset */
1050
1050
                        recompute_userdrum(b, prog);
 
1051
        }
1051
1052
#endif
1052
1053
        if (bank->tone[prog].instype == 1 || bank->tone[prog].instype == 2) {
1053
1054
                if (bank->tone[prog].instype == 1) {    /* Font extention */