From f5f2a419b54e8bc2bb751806558d2120cbed2005 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Tue, 22 Jan 2013 23:10:21 +0000 Subject: [PATCH] Offset (almost) all instruments down one octave. With a couple of exceptions, the majority of OPL instruments sound better when adjusted down by one octave. It seems likely that the original BSD instruments were supposed to sound this way and we've been playing the wrong notes all this time. --- lumps/genmidi/config.py | 242 ++++++++++++++++++++-------------------- 1 file changed, 121 insertions(+), 121 deletions(-) diff --git a/lumps/genmidi/config.py b/lumps/genmidi/config.py index 8d5645c5..34fed34a 100644 --- a/lumps/genmidi/config.py +++ b/lumps/genmidi/config.py @@ -75,129 +75,129 @@ INSTRUMENTS = [ "instr004-2.sbi"), Instrument("instr005.sbi", # #005 - Electric Piano 1 "instr005-2.sbi"), - Instrument("instr006.sbi"), # #006 - Electric Piano 2 + Instrument("instr006.sbi", off1=-12), # #006 - Electric Piano 2 Instrument("instr007.sbi"), # #007 - Harpsichord - Instrument("instr008.sbi"), # #008 - Clavi - Instrument("instr009.sbi"), # #009 - Celesta - Instrument("instr010.sbi"), # #010 - Glockenspiel - Instrument("instr011.sbi"), # #011 - Music Box - Instrument("instr012.sbi"), # #012 - Vibraphone - Instrument("instr013.sbi"), # #013 - Marimba - Instrument("instr014.sbi"), # #014 - Xylophone - Instrument("instr015.sbi"), # #015 - Tubular Bells - Instrument("instr016.sbi"), # #016 - Dulcimer - Instrument("instr017.sbi"), # #017 - Drawbar Organ - Instrument("instr018.sbi"), # #018 - Percussive Organ - Instrument("instr019.sbi"), # #019 - Rock Organ - Instrument("instr020.sbi"), # #020 - Church Organ - Instrument("instr021.sbi"), # #021 - Reed Organ - Instrument("instr022.sbi"), # #022 - Accordion - Instrument("instr023.sbi"), # #023 - Harmonica - Instrument("instr024.sbi"), # #024 - Tango Accordion - Instrument("instr025.sbi"), # #025 - Acoustic Guitar (nylon) - Instrument("instr026.sbi"), # #026 - Acoustic Guitar (steel) - Instrument("instr027.sbi"), # #027 - Electric Guitar (jazz) - Instrument("instr028.sbi"), # #028 - Electric Guitar (clean) - Instrument("instr029.sbi"), # #029 - Electric Guitar (muted) - Instrument("instr030.sbi"), # #030 - Overdriven Guitar - Instrument("instr031.sbi"), # #031 - Distortion Guitar - Instrument("instr032.sbi"), # #032 - Guitar harmonics - Instrument("instr033.sbi"), # #033 - Acoustic Bass - Instrument("instr034.sbi"), # #034 - Electric Bass (finger) - Instrument("instr035.sbi"), # #035 - Electric Bass (pick) - Instrument("instr036.sbi"), # #036 - Fretless Bass - Instrument("instr037.sbi"), # #037 - Slap Bass 1 - Instrument("instr038.sbi"), # #038 - Slap Bass 2 - Instrument("instr039.sbi"), # #039 - Synth Bass 1 - Instrument("instr040.sbi"), # #040 - Synth Bass 2 - Instrument("instr041.sbi"), # #041 - Violin - Instrument("instr042.sbi"), # #042 - Viola - Instrument("instr043.sbi"), # #043 - Cello - Instrument("instr044.sbi"), # #044 - Contrabass - Instrument("instr045.sbi"), # #045 - Tremolo Strings - Instrument("instr046.sbi"), # #046 - Pizzicato Strings - Instrument("instr047.sbi"), # #047 - Orchestral Harp - Instrument("instr048.sbi"), # #048 - Timpani - Instrument("instr049.sbi"), # #049 - String Ensemble 1 - Instrument("instr050.sbi"), # #050 - String Ensemble 2 - Instrument("instr051.sbi"), # #051 - SynthStrings 1 - Instrument("instr052.sbi"), # #052 - SynthStrings 2 - Instrument("instr053.sbi"), # #053 - Choir Aahs - Instrument("instr054.sbi"), # #054 - Voice Oohs - Instrument("instr055.sbi"), # #055 - Synth Voice - Instrument("instr056.sbi"), # #056 - Orchestra Hit - Instrument("instr057.sbi"), # #057 - Trumpet - Instrument("instr058.sbi"), # #058 - Trombone - Instrument("instr059.sbi"), # #059 - Tuba - Instrument("instr060.sbi"), # #060 - Muted Trumpet - Instrument("instr061.sbi"), # #061 - French Horn - Instrument("instr062.sbi"), # #062 - Brass Section - Instrument("instr063.sbi"), # #063 - SynthBrass 1 - Instrument("instr064.sbi"), # #064 - SynthBrass 2 - Instrument("instr065.sbi"), # #065 - Soprano Sax - Instrument("instr066.sbi"), # #066 - Alto Sax - Instrument("instr067.sbi"), # #067 - Tenor Sax - Instrument("instr068.sbi"), # #068 - Baritone Sax - Instrument("instr069.sbi"), # #069 - Oboe - Instrument("instr070.sbi"), # #070 - English Horn - Instrument("instr071.sbi"), # #071 - Bassoon - Instrument("instr072.sbi"), # #072 - Clarinet - Instrument("instr073.sbi"), # #073 - Piccolo - Instrument("instr074.sbi"), # #074 - Flute - Instrument("instr075.sbi"), # #075 - Recorder - Instrument("instr076.sbi"), # #076 - Pan Flute - Instrument("instr077.sbi"), # #077 - Blown Bottle - Instrument("instr078.sbi"), # #078 - Shakuhachi - Instrument("instr079.sbi"), # #079 - Whistle - Instrument("instr080.sbi"), # #080 - Ocarina - Instrument("instr081.sbi"), # #081 - Lead 1 (square) + Instrument("instr008.sbi", off1=-12), # #008 - Clavi + Instrument("instr009.sbi", off1=-12), # #009 - Celesta + Instrument("instr010.sbi", off1=-12), # #010 - Glockenspiel + Instrument("instr011.sbi", off1=-12), # #011 - Music Box + Instrument("instr012.sbi", off1=-12), # #012 - Vibraphone + Instrument("instr013.sbi", off1=-12), # #013 - Marimba + Instrument("instr014.sbi", off1=-12), # #014 - Xylophone + Instrument("instr015.sbi", off1=-12), # #015 - Tubular Bells + Instrument("instr016.sbi", off1=-12), # #016 - Dulcimer + Instrument("instr017.sbi", off1=-12), # #017 - Drawbar Organ + Instrument("instr018.sbi", off1=-12), # #018 - Percussive Organ + Instrument("instr019.sbi", off1=-12), # #019 - Rock Organ + Instrument("instr020.sbi", off1=-12), # #020 - Church Organ + Instrument("instr021.sbi", off1=-12), # #021 - Reed Organ + Instrument("instr022.sbi", off1=-12), # #022 - Accordion + Instrument("instr023.sbi", off1=-12), # #023 - Harmonica + Instrument("instr024.sbi", off1=-12), # #024 - Tango Accordion + Instrument("instr025.sbi", off1=-12), # #025 - Acoustic Guitar (nylon) + Instrument("instr026.sbi", off1=-12), # #026 - Acoustic Guitar (steel) + Instrument("instr027.sbi", off1=-12), # #027 - Electric Guitar (jazz) + Instrument("instr028.sbi", off1=-12), # #028 - Electric Guitar (clean) + Instrument("instr029.sbi", off1=-12), # #029 - Electric Guitar (muted) + Instrument("instr030.sbi", off1=-12), # #030 - Overdriven Guitar + Instrument("instr031.sbi", off1=-12), # #031 - Distortion Guitar + Instrument("instr032.sbi", off1=-12), # #032 - Guitar harmonics + Instrument("instr033.sbi", off1=-12), # #033 - Acoustic Bass + Instrument("instr034.sbi", off1=-12), # #034 - Electric Bass (finger) + Instrument("instr035.sbi", off1=-12), # #035 - Electric Bass (pick) + Instrument("instr036.sbi", off1=-12), # #036 - Fretless Bass + Instrument("instr037.sbi", off1=-12), # #037 - Slap Bass 1 + Instrument("instr038.sbi", off1=-12), # #038 - Slap Bass 2 + Instrument("instr039.sbi", off1=-12), # #039 - Synth Bass 1 + Instrument("instr040.sbi", off1=-12), # #040 - Synth Bass 2 + Instrument("instr041.sbi", off1=-12), # #041 - Violin + Instrument("instr042.sbi", off1=-12), # #042 - Viola + Instrument("instr043.sbi", off1=-12), # #043 - Cello + Instrument("instr044.sbi", off1=-12), # #044 - Contrabass + Instrument("instr045.sbi", off1=-12), # #045 - Tremolo Strings + Instrument("instr046.sbi", off1=-12), # #046 - Pizzicato Strings + Instrument("instr047.sbi", off1=-12), # #047 - Orchestral Harp + Instrument("instr048.sbi", off1=-12), # #048 - Timpani + Instrument("instr049.sbi", off1=-12), # #049 - String Ensemble 1 + Instrument("instr050.sbi", off1=-12), # #050 - String Ensemble 2 + Instrument("instr051.sbi", off1=-12), # #051 - SynthStrings 1 + Instrument("instr052.sbi", off1=-12), # #052 - SynthStrings 2 + Instrument("instr053.sbi", off1=-12), # #053 - Choir Aahs + Instrument("instr054.sbi", off1=-12), # #054 - Voice Oohs + Instrument("instr055.sbi", off1=-12), # #055 - Synth Voice + Instrument("instr056.sbi", off1=-12), # #056 - Orchestra Hit + Instrument("instr057.sbi", off1=-12), # #057 - Trumpet + Instrument("instr058.sbi", off1=-12), # #058 - Trombone + Instrument("instr059.sbi", off1=-12), # #059 - Tuba + Instrument("instr060.sbi", off1=-12), # #060 - Muted Trumpet + Instrument("instr061.sbi", off1=-12), # #061 - French Horn + Instrument("instr062.sbi", off1=-12), # #062 - Brass Section + Instrument("instr063.sbi", off1=-12), # #063 - SynthBrass 1 + Instrument("instr064.sbi", off1=-12), # #064 - SynthBrass 2 + Instrument("instr065.sbi", off1=-12), # #065 - Soprano Sax + Instrument("instr066.sbi", off1=-12), # #066 - Alto Sax + Instrument("instr067.sbi", off1=-12), # #067 - Tenor Sax + Instrument("instr068.sbi", off1=-12), # #068 - Baritone Sax + Instrument("instr069.sbi", off1=-12), # #069 - Oboe + Instrument("instr070.sbi", off1=-12), # #070 - English Horn + Instrument("instr071.sbi", off1=-12), # #071 - Bassoon + Instrument("instr072.sbi", off1=-12), # #072 - Clarinet + Instrument("instr073.sbi", off1=-12), # #073 - Piccolo + Instrument("instr074.sbi", off1=-12), # #074 - Flute + Instrument("instr075.sbi", off1=-12), # #075 - Recorder + Instrument("instr076.sbi", off1=-12), # #076 - Pan Flute + Instrument("instr077.sbi", off1=-12), # #077 - Blown Bottle + Instrument("instr078.sbi", off1=-12), # #078 - Shakuhachi + Instrument("instr079.sbi", off1=-12), # #079 - Whistle + Instrument("instr080.sbi", off1=-12), # #080 - Ocarina + Instrument("instr081.sbi", off1=-12), # #081 - Lead 1 (square) Instrument("instr082.sbi"), # #082 - Lead 2 (sawtooth) - Instrument("instr083.sbi"), # #083 - Lead 3 (calliope) - Instrument("instr084.sbi"), # #084 - Lead 4 (chiff) - Instrument("instr085.sbi"), # #085 - Lead 5 (charang) - Instrument("instr086.sbi"), # #086 - Lead 6 (voice) - Instrument("instr087.sbi"), # #087 - Lead 7 (fifths) - Instrument("instr088.sbi"), # #088 - Lead 8 (bass + lead) - Instrument("instr089.sbi"), # #089 - Pad 1 (new age) - Instrument("instr090.sbi"), # #090 - Pad 2 (warm) - Instrument("instr091.sbi"), # #091 - Pad 3 (polysynth) - Instrument("instr092.sbi"), # #092 - Pad 4 (choir) - Instrument("instr093.sbi"), # #093 - Pad 5 (bowed) - Instrument("instr094.sbi"), # #094 - Pad 6 (metallic) - Instrument("instr095.sbi"), # #095 - Pad 7 (halo) - Instrument("instr096.sbi"), # #096 - Pad 8 (sweep) - Instrument("instr097.sbi"), # #097 - FX 1 (rain) - Instrument("instr098.sbi"), # #098 - FX 2 (soundtrack) - Instrument("instr099.sbi"), # #099 - FX 3 (crystal) - Instrument("instr100.sbi"), # #100 - FX 4 (atmosphere) - Instrument("instr101.sbi"), # #101 - FX 5 (brightness) - Instrument("instr102.sbi"), # #102 - FX 6 (goblins) - Instrument("instr103.sbi"), # #103 - FX 7 (echoes) - Instrument("instr104.sbi"), # #104 - FX 8 (sci-fi) - Instrument("instr105.sbi"), # #105 - Sitar - Instrument("instr106.sbi"), # #106 - Banjo - Instrument("instr107.sbi"), # #107 - Shamisen - Instrument("instr108.sbi"), # #108 - Koto - Instrument("instr109.sbi"), # #109 - Kalimba - Instrument("instr110.sbi"), # #110 - Bag pipe - Instrument("instr111.sbi"), # #111 - Fiddle - Instrument("instr112.sbi"), # #112 - Shanai - Instrument("instr113.sbi"), # #113 - Tinkle Bell - Instrument("instr114.sbi"), # #114 - Agogo - Instrument("instr115.sbi"), # #115 - Steel Drums - Instrument("instr116.sbi"), # #116 - Woodblock - Instrument("instr117.sbi"), # #117 - Taiko Drum - Instrument("instr118.sbi"), # #118 - Melodic Tom - Instrument("instr119.sbi"), # #119 - Synth Drum - Instrument("instr120.sbi"), # #120 - Reverse Cymbal - Instrument("instr121.sbi"), # #121 - Guitar Fret Noise - Instrument("instr122.sbi"), # #122 - Breath Noise - Instrument("instr123.sbi"), # #123 - Seashore - Instrument("instr124.sbi"), # #124 - Bird Tweet - Instrument("instr125.sbi"), # #125 - Telephone Ring - Instrument("instr126.sbi"), # #126 - Helicopter - Instrument("instr127.sbi"), # #127 - Applause - Instrument("instr128.sbi"), # #128 - Gunshot + Instrument("instr083.sbi", off1=-12), # #083 - Lead 3 (calliope) + Instrument("instr084.sbi", off1=-12), # #084 - Lead 4 (chiff) + Instrument("instr085.sbi", off1=-12), # #085 - Lead 5 (charang) + Instrument("instr086.sbi", off1=-12), # #086 - Lead 6 (voice) + Instrument("instr087.sbi", off1=-12), # #087 - Lead 7 (fifths) + Instrument("instr088.sbi", off1=-12), # #088 - Lead 8 (bass + lead) + Instrument("instr089.sbi", off1=-12), # #089 - Pad 1 (new age) + Instrument("instr090.sbi", off1=-12), # #090 - Pad 2 (warm) + Instrument("instr091.sbi", off1=-12), # #091 - Pad 3 (polysynth) + Instrument("instr092.sbi", off1=-12), # #092 - Pad 4 (choir) + Instrument("instr093.sbi", off1=-12), # #093 - Pad 5 (bowed) + Instrument("instr094.sbi", off1=-12), # #094 - Pad 6 (metallic) + Instrument("instr095.sbi", off1=-12), # #095 - Pad 7 (halo) + Instrument("instr096.sbi", off1=-12), # #096 - Pad 8 (sweep) + Instrument("instr097.sbi", off1=-12), # #097 - FX 1 (rain) + Instrument("instr098.sbi", off1=-12), # #098 - FX 2 (soundtrack) + Instrument("instr099.sbi", off1=-12), # #099 - FX 3 (crystal) + Instrument("instr100.sbi", off1=-12), # #100 - FX 4 (atmosphere) + Instrument("instr101.sbi", off1=-12), # #101 - FX 5 (brightness) + Instrument("instr102.sbi", off1=-12), # #102 - FX 6 (goblins) + Instrument("instr103.sbi", off1=-12), # #103 - FX 7 (echoes) + Instrument("instr104.sbi", off1=-12), # #104 - FX 8 (sci-fi) + Instrument("instr105.sbi", off1=-12), # #105 - Sitar + Instrument("instr106.sbi", off1=-12), # #106 - Banjo + Instrument("instr107.sbi", off1=-12), # #107 - Shamisen + Instrument("instr108.sbi", off1=-12), # #108 - Koto + Instrument("instr109.sbi", off1=-12), # #109 - Kalimba + Instrument("instr110.sbi", off1=-12), # #110 - Bag pipe + Instrument("instr111.sbi", off1=-12), # #111 - Fiddle + Instrument("instr112.sbi", off1=-12), # #112 - Shanai + Instrument("instr113.sbi", off1=-12), # #113 - Tinkle Bell + Instrument("instr114.sbi", off1=-12), # #114 - Agogo + Instrument("instr115.sbi", off1=-12), # #115 - Steel Drums + Instrument("instr116.sbi", off1=-12), # #116 - Woodblock + Instrument("instr117.sbi", off1=-12), # #117 - Taiko Drum + Instrument("instr118.sbi", off1=-12), # #118 - Melodic Tom + Instrument("instr119.sbi", off1=-12), # #119 - Synth Drum + Instrument("instr120.sbi", off1=-12), # #120 - Reverse Cymbal + Instrument("instr121.sbi", off1=-12), # #121 - Guitar Fret Noise + Instrument("instr122.sbi", off1=-12), # #122 - Breath Noise + Instrument("instr123.sbi", off1=-12), # #123 - Seashore + Instrument("instr124.sbi", off1=-12), # #124 - Bird Tweet + Instrument("instr125.sbi", off1=-12), # #125 - Telephone Ring + Instrument("instr126.sbi", off1=-12), # #126 - Helicopter + Instrument("instr127.sbi", off1=-12), # #127 - Applause + Instrument("instr128.sbi", off1=-12), # #128 - Gunshot ] # Percussion instruments: