diff --git a/ChangeLog b/ChangeLog index e5c0982..945cb00 100755 --- a/ChangeLog +++ b/ChangeLog @@ -271,7 +271,7 @@ to the server from the audio thread. The BME-700 Glide on/off switch was not active. -Roadrunner Vibrato was too deep, by a long way. Scaled back the tremelo at the +Roadrunner Vibrato was too deep, by a long way. Scaled back the tremolo at the same time. Gentle vibrato was still possible but not under mouse control, it had to be done with keyboard accel/deccel. @@ -1846,7 +1846,7 @@ to force the save settings into the active set. The Polysix emulation would clip excessively with the modgroup was routed fully to the VCA. The signal gain from the LFO would result in an overdriven output. Reduced all the respective output stage signal levels, which are still -quite strong anyway, and also some of the tremelo depth when mod routed. This +quite strong anyway, and also some of the tremolo depth when mod routed. This will have a minor effect on some patches. Incorporated Andrew Coughlan's manual page for the Polysix emulator. diff --git a/README b/README index 2c043ca..c90a453 100644 --- a/README +++ b/README @@ -20,7 +20,7 @@ synth, is common to all the emulations. The filter implements a few different algorithms and these do separate each of the synths: the Explorer layering two low pass filters on top of each other: the OB-Xa using different types depending on 'Pole' selection. Since release 0.20.8 the emulator has had a -Houvillainen non-linear ladder filter integrated which massively improves +Huovilainen non-linear ladder filter integrated which massively improves the quality at considerable expense to the CPU. There is one further filter algorithm used solely for the Leslie rotary emulator crossover, this is a butterworth type filter. @@ -32,7 +32,7 @@ original instrument, and the author maintains that if you want the original sound then you are advised to seek out the original product. Alternatively a number of the original manufacturers now provide their own vintage collections which are anticipated to be more authentic. All names and trademarks used by -Bristol are ownership of the respective companies and it is not inteded to +Bristol are ownership of the respective companies and it is not intended to misappropriate their use here. If you have concerns you are kindly requested to contact the author. @@ -46,7 +46,7 @@ really want to know about the synths that are not in this document then you might want to search for their owners manuals. All emulations are available from the same engine, just launch multiple GUIs -and adjust the midi channels for multi timbrality and layering. +and adjust the MIDI channels for multitimbrality and layering. It is noted here that the engine is relatively 'dumb'. Ok, it generates a very broad range of sounds, currently about 25 different synthesisers and organs, @@ -56,7 +56,7 @@ calls a memory routine that configures all the GUI controllers and a side effect of setting the controllers is that their values are sent to the engine. This is arguably the correct model but it can affect the use of MIDI master keyboards. The reason is that the GUI is really just a master keyboard for the engine and -drives it with MIDI SYSEX messages over TCP sessions. If you were to alter the +drives it with MIDI SysEx messages over TCP sessions. If you were to alter the keyboard transpose, for example, this would result in the GUI sending different 'key' numbers to the engine when you press a note. If you were already driving the synth from a master keyboard then the transpose button in the Brighton GUI @@ -97,7 +97,7 @@ Popular as it was about the first non-modular synthesiser, built as a fixed configuration of the racked or modular predecessors. Best known at the time on Pink Floyd 'Dark Side of the Moon' and other albums. -Rick Wakeman used it as did Jean Michel Jarre. Wakefield could actually +Rick Wakeman used it as did Jean-Michel Jarre. Wakefield could actually predict the sound it would make by just looking at the settings, nice to be able to do if a little unproductive but it went to show how this was treated as an instrument in its own right. It takes a bit of work to get the same sweet, @@ -200,10 +200,10 @@ Contour: Improvements to the Mini would be some better oscillator waveforms, plus an alternative filter as this is a relatively simple synthesiser and could do -with a warmer filter (this was fixed with integration of the houvillanen filters +with a warmer filter (this was fixed with integration of the Huovilainen filters although the do consume a lot of CPU to do it). -The Output selection has a Midi channel up/down selector and memory selector. +The Output selection has a MIDI channel up/down selector and memory selector. To read a memory either use the up/down arrows to go to the next available memory, or type in a 3 digit number on the telephone keypad and press 'L' for load or 'S' for save. @@ -269,7 +269,7 @@ Sequential circuits released amongst the first truly polyphonic synthesisers where a group of voice circuits (5 in this case) were linked to an onboard computer that gave the same parameters to each voice and drove the notes to each voice from the keyboard. The device had some limited memories to allow -for real live stage work. The synth was amazingly flexible regaring the +for real live stage work. The synth was amazingly flexible regarding the oscillator options and modulation routing, producing some of the fattest sounds around. They also had some of the fattest pricing as well, putting it out of reach of all but the select few, something that maintained its mythical @@ -353,7 +353,7 @@ Global: Master Volume A440 - stable sine wave at A440 Hz for tuning. - Midi: channel up/down + MIDI: channel up/down Release: release all notes Tune: autotune oscillators. Glide: amount of portamento @@ -448,14 +448,14 @@ Memories can be selected with either submitting a 3 digit number on the keypad, or selecting the orange up/down buttons. An improvement could be more preset memories with different sounds that can -then be modified, ie, more library sounds. There are some improvements that +then be modified, i.e., more library sounds. There are some improvements that could be made to polyphonic mods from key velocity and channel/poly pressure that would not be difficult to implement. The addition of triangle of other complex waveforms could be a fun development effort (if anyone were to want to do it). -The DX still has a prependancy to seg fault, especially when large gains are +The DX still has a prependency to segfault, especially when large gains are applied to input signals. This is due to loose bounds checking that will be extended in a present release. @@ -510,7 +510,7 @@ DCO: ENV/LFO/MANUAL: Modulator for PWM Waveform: - Pulse or Ramp wave. Pulse has PWM capabily. + Pulse or Ramp wave. Pulse has PWM capability. Sub oscillator: On/Off first fundamental square wave. @@ -702,11 +702,11 @@ the memory section plus a panel that can modify any of the synth parameters as a real time control. Press the first mouse key here and move the mouse around to adjust the controls. Default values are LFO frequency and filter cutoff but values can be changed with the 'panel' button. This is done by selecting -'panel' rather than 'midi', and then using the up/down keys to select parameter +'panel' rather than 'MIDI', and then using the up/down keys to select parameter that will be affected by the x and y motion of the mouse. At the moment the mod routing from the pad controller is not saved to the memories, and it will remain so since the pad controller is not exactly omnipresent on MIDI master -keyboards - the capabilities was put into the GIU to be 'exact' to the design. +keyboards - the capabilities was put into the GUI to be 'exact' to the design. This synth is amazingly flexible and difficult to advise on its best use. Try starting by mixing just oscillator 1 through to the filter, working on mod @@ -726,8 +726,8 @@ will show whether it is is free (FRE) or programmed already (PRG). The author first implemented the Hammond module, then extended it to the B3 emulation. Users of this are too numerous to mention and the organ is still -popular. Jimmy Smith, Screaming Jay Hawkins, Kieth Emerson, Doors and -almost all american gospel blues. Smith was profuse, using the instrument for +popular. Jimmy Smith, Screaming Jay Hawkins, Keith Emerson, Doors and +almost all American gospel blues. Smith was profuse, using the instrument for a jazz audience, even using its defects (key noise) to great effect. Emerson had two on stage, one to play and another to kick around, even including stabbing the keyboard with a knife to force keylock during performances @@ -751,7 +751,7 @@ fared only a little better than that. The age of the Hammond organ had arrived. The company had a love/hate relationship with the Leslie speaker company - the latter making money by selling their rotary speakers along with the organ to -wide acceptance. The fat hammond 'chorus' was a failed attempt to distance +wide acceptance. The fat Hammond 'chorus' was a failed attempt to distance themselves from Leslie. That was never achieved due to the acceptance of the Leslie, but the chorus did add another unique sound to the already awesome instrument. The rotary speaker itself still added an extra something to the @@ -761,7 +761,7 @@ range of operating modes most of which are included in this emulator. The chorus emulation is an 8 stage phase shifting filter algorithm with a linear rotor between the taps. -Parameterisation of the first B3 window follows the original design: +Parametrisation of the first B3 window follows the original design: Leslie: Rotary speaker on/off Reverb: Reverb on/off @@ -1016,14 +1016,14 @@ wearing gloves to quite good effect. After that The Specials began the Mod/Ska revival using one. The sharp and strong harmonic content has the ability to cut into a mix and make its presence known. -The organ was a british design, eventually sold (to Crumar?) and made into a +The organ was a British design, eventually sold (to Crumar?) and made into a number of plastic alternatives. Compared to the Hammond this was a fully electronic instrument, no moving parts, and much simpler. It had a very characteristic sound though, sharper and perhaps thinner but was far cheaper than its larger cousin. It used a master oscillator that was divided down to each harmonic for each key (as did the later Hammonds for price reasons). This oscillator division design was used in the first of the polyphonic synthesisers -where the divided note was fead through individual envelope generators and +where the divided note was fed through individual envelope generators and a shared or individual filter (Polymoog et al). The Vox is also a drawbar instrument, but far simplified compared to the @@ -1092,7 +1092,7 @@ were not big sellers, they were temperamental and liable to be temperature sensitive due to the amount of electronics hidden away inside. The original layering and 'unison' allowed the original to function as two independent synths, a pair of layered synths (both keyboards then played the same sound), -as a monophonic synth in 'unison' mode on one keybaord with a second polyphonic +as a monophonic synth in 'unison' mode on one keyboard with a second polyphonic unit on the other, or even all 10 voices on a single keyed note for a humongous 20 oscillator monophonic monster. @@ -1126,7 +1126,7 @@ Sequential circuits released amongst the first truly polyphonic synthesisers where a group of voice circuits (5 in this case) were linked to an onboard computer that gave the same parameters to each voice and drove the notes to each voice from the keyboard. The device had some limited memories to allow -for real live stage work. The synth was amazingly flexible regaring the +for real live stage work. The synth was amazingly flexible regarding the oscillator options and modulation routing, producing some of the fattest sounds around. They also had some of the fattest pricing as well, putting it out of reach of all but the select few, something that maintained its mythical @@ -1210,7 +1210,7 @@ Global: Master Volume A440 - stable sine wave at A440 Hz for tuning. - Midi: channel up/down + MIDI: channel up/down Release: release all notes Tune: autotune oscillators. Glide: amount of portamento @@ -1309,7 +1309,7 @@ Oscillators: ** If no waveform is selected then a triangle is generated. - *** The original synth had Osc-2 crossmodifying Osc-1, this is not totally + *** The original synth had Osc-2 cross-modifying Osc-1, this is not totally feasible with the sync options as they are not mutually exclusive here. Cross modulation is noisy if the source or dest wave is pulse, something that may be fixed in a future release. @@ -1370,7 +1370,7 @@ me know. This is almost two OB-X in a single unit. With one keyboard they could provide the same sounds but with added voicing for split/layers/poly options. The OB-Xa -did at least work with all 10 voices, had a single keyboard, and is renound for +did at least work with all 10 voices, had a single keyboard, and is renown for the sounds of van Halen 'Jump' and Stranglers 'Strange Little Girl'. The sound had the capability to cut through a mix to upstage even guitar solo's. Oberheim went on to make the most over the top analogue synths before the cut price @@ -1413,7 +1413,7 @@ Modulation: PWM: Amount of LFO going to: PWM Osc-1 PWM Osc-2 - Tremelo + Tremolo Oscillators: @@ -1532,7 +1532,7 @@ The chord memory is similar to the Unison mode except that Unison plays all voices with the same note. Chording will assign one voice to each notes in the chord for a richer sound. To enable Chording press the 'Hold' button. This is not the same as the original since it used the hold button as a sustain -option however that does not function well with a Gui and so it was reused. +option however that does not function well with a GUI and so it was reused. To reprogram the Chord memory do the following: press the PRG button then the Hold button. You can then press the keys, up to 8, that you want in the chord, @@ -1594,7 +1594,7 @@ configure all the oscillators/filters/envelopes. The synth stages do follow the typical synth design, there are modulation controllers and an FX section feeding into the oscillators and filter. The effects section is a set of controllers that can be configured and then enabled/disabled with a button -press. The overall layout is rather kludgy, with some controllers that are +press. The overall layout is rather kludgey, with some controllers that are typically grouped being dispersed over the control panel. Control: @@ -1602,7 +1602,7 @@ Control: Volume Arpeg: - Whether arpegiator steps up, down, or down then up. This works in + Whether arpeggiator steps up, down, or down then up. This works in conjunction with the 'Hold' mode described later. Glide: glissando note to note. Does not operate in all modes @@ -1675,14 +1675,14 @@ Mode: Mono: First 4 keypresses are memorised, further notes are then chorded together monophonically. Poly: - Notes are argeggiated in sequence, new note presses are appended + Notes are arpeggiated in sequence, new note presses are appended to the chain. Arpeggiation is up, down or up/down. Share: - First 4 notes are memorised and are then argeggiated in sequence, + First 4 notes are memorised and are then arpeggiated in sequence, new note presses will transpose the arpeggiation. Stepping is up, down or up/down. - There are several controllers that affect arpeggation: + There are several controllers that affect arpeggiation: Arpeg - direction of stepping MG-2 - Frequency of steps from about 10 seconds down to 50 bps. @@ -1691,7 +1691,7 @@ Mode: Effects: There are three main effects, or perhaps rather modulations, that are - controlled in this section. These are vibrato, crossmodulated frequency + controlled in this section. These are vibrato, cross-modulated frequency and oscillator synchronisation. The application of each mod is configured with the controllers and then all of them can be enabled/disabled with the 'Effects' button. This allows for big differences in sound to be @@ -1702,13 +1702,13 @@ Effects: be changed afterwards for Effects/Poly for example, and they work with the arpeggiation function. - X-Mod: frequency crossmodulation between oscillators - Freq: frequency modulation by MG-1 (vibrato) or Envlope (sweep) + X-Mod: frequency cross-modulation between oscillators + Freq: frequency modulation by MG-1 (vibrato) or Envelope (sweep) Mode: Syn: Oscillators are synchronised - X-M: Oscillators are crossmodulated - S-X: Oscillators are crossmodulated and synchronised + X-M: Oscillators are cross-modulated + S-X: Oscillators are cross-modulated and synchronised SNG: Single mode: synth had a master oscillator (1) and three slaves (2/3/4) @@ -1793,7 +1793,7 @@ different Slave modes. This is the first and probably the only bristol synth tha will have an inbuilt arpeggiator. The feature was possible here due to the mono synth specification, and whilst it could be built into the MIDI library for general use it is left up to the MIDI sequencers (that largely came along to -replace the 1980s arpeggiators anyway) that are generally availlable on Linux. +replace the 1980s arpeggiators anyway) that are generally available on Linux. [Other instruments emulated by bristol that also included arpeggiation but do not have in the emulation were the Juno-6, Prophet-10, Oberheim OB-Xa, Poly6]. @@ -1810,7 +1810,7 @@ assignment may be wrong. Korg in no way endorses this emulation of their classic synthesiser and have their own emulation product that gives the features offered here. Korg, Mono/Poly, Poly-6, MS-20, Vox and Continental are all registered names or -trademarks of Korg Inc of Japan. +trademarks of Korg Inc. of Japan. Quite a few liberties were taken with this synth. There were extremely few differences between the original and the Roland Juno 6, they both had one osc @@ -1917,7 +1917,7 @@ different. The emulation does not have an arpeggiator. VCA: Env: When on, this causes the Amplitude envelope to affect the sound. - I.E, If you have a long attack time, you get a long attack time. + i.e., If you have a long attack time, you get a long attack time. Gate: When on, this causes the Amplitude envelope only (not the filter envelope) to be be bypassed. Gain: Gain of signal. @@ -1931,12 +1931,12 @@ different. The emulation does not have an arpeggiator. Intensity: How much the effects affect the output. -There are some mildly anomolous effects possible from the MG section, especially +There are some mildly anomalous effects possible from the MG section, especially with the VCA. The MG and the env are summed into the VCA which means if the env decays to zero then the LFO may end up pumping the volume, something that may be unexpected. Similarly, if the LFO is pumping and the voice finally stops its cycle then the closing gate may cause a pop on the MG signal. These can be -resolved however the current behavious is probably close to the original. +resolved however the current behaviour is probably close to the original. Bristol thanks Andrew Coughlan for patches, bug reports, this manual page and diverse suggestions to help improve the application. @@ -1944,7 +1944,7 @@ diverse suggestions to help improve the application. Korg in no way endorses this emulation of their classic synthesiser and have their own emulation product that gives the features offered here. Korg, Mono/Poly, Poly-6, MS-20, Vox and Continental are all registered names or -trademarks of Korg Inc of Japan. +trademarks of Korg Inc. of Japan. @@ -1988,7 +1988,7 @@ TBD. This is actually a lot warmer than the Mini emulator, largely due to being later code. The mini should be revisited but I am saving that pleasure for when some more filters are available. [This was done during the 0.20 stream using the -Houvilainen filters and bandwidth limited oscillators to produce a far richer +Huovilainen filters and bandwidth limited oscillators to produce a far richer sound. Also incorporate a number of fixes to the emulation stages.]. @@ -2019,7 +2019,7 @@ can be repatched into any of the 50 or so inputs. Patches cause no overhead in the engine as it uses default buffering when not repatched, so feel free to put in as many cables as you can fit. Patches in the GUI still demand a lot of CPU cycles. Release -77 improved this about 5-fold and further improvements are in -the pipeline: the 0.10 stream implemented color caching and XImage graphics +the pipeline: the 0.10 stream implemented colour caching and XImage graphics interface which massively improved GUI performance. @@ -2125,14 +2125,14 @@ from the poly section. This is a minor issue as the poly oscillator can be zeroed out in the mixer. It is noted here that this emulation is just a freebie, the interface is kept -simple with no midi channel selection (start it with the -channel option and +simple with no MIDI channel selection (start it with the -channel option and it stays there) and no real memories (start it with the -load option and it will stay on that memory location). There is an extra button on the front panel (a mod?) and pressing it will save the current settings for next time it is started. I could have done more, and will if people are interested, but I built it since the current developments were a granular synth and it was hard work getting my head around the grain/wave manipulations, so to give -myself a rest I put this together one weekend. The Rhodesbass and ARP AXXE +myself a rest I put this together one weekend. The Rhodesbass and ARP Axxe were done for similar reasons. I considered adding another mod button, to make the mono section also truly polyphonic but that kind of detracts from the original. Perhaps I should put together a Polymoog sometime that did kind of @@ -2140,7 +2140,7 @@ work like that anyway. This was perhaps a strange choice, however I like the way it highlights the difference between monophonic, polyphonic and 'neopolyphonic' synthesised -organs (such as the polymoog). Its a fun synth as well, few people are likely +organs (such as the Polymoog). Its a fun synth as well, few people are likely to every bother buying one as they cost more now than when they were produced due to being collectable: for the few hundred dollars they would set you back on eBay you can get a respectable polyphonic unit. @@ -2185,7 +2185,7 @@ the feature. The lower manual responds to the MIDI channel on which the emulation was started. The upper manual responds to notes greater than MIDI key 48 on the next channel up. The Bass section also responds to this second channel on keys -lower than #48. Once started you cannot change the midi channel - use the +lower than #48. Once started you cannot change the MIDI channel - use the '-channel' option at startup to select the one you want. The actual available max is 15 and that is enforced. @@ -2253,7 +2253,7 @@ PWM: Modified by Env-1 or LFO DCO-1: - Crossmod (FM) from DCO2 to DCO1 + Cross-mod (FM) from DCO2 to DCO1 Modified by Env-1 Octave range 16' to 2' (all mixable) @@ -2342,7 +2342,7 @@ this will initiate the recording. It does not matter which of the mode is selected since they will all start the recording sequence. When you have finished then select the mode button again (you may want to clear the function key if still active). You can record up to 256 steps, either from the GUI -keyboard or from a master controller and the notes are saved into a midi +keyboard or from a master controller and the notes are saved into a MIDI key memory. There is no capability to edit the sequences once they have been entered, that @@ -2427,7 +2427,7 @@ in either the Jupiter-6 or -8. There are several parts to the synth memories. Layer parameters govern sound generation, synth parameters that govern operating modes such Dual/Split, -Solo/Unison etc, Function settings that modify internal operations, the +Solo/Unison etc., Function settings that modify internal operations, the parameters for the mod panel and finally the Arpeggiator sequences. These sequences are actually separate from the arpeggiator settings however that was covered in the notes above. @@ -2509,7 +2509,7 @@ cleaner and not as phat as the original. You might say it sounds more like something that comes from Uranus rather than Jupiter and consideration was indeed given to a tongue in cheek renaming of the emulation..... The author is allowed this criticism as he wrote the application - as ever, if you want the -original sound then buy the original synth (or get Rolands own emulation?). +original sound then buy the original synth (or get Roland's own emulation?). A few notes are required on oscillator sync since by default it will seem to be quite noisy. The original could only product a single waveform at a single @@ -2518,7 +2518,7 @@ oscillator which generates complex waveforms. The Bristol Bitone can generate up to 4 waveforms simultaneously at different levels for 5 different harmonics and the consequent output is very rich, the waves can be slightly detuned, the pulse output can be PW modulated. As with all the bristol oscillators that -support sync, the sync pulse is extracted as a postive leading zero crossing. +support sync, the sync pulse is extracted as a positive leading zero crossing. Unfortunately if the complex bitone output is used as input to sync another oscillator then the result is far too many zero crossings to extract a good sync. For the time being you will have to simplify the sync source to get a @@ -2677,8 +2677,8 @@ code maintains separate directories. There are three slightly different Bit GUI's. The first is the bit-1 with a limited parameter set as it only had 64 parameters. The second is the bit-99 -that included midi and split options in the GUI and has the white design that -was an offered by Crumar. The third is a slightly homogenous design that is +that included MIDI and split options in the GUI and has the white design that +was an offered by Crumar. The third is a slightly homogeneous design that is specific to bristol, similar to the black panelled bit99 but with a couple of extra parameters. All the emulations have the same parameters, some require you use the data entry controls to access them. This is the same as the original, @@ -2939,7 +2939,7 @@ oscillator which generates complex waveforms. The Bristol Bitone can generate up to 4 waveforms simultaneously at different levels for 5 different harmonics and the consequent output is very rich, the waves can be slightly detuned, the pulse output can be PW modulated. As with all the bristol oscillators that -support sync, the sync pulse is extracted as a postive leading zero crossing. +support sync, the sync pulse is extracted as a positive leading zero crossing. Unfortunately if the complex bitone output is used as input to sync another oscillator then the result is far too many zero crossings to extract a good sync. @@ -2956,7 +2956,7 @@ results are far better Sequential circuits released amongst the first truly polyphonic synthesisers where a group of voice circuits (5 to 10 of them) were linked to an onboard computer that gave the same parameters to each voice and drove the notes to -each voice from the keyboard. The costs were nothing short of exhorbitant and +each voice from the keyboard. The costs were nothing short of exorbitant and this lead to Sequential releasing a model with just one voice board as a mono- phonic equivalent. The sales ran up to 10,000 units, a measure of its success and it continues to be recognised alongside the Mini Moog as a fat bass synth. @@ -3023,7 +3023,7 @@ Filter: Cutoff: cuttof frequency Res: Resonance/Q/Emphasis Env: amount of modulation affecting to cutoff. - KBD: amount of keyboard trackingn to cutoff + KBD: amount of keyboard tracking to cutoff Envelopes: One each for PolyMod (filter) and amplifier. @@ -3078,7 +3078,7 @@ it has not been coded that way). The filter envelope is configured to ignore velocity. The default filters are quite expensive. The -lwf option will select the less -computationally expensive lightweight Chamberlain filters which have a colder +computationally expensive lightweight Chamberlin filters which have a colder response but require zonks fewer CPU cycles. @@ -3208,11 +3208,11 @@ the memory section plus a panel that can modify any of the synth parameters as a real time control. Press the first mouse key here and move the mouse around to adjust the controls. Default values are LFO frequency and filter cutoff but values can be changed with the 'panel' button. This is done by selecting -'panel' rather than 'midi', and then using the up/down keys to select parameter +'panel' rather than 'MIDI', and then using the up/down keys to select parameter that will be affected by the x and y motion of the mouse. At the moment the mod routing from the pad controller is not saved to the memories, and it will remain so since the pad controller is not exactly omnipresent on MIDI master -keyboards - the capabilities was put into the GIU to be 'exact' to the design. +keyboards - the capabilities was put into the GUI to be 'exact' to the design. This synth is amazingly flexible and difficult to advise on its best use. Try starting by mixing just oscillator 1 through to the filter, working on mod @@ -3231,7 +3231,7 @@ will show whether it is is free (FRE) or programmed already (PRG). ------------ This original design was made by an engineer who had previously worked with -Moog on the big modular systems, Gene Zumchek. He tried to get Moog Inc to +Moog on the big modular systems, Gene Zumchek. He tried to get Moog Inc. to develop a small standalone unit rather than the behemoths however he could not get heard. After leaving he built a synth eventually called a Sonic-5 that did fit the bill but sales volumes were rather small. He had tied up with a @@ -3240,7 +3240,7 @@ not being known, muSonics. This was quickly overcome by accident. Moog managed to run his company into rather large debt and the company folded. Bill Waytena, working with Zumcheck, gathered together the funding needed to buy the remains of the failed company -and hence Moog Inc was labled on the rebadged Sonic-6. Zumcheck was eventually +and hence Moog Inc. was labeled on the rebadged Sonic-6. Zumcheck was eventually forced to leave this company (or agreed to) as he could not work with Moog. After a few modifications Bob Moog actually used this unit quite widely for lecturing on electronic music. For demonstrative purposes it is far more @@ -3260,7 +3260,7 @@ the original The original was duophonic, kind of. It had a keyboard with high note and low note precedence and the two oscillators could be driven from different notes. Its not really duophony and was reportedly not nice to play but it added some -flexibility to the instrument. This features was dropped largley because it +flexibility to the instrument. This features was dropped largely because it is ugly to emulate in a polyphonic environment but the code still has glide only on Osc-B. It has the two LFO that can be mixed, or at full throw of the GenXY mixer they will link X->A and Y->B giving some interesting routing, two @@ -3275,7 +3275,7 @@ There is currently no likely use for an external signal even though the graphics are there. The original envelope was AR or ASR. The emulator has a single ADSR and a -control switch to select AR (actually AD), ASR, ADSD (MiniMoog envelope) or +control switch to select AR (actually AD), ASR, ADSD (Minimoog envelope) or ADSR. Generator-Y has a S/H function on the noise source for a random signal which @@ -3357,7 +3357,7 @@ Modulators: Envelope: AR/ASR/ADSD/ADSR - Velociy on/off + Velocity on/off Trigger: @@ -3407,7 +3407,7 @@ result is a lot more predictable. The Sonic-6 as often described as having bad tuning, that probably depends on model since different oscillators were used at times. Also, different units had different filters (Zumchek used a ladder of diodes to overcome the Moog -ladder of transister patent). The original was often described as only being +ladder of transistor patent). The original was often described as only being useful for sound effects. Personally I don't think that was true however the design is extremely flexible and the mods are applied with high gains so to get subtle sounds they only have to be applied lightly. Also, this critique @@ -3430,7 +3430,7 @@ a save button which should require a double click but does not yet (0.30.0), a pair of buttons for searching up and down the available memories and a button called 'Find' which will select the next available free memory. -Midi options include channel, channel down and, er, thats it. +MIDI options include channel, channel down and, er, that's it. @@ -3470,10 +3470,10 @@ fatter than the original. In 'Mono' mode there is only one LFO that all voices will share and the envelope is triggered in Legato style, ie, only once for a sequence of notes - all have to be released for the envelope to recover. -VCO: The original allowed for wavaeform selection to alternate between notes, +VCO: The original allowed for waveform selection to alternate between notes, something that is rather ugly to do with the bristol architecture. This is replaced with a VCO selector where each note will only take the output from -one of the two avalable oscillators and gives the ntoes a little more +one of the two available oscillators and gives the notes a little more separation. The legato mode works whereby the oscillator selection is only made for the first note in a sequence to give a little more sound consistency. @@ -3614,8 +3614,8 @@ produced 4 pure (infinite bandwidth) square waves that were mixed together, an overly weak result. The emulator adds a waveform distort (P3), an notched control that produces a pure sine wave at centre point. Going down it will generate gradually increasing 3rd and 5th harmonics to give it a squarey wave -with a distinct hammond tone. The distortion actually came from the B3 emulator -which models the distort on the shape of the hammond tonewheels themselves. +with a distinct Hammond tone. The distortion actually came from the B3 emulator +which models the distort on the shape of the Hammond tonewheels themselves. Going up from centre point will produce gradually sharper sawtooth waves using a different phase distortion. @@ -3629,7 +3629,7 @@ audible clicks from the key on and off events or when selected will produce something akin to a percussive ping for the start of the note. The result for the organ section is that it can produce some quite nice sounds -reminiscent of the farfisa range to not quite hammond, either way far more +reminiscent of the Farfisa range to not quite Hammond, either way far more useful than the flat, honking square waves. The original sound can be made by waveform to a quarter turn or less, spacialisation and mod to zero, key grooming off. @@ -3655,7 +3655,7 @@ used to have the filter open up with velocity if desired. The mod application is different from the original. It had a three way selector for routing the LFO to either VCO, VCA or VCF but only a single route. This emulation uses a continuous notched control where full off is VCO only, notch -is VCF only and full on is VCA however the intermidiate positions will route +is VCF only and full on is VCA however the intermediate positions will route proportional amounts to two components. The LFO has more options (Ramp and Saw) than the original (Tri and Square). @@ -3695,7 +3695,7 @@ oscillator which generates complex waveforms. The Bristol Bitone can generate up to 4 waveforms simultaneously at different levels for 5 different harmonics and the consequent output is very rich, the waves can be slightly detuned, the pulse output can be PW modulated. As with all the bristol oscillators that -support sync, the sync pulse is extracted as a postive leading zero crossing. +support sync, the sync pulse is extracted as a positive leading zero crossing. Unfortunately if the complex bitone output is used as input to sync another oscillator then the result is far too many zero crossings to extract a good sync. For the time being you will have to simplify the sync source to get a @@ -3737,10 +3737,10 @@ fatter than the original. In 'Mono' mode there is only one LFO that all voices will share and the envelope is triggered in Legato style, ie, only once for a sequence of notes - all have to be released for the envelope to recover. -VCO: The original allowed for wavaeform selection to alternate between notes, +VCO: The original allowed for waveform selection to alternate between notes, something that is rather ugly to do with the bristol architecture. This is replaced with a VCO selector where each note will only take the output from -one of the two avalable oscillators and gives the ntoes a little more +one of the two available oscillators and gives the notes a little more separation. The legato mode works whereby the oscillator selection is only made for the first note in a sequence to give a little more sound consistency. @@ -3866,8 +3866,8 @@ produced 4 pure (infinite bandwidth) square waves that were mixed together, an overly weak result. The emulator adds a waveform distort (P3), an notched control that produces a pure sine wave at centre point. Going down it will generate gradually increasing 3rd and 5th harmonics to give it a squarey wave -with a distinct hammond tone. The distortion actually came from the B3 emulator -which models the distort on the shape of the hammond tonewheels themselves. +with a distinct Hammond tone. The distortion actually came from the B3 emulator +which models the distort on the shape of the Hammond tonewheels themselves. Going up from centre point will produce gradually sharper sawtooth waves using a different phase distortion. @@ -3881,7 +3881,7 @@ audible clicks from the key on and off events or when selected will produce something akin to a percussive ping for the start of the note. The result for the organ section is that it can produce some quite nice sounds -reminiscent of the farfisa range to not quite hammond, either way far more +reminiscent of the Farfisa range to not quite Hammond, either way far more useful than the flat, honking square waves. The original sound can be made by waveform to a quarter turn or less, spacialisation and mod to zero, key grooming off. @@ -3907,7 +3907,7 @@ used to have the filter open up with velocity if desired. The mod application is different from the original. It had a three way selector for routing the LFO to either VCO, VCA or VCF but only a single route. This emulation uses a continuous notched control where full off is VCO only, notch -is VCF only and full on is VCA however the intermidiate positions will route +is VCF only and full on is VCA however the intermediate positions will route proportional amounts to two components. The LFO has more options (Ramp and Saw) than the original (Tri and Square). @@ -3947,7 +3947,7 @@ oscillator which generates complex waveforms. The Bristol Bitone can generate up to 4 waveforms simultaneously at different levels for 5 different harmonics and the consequent output is very rich, the waves can be slightly detuned, the pulse output can be PW modulated. As with all the bristol oscillators that -support sync, the sync pulse is extracted as a postive leading zero crossing. +support sync, the sync pulse is extracted as a positive leading zero crossing. Unfortunately if the complex bitone output is used as input to sync another oscillator then the result is far too many zero crossings to extract a good sync. For the time being you will have to simplify the sync source to get a @@ -3972,7 +3972,7 @@ would be indicative of a divider circuit. It featured 8 oscillators that could be applied as either 4 voices with dual osc or 8 voices with a single osc. The architecture was verging on the -interesting since each oscillator was fead into an individual envelope generator +interesting since each oscillator was fed into an individual envelope generator (described below) and then summed into the single filter, the filter having another envelope generator, 9 in total. This lead to cost reduction over having a filter per voice however the single filter leads to breathing, also discussed @@ -3982,7 +3982,7 @@ The control panel has a volume, global tuning control and a 'Bend' control that governs the depth of the pitch bend from the joystick and the overall amount of DCO modulation applied by the joystick. There is no sequencer in this emulation largely because there are far better options now available than -this had but also due to a shortage of onscreen realestate. +this had but also due to a shortage of on-screen real estate. The Poly, Chord and Hold keys are emulated, hold being a sustain key. The Chord relearn function works follows: @@ -4069,11 +4069,11 @@ available from the original instrument: DE 83 Mod DCO DE 84 Mod VCF - DE 86 Midi channel - DE 87 Midi program change enable - DE 88 Midi OMNI + DE 86 MIDI channel + DE 87 MIDI program change enable + DE 88 MIDI OMNI -Of these 25 pararmeters, the emulation has changed 88 to be OMNI mode rather +Of these 25 parameters, the emulation has changed 88 to be OMNI mode rather than the original sequence clock as internal or external. This is because the sequencer function was dropped as explained above. @@ -4097,7 +4097,7 @@ the noise signal level. The single filter always responded to the highest note on the keyboard. This gives a weaker overall sound and if playing with two hands then there is a -noticible effect with keytracking - left hand held chords will cause filter +noticeable effect with keytracking - left hand held chords will cause filter breathing as the right hand plays solos and the keyboard tracking changes from high to low octaves. Note that the emulator will implement a single filter if you select DE 46 filter envelope retrigger to be single trigger, it @@ -4153,13 +4153,13 @@ gain: This gives some interesting velocity tracking capabilities where just one osc can track velocity to introduce harmonic content keeping the filter at a fixed -cutoff frequence. Having a bit of detune applied globally and locally will keep +cutoff frequency. Having a bit of detune applied globally and locally will keep the sound reasonably fat for each oscillator. The filter envelope does not track velocity for any of the distributed voices, this was intentional since when using high resonance it is not desirable that the filter cutoff changes with velocity, it tends to be inconsistently -disonant. +dissonant. If you want to use this synth with controller mappings then map the value entry pot to your easiest to find rotary, then click the mouse on the membrane @@ -4194,9 +4194,9 @@ locations on the front panel with Load, Save and Increment buttons and one panel of options to adjust a few parameters on the oscillator and filters. It is possible to get extra memories by loading banks with -load: if you request starting in memory #21 the emulator will stuff 20 into the bank and 1 into the -memory location. There is no apparant midi channel selector, use -channel +memory location. There is no apparent MIDI channel selector, use -channel and then stay on it. This could have been put into the options panel however -having midi channel in a memory is generally a bad idea. +having MIDI channel in a memory is generally a bad idea. A. MOD @@ -4273,7 +4273,7 @@ it interprets signal ramps and drains from an analogue circuit this is one area of improvement in the emulator. There are options to produce multiple waveforms described below. -The resonant filter is implemented with a single Houvilainen and actually only +The resonant filter is implemented with a single Huovilainen and actually only runs at 24dB/Oct. There are controls for remixing the different taps, a form of feedforward and when in 'Flat' mod there is more remixing of the poles, this does generate a slower roll off but gives the signal a bit more warmth than a @@ -4325,7 +4325,7 @@ triggers. The options from section G are only loaded under two circumstances: at system start from the first selected memory location and if the Load button is given -a DoubleClick. All other memory load functions will inherrit the settings that +a double-click. All other memory load functions will inherit the settings that are currently active. @@ -4337,7 +4337,7 @@ are currently active. The BassMaker is not actually an emulator, it is a bespoke sequencer design but based on the capabilities of some of the early analogue sequencers such as the Korg SQ-10. Supplying this probably leaves bristol open to a lot of feature -requests for sequencer functionaliity and it is stated here that the BassMaker +requests for sequencer functionality and it is stated here that the BassMaker is supposed to be simple so excess functionality will probably be declined as there are plenty of other sequencing applications that can provide a richer feature set. @@ -4398,7 +4398,7 @@ following functions: Memory: 0..9 key entry buttons, 1000 memories available Load - Save: doubleclick to save current sequence + Save: double-click to save current sequence Menu Panel Up, Down menu @@ -4427,13 +4427,13 @@ menu or activate any option. The 'Fn' button returns one level: expression pedal (controller value) note events - First midi channel + First MIDI channel - Primary midi channel for note events + Primary MIDI channel for note events - Second midi channel + Second MIDI channel - Secondary midi channel when 'Control' configured to 'Note' events. + Secondary MIDI channel when 'Control' configured to 'Note' events. Global Transpose @@ -4470,8 +4470,8 @@ code, for the filter and S/N generation. The oscillators will run as per the original using a single phase accumulator and 16 bit frequency space. All the waveforms are extracted logically from the ramp waveform generated by the phase accumulation. Sync and RingMod are also -extracted with the same methods. The noise generation is exor/add as per the -original however the noise signal will not degenerate when mixing waveforms. +extracted with the same methods. The noise generation is XOR/add as per the +original, however the noise signal will not degenerate when mixing waveforms. The output waves are ANDed together. The bristol control register has an option for Multi waveforms and when selected each oscillator will have its own phase accumulator, can have a detune applied and will be mixed by summation rather @@ -4483,7 +4483,7 @@ exponential decay and release. Attack is a linear function and the sustain level can only be decreased when active as the counter also refuses to count back up when passed its peak. -The filter implements a 12dB/Octave multimode chamberlain filter providing LP, +The filter implements a 12dB/Octave multimode Chamberlin filter providing LP, BP and HP signals. This is not the best filter in the world however neither was the original. An additional 24dB/Octave LP filter has been added, optionally available and with feedforward to provide 12/18dB signals. Between them the @@ -4542,48 +4542,48 @@ A synthesiser emulation package. Emulation: - -mini - moog mini - -explorer - moog voyager - -voyager - moog voyager electric blue - -memory - moog memory - -sonic6 - moog sonic 6 - -mg1 - moog/realistic mg-1 concertmate - -hammond - hammond module (deprecated, use -b3) - -b3 - hammond B3 (default) - -prophet - sequential circuits prophet-5 - -pro52 - sequential circuits prophet-5/fx - -pro10 - sequential circuits prophet-10 - -pro1 - sequential circuits pro-one - -rhodes - fender rhodes mark-I stage 73 - -rhodesbass - fender rhodes bass piano - -roadrunner - crumar roadrunner electric piano - -bitone - crumar bit 01 - -bit99 - crumar bit 99 - -bit100 - crumar bit + mods - -stratus - crumar stratus synth/organ combo - -trilogy - crumar trilogy synth/organ/string combo - -obx - oberheim OB-X - -obxa - oberheim OB-Xa - -axxe - arp axxe - -odyssey - arp odyssey - -arp2600 - arp 2600 - -solina - arp/solina string ensemble - -polysix - korg polysix - -poly800 - korg poly-800 - -monopoly - korg mono/poly - -ms20 - korg ms20 (unfinished: -libtest only) - -vox - vox continental - -voxM2 - vox continental super/300/II - -juno - roland juno-60 - -jupiter - roland jupiter-8 - -bme700 - baumann bme-700 - -bm - bristol bassmaker sequencer - -dx - yamaha dx-7 - -cs80 - yamaha cs-80 (unfinished) - -sidney - commodore-64 SID chip synth - -melbourne - commodore-64 SID polyphonic synth (unfinished) - -granular - granular synthesiser (unfinished) - -aks - ems synthi-a (unfinished) + -mini - Moog Mini + -explorer - Moog Voyager + -voyager - Moog Voyager Electric Blue + -memory - Moog Memory + -sonic6 - Moog Sonic 6 + -mg1 - Moog/Realistic MG-1 Concertmate + -hammond - Hammond module (deprecated, use -b3) + -b3 - Hammond B3 (default) + -prophet - Sequential Circuits Prophet-5 + -pro52 - Sequential Circuits Prophet-5/FX + -pro10 - Sequential Circuits Prophet-10 + -pro1 - Sequential Circuits Pro One + -rhodes - Fender Rhodes Mark-I Stage 73 + -rhodesbass - Fender Rhodes Piano Bass + -roadrunner - Crumar Roadrunner electric piano + -bitone - Crumar bit 01 + -bit99 - Crumar bit 99 + -bit100 - Crumar bit + mods + -stratus - Crumar Stratus synth/organ combo + -trilogy - Crumar Trilogy synth/organ/string combo + -obx - Oberheim OB-X + -obxa - Oberheim OB-Xa + -axxe - ARP Axxe + -odyssey - ARP Odyssey + -arp2600 - ARP 2600 + -solina - ARP/Solina String Ensemble + -polysix - Korg Polysix + -poly800 - Korg Poly-800 + -monopoly - Korg Mono/Poly + -ms20 - Korg MS-20 (unfinished: -libtest only) + -vox - Vox Continental + -voxM2 - Vox Continental Super/300/II + -juno - Roland Juno-60 + -jupiter - Roland Jupiter-8 + -bme700 - Baumann BME-700 + -bm - Bristol bassmaker sequencer + -dx - Yamaha DX7 + -cs80 - Yamaha CS-80 (unfinished) + -sidney - Commodore-64 SID chip synth + -melbourne - Commodore-64 SID polyphonic synth (unfinished) + -granular - Granular synthesiser (unfinished) + -aks - EMS Synthi A (unfinished) -mixer - 16 track mixer (unfinished: -libtest only) Synthesiser: @@ -4595,7 +4595,7 @@ A synthesiser emulation package. -nnp - no/last note preference (-mono) -retrig - monophonic note logic legato trigger (-mono) -lvel - monophonic note logic legato velocity (-mono) - -channel - initial midi channel selected to 'c' (default 1) + -channel - initial MIDI channel selected to 'c' (default 1) -lowkey - minimum MIDI note response (0) -highkey - maximum MIDI note response (127) -detune <%> - 'temperature sensitivity' of emulation (0) @@ -4604,19 +4604,19 @@ A synthesiser emulation package. -velocity - MIDI velocity mapping curve (510) (-mvc) -glide - MIDI glide duration (5) -emulate - search for the named synth or exit - -register - name used for jack and alsa device regisration + -register - name used for JACK and ALSA device registration -lwf - emulator lightweight filters -nwf - emulator default filters -wwf - emulator welterweight filters -hwf - emulator heavyweight filters -blo - maximum # band limited harmonics (31) - -blofraction - band limiting nyquist fraction (0.8) + -blofraction - band limiting Nyquist fraction (0.8) -scala - read the scala .scl tonal mapping table User Interface: - -quality - color cache depth (bbp 2..8) (6) - -grayscale - color or BW display (0..5) (0 = color) + -quality - colour cache depth (bbp 2..8) (6) + -grayscale - colour or BW display (0..5) (0 = colour) -antialias - antialias depth (0..100%) (30) -aliastype - antialias type (pre/texture/all) -opacity - opacity of the patch layer 20..100% (50) @@ -4634,14 +4634,14 @@ A synthesiser emulation package. -mbi - master bank index (0) -activesense - active sense rate (2000 ms) -ast - active sense timeout (15000 ms) - -mct - midi cycle timeout (50 ms) + -mct - MIDI cycle timeout (50 ms) -ar|-aspect - ignore emulator requested aspect ratio -iconify - start with iconified window - -window - toggle switch to enable X11 window interfacen + -window - toggle switch to enable X11 window interface -cli - enable command line interface - -libtest - gui test option, engine not invoked + -libtest - GUI test option, engine not invoked - Gui keyboard shortcuts: + GUI keyboard shortcuts: 's' - save settings to current memory 'l' - (re)load current memory @@ -4671,15 +4671,15 @@ A synthesiser emulation package. General: -engine - don't start engine (connect to existing engine) - -gui - don't start gui (only start engine) - -server - run engine as a permanant server - -daemon - run engine as a detached permanant server + -gui - don't start GUI (only start engine) + -server - run engine as a permanent server + -daemon - run engine as a detached permanent server -log - redirect diagnostic to $HOME/.bristol/log -syslog - redirect diagnostic to syslog -console - log all messages to console (must be 1st option) -cache - memory and profile cache location (~/.bristol) -exec - run all subprocesses in background - -debug <1-16> - debuging level (0) + -debug <1-16> - debugging level (0) -readme [-] - show readme [for emulator ] to console -glwf - global lightweight filters - no overrides -host - connect to engine on host 'h' (localhost) @@ -4688,16 +4688,16 @@ A synthesiser emulation package. -gmc - open a MIDI connection to the brighton GUI -oss - use OSS defaults for audio and MIDI -alsa - use ALSA defaults for audio and MIDI (default) - -jack - use Jack defaults for audio and MIDI - -jsmuuid - jack session unique identifier - -jsmfile - jack session setting path - -jsmd - jack session file load delay (5000) + -jack - use JACK defaults for audio and MIDI + -jsmuuid - JACK session unique identifier + -jsmfile - JACK session setting path + -jsmd - JACK session file load delay (5000) -session - disable session management - -jdo - use separate Jack clients for audio and MIDI + -jdo - use separate JACK clients for audio and MIDI -osc - use OSC for control interface (unfinished) -forward - disable MIDI event forwarding globally - -localforward - disable emulator gui->engine event forwarding - -remoteforward - disable emulator engine->gui event forwarding + -localforward - disable emulator GUI->engine event forwarding + -remoteforward - disable emulator engine->GUI event forwarding -o - Duplicate raw audio output data to file -nrp - enable NPR support globally -enrp - enable NPR/DE support in engine @@ -4714,19 +4714,19 @@ A synthesiser emulation package. -preload - configure preload buffer count (default 4) -rate - sample rate (44100) -priority

- audio RT priority, 0=no realtime (75) - -autoconn - attempt jack port auto-connect + -autoconn - attempt JACK port auto-connect -multi - register 'c' IO channels (jack only) -migc - multi IO input gain scaling (jack only) -mogc - multi IO output gain scaling (jack only) - Midi driver: + MIDI driver: - -midi [oss|[raw]alsa|jack] - midi driver selection (alsa) - -mididev - midi device selection + -midi [oss|[raw]alsa|jack] - MIDI driver selection (alsa) + -mididev - MIDI device selection -seq - use the ALSA SEQ interface (default) - -mididbg - midi debug-1 enable - -mididbg2 - midi debug-2 enable - -sysid - MIDI SYSEX system identifier + -mididbg - MIDI debug-1 enable + -mididbg2 - MIDI debug-2 enable + -sysid - MIDI SysEx system identifier LADI driver (level 1 compliant): @@ -4734,7 +4734,7 @@ A synthesiser emulation package. -ladi bristol - only execute LADI in engine -ladi - LADI state memory index (1024) - Audio drivers are PCM/PCM_plug or Jack. Midi drivers are either OSS/ALSA + Audio drivers are PCM/PCM_plug or JACK. MIDI drivers are either OSS/ALSA rawmidi interface, or ALSA SEQ. Multiple GUIs can connect to the single audio engine which then operates multitimbrally. @@ -4755,36 +4755,36 @@ A synthesiser emulation package. startBristol -mini - Run a minimoog using ALSA interface for audio and midi seq. This is + Run a Minimoog using ALSA interface for audio and MIDI seq. This is equivalent to all the following options: -mini -alsa -audiodev plughw:0,0 -midi seq -count 256 -preload 8 -port 5028 -voices 32 -channel 1 -rate 44100 -gain 4 -ingain 4 startBristol -alsa -mini - Run a minimoog using ALSA interface for audio and midi. This is + Run a Minimoog using ALSA interface for audio and MIDI. This is equivalent to all the following options: -mini -audio alsa -audiodev plughw:0,0 -midi alsa -mididev hw:0 -count 256 -preload 8 -port 5028 -voices 32 -channel 1 -rate 44100 startBristol -explorer -voices 1 -oss - Run a moog explorer as a monophonic instrument, using OSS interface for - audio and midi. + Run a Moog Explorer as a monophonic instrument, using OSS interface for + audio and MIDI. startBristol -prophet -channel 3 - Run a prophet-5 using ALSA for audio and midi on channel 3. + Run a Prophet-5 using ALSA for audio and MIDI on channel 3. startBristol -b3 -count 512 -preload 2 - Run a hammond b3 with a buffer size of 512 samples, and preload two + Run a Hammond B3 with a buffer size of 512 samples, and preload two such buffers before going active. Some Live! cards need this larger buffer size with ALSA drivers. startBristol -oss -audiodev /dev/dsp1 -vox -voices 8 - Run a vox continental using OSS device 1, and default midi device + Run a Vox Continental using OSS device 1, and default MIDI device /dev/midi0. Operate with just 8 voices. startBristol -b3 -audio alsa -audiodev plughw:0,0 -seq -mididev 128.0 @@ -4795,16 +4795,16 @@ A synthesiser emulation package. startBristol -juno & startBristol -prophet -channel 2 -engine - Start two synthesisers, a juno and a prophet. Both synthesisers will + Start two synthesisers, a Juno and a Prophet. Both synthesisers will be executed on one engine (multitimbral) with 32 voices between - them. The juno will be on default midi channel (1), and the prophet on + them. The Juno will be on default MIDI channel (1), and the Prophet on channel 2. Output over the same default ALSA audio device. startBristol -juno & startBristol -port 5029 -audio oss -audiodev /dev/dsp1 -mididev /dev/midi1 - Start two synthesisers, a juno on the first ALSA soundcard, and a - mini on the second OSS soundcard. Each synth is totally independent + Start two synthesisers, a Juno on the first ALSA soundcard, and a + Minimoog on the second OSS soundcard. Each synth is totally independent and runs with 32 voice polyphony (looks nice, not been tested). The location of the bristol binaries can be specified in the BRISTOL diff --git a/bin/bristoljackstats.c b/bin/bristoljackstats.c index e230c93..d2d0a2a 100644 --- a/bin/bristoljackstats.c +++ b/bin/bristoljackstats.c @@ -60,8 +60,8 @@ bristolJackTest() } /* - * This should go out as the first release with Jack. After that the interface - * will change - at the moment Jack subsumes Bristol, and this is the wrong + * This should go out as the first release with JACK. After that the interface + * will change - at the moment JACK subsumes Bristol, and this is the wrong * way around. The audiomain structure is buried inside the jack structure, * but I would prefer the contrary. In addition, with it the contrary then * it would be easier to integrate alternative distribution drivers (DSSI). @@ -77,7 +77,7 @@ main(int argc, char *argv[]) // printf("%s: connect to jackd to find samplerate and period size\n", // argv[0]); - /* I don't want all the output from jack, redirect it */ + /* I don't want all the output from JACK, redirect it */ outfd = dup(STDOUT_FILENO); nullfd = open("/dev/null", O_WRONLY); dup2(nullfd, STDOUT_FILENO); @@ -92,7 +92,7 @@ main(int argc, char *argv[]) return(0); #else - printf("This should connect to jack but it does not appear to be compiled\n"); + printf("This should connect to JACK but it does not appear to be compiled\n"); return(-2); #endif /* _BRISTOL_JACK */ diff --git a/brighton/brighton.c b/brighton/brighton.c index 1764948..97348f2 100644 --- a/brighton/brighton.c +++ b/brighton/brighton.c @@ -923,7 +923,7 @@ main(int argc, char **argv) sysid &= 0x7f7f7f7f; bristolMidiOption(0, BRISTOL_NRP_SYSID_H, sysid >> 16); bristolMidiOption(0, BRISTOL_NRP_SYSID_L, sysid & 0x0000ffff); - printf("fixing sysex system id at 0x%x\n", sysid); + printf("fixing SysEx system id at 0x%x\n", sysid); } } @@ -1016,7 +1016,7 @@ main(int argc, char **argv) } if (global.synths->flags & REQ_DEBUG_MASK) - printf("debuging level set to %i\n", + printf("debugging level set to %i\n", (global.synths->flags&REQ_DEBUG_MASK)>>12); } @@ -1598,10 +1598,10 @@ main(int argc, char **argv) /* * We play around with the names here so that the window title gets filled * with more information than just the emulator name. This enhancement was - * added for JSM but could be any Jack installation. If multiple instances + * added for JSM but could be any JACK installation. If multiple instances * of the same emulator are started then it is not clear which is which: * both have the same title bar but different names in Jack. What we do here - * is add the Jack registration name to the title bar. + * is add the JACK registration name to the title bar. */ snprintf(appname, 64, "%s (%s)", synthesisers[global.synths->synthtype]->name, devname); @@ -1857,7 +1857,7 @@ eventMgr() if ((midiHandle = bristolMidiOpen("brighton", BRISTOL_CONN_SEQ|BRISTOL_RDONLY, -1, -1, brightonMidiInput, &global)) < 0) - printf("Error opening midi device %s\n", "0.0"); + printf("Error opening MIDI device %s\n", "0.0"); } } @@ -1870,7 +1870,7 @@ eventMgr() midiFD = bristolGetMidiFD(midiHandle); cFD = bristolGetMidiFD(global.controlfd); - printf("opened GUI midi handles: %i, %i\n", midiFD, cFD); + printf("opened GUI MIDI handles: %i, %i\n", midiFD, cFD); /* if (global.libtest != 1) @@ -1942,7 +1942,7 @@ eventMgr() if (r == BRISTOL_MIDI_CHANNEL) { if ((global.synths->flags & REQ_DEBUG_MASK) >= REQ_DEBUG_4) - printf("Read failed on Midi FD\n"); + printf("Read failed on MIDI FD\n"); global.flags |= REQ_EXIT; pthread_exit(0); @@ -1967,7 +1967,7 @@ eventMgr() * We should have some 'tack' in here where we call a routine in the * library that will execute any timed events that have been requested, * this will cover things like flashing lights, VU metering. It will - * also be used to cover the midi sequencer. + * also be used to cover the MIDI sequencer. * * We should also attempt to recover lost time in graphical processing * by changing mwt into a target sleep period by getting the current diff --git a/brighton/brightonArp2600.c b/brighton/brightonArp2600.c index 17d981a..d5d5366 100644 --- a/brighton/brightonArp2600.c +++ b/brighton/brightonArp2600.c @@ -876,12 +876,12 @@ arp2600MidiCallback(brightonWindow *win, int command, int value, float v) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", command, value); + printf("MIDI callback: %x, %i\n", command, value); switch(command) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", command, value); + printf("MIDI program: %x, %i\n", command, value); synth->location = value; arp2600LoadMemory(synth, "arp2600", 0, @@ -889,7 +889,7 @@ arp2600MidiCallback(brightonWindow *win, int command, int value, float v) break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", command, value); + printf("MIDI banksel: %x, %i\n", command, value); synth->bank = value; break; } @@ -999,10 +999,10 @@ arp2600Midi(guiSynth *synth, int fd, int chan, int c, int o, int v) /* * To overcome that we should consider checking a sequence number in * the message library? That is non trivial since it requires that - * our midi messges have a 'ack' flag included - we cannot check for + * our MIDI messages have a 'ack' flag included - we cannot check for * ack here (actually, we could, and in the app is probably the right * place to do it rather than the lib however both would have to be - * changed to suppor this - nc). + * changed to support this - nc). */ bristolMidiSendMsg(global.controlfd, synth->sid, 127, 0, BRISTOL_MIDICHANNEL|newchan); @@ -1101,7 +1101,7 @@ arp2600IOSelect(guiSynth *synth, int fd, int chan, int c, int o, int v) * can be removed. * * The structure we need should have an input and output list, this should - * give the true co-ords for the start and endpoint since it will be used + * give the true coords for the start and endpoint since it will be used * to evaluate the transforms for the patch source to the on-screen dest * bitmaps. * diff --git a/brighton/brightonAxxe.c b/brighton/brightonAxxe.c index 3c87c48..7e5b959 100644 --- a/brighton/brightonAxxe.c +++ b/brighton/brightonAxxe.c @@ -579,18 +579,18 @@ midiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemory(synth, synth->resources->name, 0, synth->location, synth->mem.active, 0, 0); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value * 10; synth->location = (synth->location % 10) + value * 10; @@ -718,10 +718,10 @@ axxeMidi(guiSynth *synth, int fd, int chan, int c, int o, int v) #warning if we do not check for ack then socket might hang on exit * To overcome that we should consider checking a sequence number in * the message library? That is non trivial since it requires that - * our midi messges have a 'ack' flag included - we cannot check for + * our MIDI messages have a 'ack' flag included - we cannot check for * ack here (actually, we could, and in the app is probably the right * place to do it rather than the lib however both would have to be - * changed to suppor this - nc). + * changed to support this - nc). */ bristolMidiSendMsg(global.controlfd, synth->sid, 127, 0, BRISTOL_MIDICHANNEL|newchan); diff --git a/brighton/brightonBME700.c b/brighton/brightonBME700.c index 1b7e1df..50bfc5a 100644 --- a/brighton/brightonBME700.c +++ b/brighton/brightonBME700.c @@ -294,7 +294,7 @@ brightonLocations bme700mods[MODS_COUNT] = { "bitmaps/buttons/touchnlR.xpm", BRIGHTON_CHECKBUTTON}, /* - * UP/DOWN was memory but could be midi channel. Withdrawn for now since I want to keep + * UP/DOWN was memory but could be MIDI channel. Withdrawn for now since I want to keep * this panel uncluttered */ {"", 2, 590, 700, 100, 100, 0, 1, 0, "bitmaps/buttons/touchnlg.xpm", @@ -467,9 +467,9 @@ brightonApp bme700App = { }; /* - * We really want to just use one midi channel and let the midi library decide + * We really want to just use one MIDI channel and let the MIDI library decide * that we have multiple synths on the channel with their own split points. - * The lower layer should define the midi channel, split point and transpose + * The lower layer should define the MIDI channel, split point and transpose * of upper layer. */ static int @@ -555,14 +555,14 @@ midiCallback(brightonWindow *win, int controller, int value, float n) * We should accept 0..74 as lower layer and above that as dual * loading requests. */ - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemory(synth, SYNTH_NAME, 0, synth->bank + synth->location, OPTS_START, 0, BRISTOL_FORCE); optsShim(synth); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; synth->location = value; loadMemory(synth, SYNTH_NAME, 0, synth->bank + synth->location, @@ -615,7 +615,7 @@ printf("%i %i\n", synth->bank, synth->location); case 7: case 8: /* - * Radiobutton memory selectors, doubleclick should load + * Radiobutton memory selectors, double-click should load */ if (synth->dispatch[ACTIVE_DEVS].other1 != -1) { @@ -641,7 +641,7 @@ printf("%i %i\n", synth->bank, synth->location); break; case 9: /* - * Save on doubleclick + * Save on double-click */ if (brightonDoubleClick(dc) != 0) saveMemory(synth, SYNTH_NAME, 0, synth->bank + synth->location, 0); diff --git a/brighton/brightonBassMaker.c b/brighton/brightonBassMaker.c index f89404c..d29da91 100644 --- a/brighton/brightonBassMaker.c +++ b/brighton/brightonBassMaker.c @@ -28,7 +28,7 @@ * * Global transpose. Test. * Mem search DONE - * Midi channel DONE + * MIDI channel DONE * Need to make sure transpose and channel selections are in the memories and * recovered. Tested ctype, cc, transpose * @@ -43,7 +43,7 @@ * Copy page * Fill values * - * Midi send and recieve clock. ffs. + * MIDI send and receive clock. ffs. */ #include @@ -74,7 +74,7 @@ static int dc; #define STEP_COUNT (PAGE_STEP * PAGE_COUNT) #define TOTAL_DEVS (PAGE_STEP * OP_COUNT) -#define CONTROL_COUNT 60 /* controls less memomry selectors/entry */ +#define CONTROL_COUNT 60 /* controls less memory selectors/entry */ #define CONTROL_ACTIVE 20 #define COFF (TOTAL_DEVS * PAGE_COUNT) #define ACTIVE_DEVS (COFF + CONTROL_ACTIVE) @@ -555,19 +555,19 @@ bmMidiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->bank = value - (value % 8); synth->location = value % 8; loadMemory(synth, "bassmaker", 0, synth->bank * 10 + synth->location, synth->mem.active, 0, 0); break; /* - * This needs a case statement for midi clock which can then be used + * This needs a case statement for MIDI clock which can then be used * to drive the fast timers. */ } @@ -582,7 +582,7 @@ brightonApp bmApp = { "bassmaker", 0, "bitmaps/textures/metal2.xpm", - BRIGHTON_STRETCH|BRIGHTON_REVERSE, /* default is tesselate */ + BRIGHTON_STRETCH|BRIGHTON_REVERSE, /* default is tessellate */ bmInit, bmConfigure, /* 3 callbacks, unused? */ bmMidiCallback, @@ -1119,7 +1119,7 @@ bmSendControl(guiSynth *synth, bmMem *bm, int c, int o) int note, chan, velocity; /* - * Convert the setting into 12 steps, take cc to be midi channel + * Convert the setting into 12 steps, take cc to be MIDI channel * Channel is the 'cc' setting here. */ if ((chan = bm->control.cc) > 15) @@ -1283,7 +1283,7 @@ bmCallLed(guiSynth *synth, int fd, int chan, int c, int o, int v) BRISTOL_EVENT_KEYOFF, note, velocity); break; case 1: - /* Dont' send note off */ + /* Don't send note off */ if (v) { bmSendControl(synth, bm, c, o); @@ -1292,7 +1292,7 @@ bmCallLed(guiSynth *synth, int fd, int chan, int c, int o, int v) } break; case 2: - /* Dont' send note on, only off */ + /* Don't send note on, only off */ bristolMidiSendKeyMsg(global.controlfd, synth->midichannel, BRISTOL_EVENT_KEYOFF, note, velocity); return; diff --git a/brighton/brightonBitOne.c b/brighton/brightonBitOne.c index 891775a..e54f97a 100644 --- a/brighton/brightonBitOne.c +++ b/brighton/brightonBitOne.c @@ -102,7 +102,7 @@ static int B1display[5]; * * All parameter changes go into these layers and can be used as a quick compare * to the last loaded memories. If the settings are parked they become semi - * permanant (as they have not actually been written to disk yet). We should + * permanent (as they have not actually been written to disk yet). We should * have a double click on Park to save both memories to disk as well. * * We need 5 scratchpads, one for each layer, a backup for each layer, and @@ -157,7 +157,7 @@ static int dc; /* * We really need to define parameter types and ranges here to make the - * interface complete. For example, the midi channels only go from 1 to 16 and + * interface complete. For example, the MIDI channels only go from 1 to 16 and * when selected as the input then the pot should configure this range. * * Similarly, if this is a button it should be 0 for the first half and 1 for @@ -1913,9 +1913,9 @@ printf("chord %i + %i at %i\n", note, transpose, (int) seq->c_count); } /* - * We really want to just use one midi channel and let the midi library decide + * We really want to just use one MIDI channel and let the MIDI library decide * that we have multiple synths on the channel with their own split points. - * The lower layer should define the midi channel, split point and transpose + * The lower layer should define the MIDI channel, split point and transpose * of upper layer. */ static int @@ -1966,7 +1966,7 @@ bitoneKeyCallback(brightonWindow *win, int panel, int index, float value) /* * Want to send a note event, on or off, for this index + transpose only * on the lower layer midichannel. This actually suffices for all cases - * where we use a single midi channel hence the logic. + * where we use a single MIDI channel hence the logic. */ if (value) bristolMidiSendMsg(global.controlfd, synth->midichannel, @@ -2102,7 +2102,7 @@ bitoneMemoryShim(guiSynth *synth, int from) /* * Check for the DC flag, then check the bitoneRange flags for whether - * this parameter should be put into effect, should be inherrited from + * this parameter should be put into effect, should be inherited from * the lower layer, etc. * * The inherit flags need to be reviewed since they depend on the @@ -2163,7 +2163,7 @@ midiCallback(brightonWindow *win, int controller, int value, float n) guiSynth *synth = findSynth(global.synths, win); if (b1debug(synth, 3)) - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { @@ -2171,14 +2171,14 @@ midiCallback(brightonWindow *win, int controller, int value, float n) if (synth->mem.param[71] != 0) { if (b1debug(synth, 0)) - printf("midi program change not active\n"); + printf("MIDI program change not active\n"); return(0); } /* * We should accept 0..74 as lower layer and above that as dual * loading requests. */ - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemory(synth, SYNTH_NAME, 0, synth->bank * 100 + synth->location, @@ -2189,10 +2189,10 @@ midiCallback(brightonWindow *win, int controller, int value, float n) if (synth->mem.param[71] != 0) { if (b1debug(synth, 0)) - printf("midi program change not active\n"); + printf("MIDI program change not active\n"); return(0); } - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->location %= 100; synth->bank = value; loadMemory(synth, SYNTH_NAME, 0, @@ -2255,7 +2255,7 @@ bitoneUpdateDisplay(guiSynth *synth, int fd, int chan, int c, int o, int v) } /* - * Double/Split has certain logical requirements. Two two buttons are mutally + * Double/Split has certain logical requirements. Two two buttons are mutually * exclusive, so when one goes on we have to disable the other. */ static int @@ -3073,7 +3073,7 @@ static void bitoneSaveMemory(guiSynth *synth) { guiSynth *layer = synth; - int loc, oloc = 0; /* This does not need to be initted but GCC complains */ + int loc, oloc = 0; /* This does not need to be init'ed but GCC complains */ float dbg; if (entryPoint == ENTER_UPPER) @@ -3358,7 +3358,7 @@ bitoneMidi(guiSynth *synth, int fd, int chan, int c, int o, int v) newchan = v; /* - * Logically we want to take the lower layer midi channel in all cases + * Logically we want to take the lower layer MIDI channel in all cases * except when on upper layer with DE 120 set */ if ((entryPoint == ENTER_UPPER) && (synth->mem.param[120] == 0)) @@ -3378,7 +3378,7 @@ bitoneMidi(guiSynth *synth, int fd, int chan, int c, int o, int v) layer->midichannel = newchan; if (b1debug(synth, 2)) - printf("Midi channel request not active in OMNI: %i\n", newchan); + printf("MIDI channel request not active in OMNI: %i\n", newchan); return; } @@ -4046,11 +4046,11 @@ bitoneTranspose(guiSynth *synth, int fd, int chan, int c, int o, int v) /* * We are going to request transpose to the engine. At the moment this * would cause issues with memory loading or transpose changes. The former - * is avoided due to allNotesOff() when the midi channel is changed when + * is avoided due to allNotesOff() when the MIDI channel is changed when * memories are loaded however alterations to transpose when holding notes * will need to be addressed. Resolved. * - * We need to look at separate split points, this pends on the DE 121 flag. + * We need to look at separate split points, this depends on the DE 121 flag. * * We either transpose just the upper layer unless we have DE 121 and we * are setting the lower layer transpose. @@ -4561,7 +4561,7 @@ static void bitoneRelease(guiSynth *synth, int fd, int chan, int c, int o, int v) { if (b1debug(synth, 1)) - printf("Midi Panic (%i)\n", v); + printf("MIDI Panic (%i)\n", v); if (v == 0) return; @@ -4896,7 +4896,7 @@ bitoneInit(brightonWindow *win) * * There are lots of defaults we need to set for the bit-1: stereo on, MIDI * channel, we need to build a method to enable disable OMNI and some of the - * midi controllers such as wheel, etc. + * MIDI controllers such as wheel, etc. */ bitoneDualSend(synth, global.controlfd, 0, 7, 4, 16000); /* Set noise gain - reasonably low as it is going to be used for S/H also */ diff --git a/brighton/brightonCLI.c b/brighton/brightonCLI.c index c06df04..4c636e0 100644 --- a/brighton/brightonCLI.c +++ b/brighton/brightonCLI.c @@ -1,6 +1,6 @@ /* - * Diverse Bristol midi routines. + * Diverse Bristol MIDI routines. * Copyright (c) by Nick Copeland 1996,2012 * * @@ -202,13 +202,13 @@ comSet debugcomm[6] = { "Command Line Debuging on/off", 0, 0}, {"midi", B_COM_FIND, - "debug level midi interface libraries 0..3", + "debug level MIDI interface libraries 0..3", 0, 0}, {"frontend", B_COM_FIND, "debug engine interface libraries on/off", 0, 0}, {"engine", B_COM_FIND, - "engine debuging level 0..15 (0 = off, >9 = verbose)", + "engine debugging level 0..15 (0 = off, >9 = verbose)", 0, 0}, {"", B_COM_LAST, "", 0, 0}, }; @@ -227,19 +227,19 @@ comSet bristolcom[4] = { comSet midicomm[24] = { {"", B_COM_NOT_USED, "", 0, 0}, {"channel", B_COM_FIND, - "configure engine midi channel 1..16", + "configure engine MIDI channel 1..16", 0, 0}, {"sid", B_COM_FIND, "select internal messaging id", 0, 0}, {"debug", B_COM_FIND, - "engine debuging level 0..16", + "engine debugging level 0..16", 0, 0}, {"lowkey", B_COM_FIND, - "lower midi keyboard split point 0..127", + "lower MIDI keyboard split point 0..127", 0, 0}, {"highkey", B_COM_FIND, - "higher midi keyboard split point 0..127", + "higher MIDI keyboard split point 0..127", 0, 0}, {"chanpress", B_COM_FIND, "send a channel pressure event value p=0..127", @@ -254,7 +254,7 @@ comSet midicomm[24] = { "monophonic note preference logic: hnp/lnp/nnp", 0, 0}, {"velocity", B_COM_FIND, - "midi velocity curve 0..1000", + "MIDI velocity curve 0..1000", 0, 0}, {"detune", B_COM_FIND, "engine 'temperature sensitivity' detuning", @@ -272,7 +272,7 @@ comSet midicomm[24] = { "emulator global gain control", 0, 0}, {"pwd", B_COM_FIND, - "midi pitch wheel depth semitones", + "MIDI pitch wheel depth semitones", 0, 0}, {"nrp", B_COM_FIND, "enable user interface NRP response on/off", @@ -281,7 +281,7 @@ comSet midicomm[24] = { "enable engine NRP response on/off", 0, 0}, {"forwarding", B_COM_FIND, - "enable engine midi message forwarding on/off", + "enable engine MIDI message forwarding on/off", 0, 0}, {"tuning", B_COM_FIND, "coarse/fine: global tuning 0..1.0", @@ -290,7 +290,7 @@ comSet midicomm[24] = { "send a value to a continuous controller value", 0, 0}, {"panic", B_COM_FIND, - "midi all-notes-off, etc", + "MIDI all-notes-off, etc", 0, 0}, {"", B_COM_LAST, "", 0, 0}, }; @@ -363,7 +363,7 @@ comSet setcomm[B_TTY_ACT_COUNT + 1] = { "'set memory [find|read|write|import|export]", execMemory, memcomm}, {"midi", B_COM_MIDI, - "[channel|debug|help] midi control commands", + "[channel|debug|help] MIDI control commands", execMidi, midicomm}, {"debug", B_COM_DEBUG, "[on|off|engine [0..15]] debug settings", @@ -417,7 +417,7 @@ comSet commands[B_TTY_ACT_COUNT + 1] = { "'set memory [find|read|write|import|export]", execMemory, memcomm}, {"midi", B_COM_MIDI, - "[channel|debug|help] midi control commands", + "[channel|debug|help] MIDI control commands", execMidi, midicomm}, {"debug", B_COM_DEBUG, "[on|off|engine [0..15]] debug settings", @@ -770,7 +770,7 @@ brightonSetCLIcode(char *input) int i; /* - * Search the ommmand table, add entry to templates + * Search the command table, add entry to templates */ for (i = 0 ; (commands[i].map != B_COM_LAST) && (i < B_TTY_ACT_COUNT); @@ -1416,25 +1416,25 @@ extern int bristolPolyPressureEvent(int, int, int, int, int); * access to loads of stuff that many of the GUI may not use because there was * no other way to control them. * - * midi channel 1..16 - * midi debug 0..3 - * midi lowkey|highkey 0..127 - * midi filters lwf|nwf|wwf|hwf - * midi notepref hnp|lnp|nnp - * midi velocity 1..1000 - * midi chanpressure 0..127 - * midi polypressure 0..127 0..127 - * midi detune 0..500 - * midi glide 0..30 - * midi legato on/off - * midi trig on/off - * midi gain 1.. - * midi pwd 0.. - * midi nrp on/off - * midi forwarding on/off - * midi tuning fine 0..1.0 - * midi tuning coarse 0..1.0 - * midi panic + * MIDI channel 1..16 + * MIDI debug 0..3 + * MIDI lowkey|highkey 0..127 + * MIDI filters lwf|nwf|wwf|hwf + * MIDI notepref hnp|lnp|nnp + * MIDI velocity 1..1000 + * MIDI chanpressure 0..127 + * MIDI polypressure 0..127 0..127 + * MIDI detune 0..500 + * MIDI glide 0..30 + * MIDI legato on/off + * MIDI trig on/off + * MIDI gain 1.. + * MIDI pwd 0.. + * MIDI nrp on/off + * MIDI forwarding on/off + * MIDI tuning fine 0..1.0 + * MIDI tuning coarse 0..1.0 + * MIDI panic */ static int execMidi(guimain *global, int c, char **v) @@ -2663,7 +2663,7 @@ bttySearch(guimain *global) /* * Search through the internal commands and the synth parameters. If only - * one match then commplete it, otherwise list them. + * one match then complete it, otherwise list them. */ if (btty.i >= SYNTHS->win->app->resources[btty.p].ndevices) { @@ -3089,7 +3089,7 @@ bttyExecute(guimain *global, int c, char **v) btty.i = i; switch (n) { - case 1: /* Value was set explicity */ + case 1: /* Value was set explicitly */ break; case 2: /* + */ value = PDEV(btty.i)->value + 0.01; @@ -3247,8 +3247,8 @@ bttyInterpret(guimain *global, char *tbuf) /* * This is to 'overlook' cooked commands that start with a colon, they - * typicaly come from retyping ':' due to a damaged output stream from - * debuging output. + * typically come from retyping ':' due to a damaged output stream from + * debugging output. */ if ((*comm == ':') && (btty.flags & B_TTY_COOKED)) comm++; @@ -3476,7 +3476,7 @@ bttyCookedMode(guimain *global, char ch) btty.acycle = btty.cycle; /* - * Start with escape, this will later become interpretted as it could + * Start with escape, this will later become interpreted as it could * also by arrows for history functions. */ if (btty.flags & B_TTY_RAW_P2) { diff --git a/brighton/brightonCS80.c b/brighton/brightonCS80.c index a67f255..0c18f6c 100644 --- a/brighton/brightonCS80.c +++ b/brighton/brightonCS80.c @@ -37,7 +37,7 @@ * * Detune * LFO Key Sync - * Midi Channel selection + * MIDI Channel selection * Noise Multi * LFO Multi * Nudge @@ -951,13 +951,13 @@ midiCallback(brightonWindow *win, int controller, int value, float n) guiSynth *synth = findSynth(global.synths, win); if (cs80Debug(synth, 1)) - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: if (cs80Debug(synth, 2)) - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemory(synth, "cs80", 0, synth->bank + synth->location + mw, synth->mem.active, 0, 0); @@ -965,7 +965,7 @@ midiCallback(brightonWindow *win, int controller, int value, float n) break; case MIDI_BANK_SELECT: if (cs80Debug(synth, 2)) - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; break; } @@ -1448,7 +1448,7 @@ cs80Midi(guiSynth *synth, int fd, int chan, int c, int o, int v) } else { /* * This is a little incorrect - if we are layered then we can go to - * midi channel 15. + * MIDI channel 15. */ if ((newchan = synth->midichannel + 1) >= 14) newchan = synth->midichannel = 14; diff --git a/brighton/brightonControllers.c b/brighton/brightonControllers.c index fc20509..00a8f81 100644 --- a/brighton/brightonControllers.c +++ b/brighton/brightonControllers.c @@ -47,7 +47,7 @@ extern void brightonGetCLIcodes(int); //static int width = 0, height = 0; /* - * kbdmap now burried in the brightonWindow structure. + * kbdmap now buried in the brightonWindow structure. * * This is an array of MIDI note numbers indexed by ASCII keyboard key number * and works for top row of qwerty only: azerty, qwertz, dvorak keyboards, etc, @@ -60,7 +60,7 @@ extern void brightonGetCLIcodes(int); #define KM_CHAN 1 /* - * This is for note on/off events, it keeps a map to supress keyrepeat events. + * This is for note on/off events, it keeps a map to suppress keyrepeat events. * * It does not always work since the events are on/off sequentially so it has * been extended such that window enter/leave call XAutoRepeatOff/On(). @@ -356,7 +356,7 @@ int channel, char *param) * Parse configuration file. Read the panel and index numbers for the devices * and find the actual device configure code for the controllers. * - * This will also read the midi controller value mapping file. + * This will also read the MIDI controller value mapping file. */ void brightonReadConfiguration(brightonWindow *bwin, brightonApp *app, @@ -587,7 +587,7 @@ char *filename) sprintf(path, "%s/memory/profiles/%s", getenv("BRISTOL"), synth); /* - * We are unlikey to have write permissions on the factory set, however + * We are unlikely to have write permissions on the factory set, however * with no alternative we will have a go */ if ((fd = open(path, O_WRONLY|O_TRUNC|O_CREAT, 0644)) < 0) @@ -825,7 +825,7 @@ brightonControlKeyInput(brightonWindow *cid, int asckey, int on) * ^?: help * * ^W: show warranty - * ^C: show GLP copying conditions + * ^C: show GPL copying conditions * * plus: BME Axxe B3 Juno Odyssey Poly6 monopoly Pro10 Pro52 Pro5 RR Solina * voxM2 @@ -947,7 +947,7 @@ brightonControlKeyInput(brightonWindow *cid, int asckey, int on) * one per synth and probably also in the same controller mappings file. * * Due to the may X11 does the key mapping then we will get multiple key events - * for presses - the key repeat is interpretted as KeyOff/KeyOn, and they KBD + * for presses - the key repeat is interpreted as KeyOff/KeyOn, and they KBD * will be monophonic as a newly pressed key will replace the previously held * one. For best results we would need to disable key repeat on entering the * window. FFS. @@ -976,7 +976,7 @@ brightonKeyInput(brightonWindow *cid, int asckey, int on) * it in here. * * We need some generic call back to the synth (the right synth) with the - * key number and midi channel. Hm, that would work but still would not + * key number and MIDI channel. Hm, that would work but still would not * change the graphics as that needs a call to the GUI. */ if (on) { @@ -987,12 +987,12 @@ brightonKeyInput(brightonWindow *cid, int asckey, int on) /* * We have some logic required here. Firstly, if the keypanel is * denoted as -1 then there isn't one (hammond module, ARP2600, - * synthi) so use native MIDI events. If the midi channel is + * synthi) so use native MIDI events. If the MIDI channel is * zero this is the first keypanel. Otherwise the second. * * This is all slightly damaged (0.20.3) since calls directly to - * the midi interface did not use transpose and those to the GUI - * did. That will be changed, tranpose will be an actual call to + * the MIDI interface did not use transpose and those to the GUI + * did. That will be changed, transpose will be an actual call to * bristol, dropped here, but will have to change most of the * profile files that give me the qwerty mappings. I want to change * those anyway to mimic some other well known qwerty mappings. @@ -1063,7 +1063,7 @@ brightonMidiNoteEvent(guimain *global, bristolMidiMsg *msg) /* * This tracking can only work for the first synth on the list. That is * currently not an issue since the list is probably only one entry. That - * will have to change when we integrate GUI menuing to start more + * will have to change when we integrate GUI menu'ing to start more * emulations. * * Anyway, NO_KEYTRACK can stay as a global parameter, after that we will @@ -1207,9 +1207,9 @@ brightonMidiInput(bristolMidiMsg *msg, guimain *global) int memHold = global->synths->cmem; if (global->synths->flags & REQ_MIDI_DEBUG) - printf("brightonMidiInput sysex\n"); + printf("brightonMidiInput SysEx\n"); /* - printf("brightonMidiInput sysex: %i %i, %i\n", + printf("brightonMidiInput SysEx: %i %i, %i\n", msg->command, msg->channel, global->synths->midichannel); @@ -1223,7 +1223,7 @@ brightonMidiInput(bristolMidiMsg *msg, guimain *global) * The brighton load/save routines do not really handle * alternative locations, they all rotate around the cache. * - * To support Jack here, and LADI later, then just save the + * To support JACK here, and LADI later, then just save the * LADI memory file and copy it to wherever it was asked * to be put. */ @@ -1288,7 +1288,7 @@ brightonMidiInput(bristolMidiMsg *msg, guimain *global) return; if (global->synths->flags & REQ_DEBUG_3) - printf("not sysex: %x\n", msg->command); + printf("not SysEx: %x\n", msg->command); /* * We should consider what to do with channel changes, but we are not @@ -1351,7 +1351,7 @@ brightonMidiInput(bristolMidiMsg *msg, guimain *global) if (msg->channel != synth->midichannel) return; -/*printf("Midi Ctrl: %i\n", msg->GM2.c_id); */ +/*printf("MIDI Ctrl: %i\n", msg->GM2.c_id); */ if ((msg->params.controller.c_id == MIDI_GM_DATAENTRY_F) && (synth->flags & REQ_MIDI_DEBUG)) diff --git a/brighton/brightonDX.c b/brighton/brightonDX.c index 2ab5fcf..cf942c7 100644 --- a/brighton/brightonDX.c +++ b/brighton/brightonDX.c @@ -405,7 +405,7 @@ static brightonLocations mempanel[MEM_COUNT] = { "bitmaps/buttons/pressoffo.xpm", "bitmaps/buttons/pressono.xpm", BRIGHTON_CHECKBUTTON}, - /* midi up/down */ + /* MIDI up/down */ {"", 2, 60, MR3, 45, MS2, 0, 1, 0, "bitmaps/buttons/pressoff.xpm", "bitmaps/buttons/presson.xpm", BRIGHTON_CHECKBUTTON}, @@ -646,7 +646,7 @@ int skip, int flags) /* * See if the memory actually exists. This is a bit of file system overhead - * but prevents attempting to load non-existant memories + * but prevents attempting to load non-existent memories */ op = loadMemory(synth, algo, name, location, active, skip, BRISTOL_STAT); @@ -716,18 +716,18 @@ dxMidiCallback(brightonWindow *win, int command, int value, float v) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", command, value); + printf("MIDI callback: %x, %i\n", command, value); switch(command) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", command, value); + printf("MIDI program: %x, %i\n", command, value); synth->location = value; dxLoadMem(synth, "dx", 0, synth->location, synth->mem.active, FIRST_DEV, 0); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", command, value); + printf("MIDI banksel: %x, %i\n", command, value); synth->bank = value; break; } @@ -1304,7 +1304,7 @@ dxInit(brightonWindow *win) dispatch[MEM_START + 15].controller = 3; dispatch[MEM_START + 16].controller = 4; - /* Midi */ + /* MIDI */ dispatch[MEM_START + 12].controller = 2; dispatch[MEM_START + 13].controller = 1; dispatch[MEM_START + 12].routine = dispatch[MEM_START + 13].routine = diff --git a/brighton/brightonExplorer.c b/brighton/brightonExplorer.c index e339ad5..4522bbe 100644 --- a/brighton/brightonExplorer.c +++ b/brighton/brightonExplorer.c @@ -277,7 +277,7 @@ brightonApp explorerApp = { "explorer", 0, /* no blueprint on wood background. */ "bitmaps/textures/wood2.xpm", - 0, /* or BRIGHTON_STRETCH, default is tesselate */ + 0, /* or BRIGHTON_STRETCH, default is tessellate */ explorerInit, explorerConfigure, /* 3 callbacks, unused? */ midiCallback, @@ -368,12 +368,12 @@ midiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value + synth->bank * 10; if (loadMemory(synth, "explorer", 0, synth->location, synth->mem.active, FIRST_DEV, BRISTOL_STAT) < 0) @@ -382,7 +382,7 @@ midiCallback(brightonWindow *win, int controller, int value, float n) displayText(synth, "PRG", synth->location, DISPLAY1); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; synth->location = (synth->location % 10) + value * 10; if (loadMemory(synth, "explorer", 0, synth->location, @@ -681,14 +681,14 @@ explorerFilterMode(guiSynth *synth, int fd, int chan, int o, int c, int v) if (v == 0) { /* printf("LPF/LPF\n"); - * FIlter 1 must change to type 4, Houvilainen LPF. + * Filter 1 must change to type 4, Huovilainen LPF. */ bristolMidiSendMsg(global.controlfd, synth->sid, 4, 4, 4); bristolMidiSendMsg(global.controlfd, synth->sid, 4, 6, 0); } else { /* printf("HPF/LPF\n"); - * FIlter 1 must change to type 0, Chamberlain and HPF + * Filter 1 must change to type 0, Chamberlin and HPF */ bristolMidiSendMsg(global.controlfd, synth->sid, 4, 4, 0); bristolMidiSendMsg(global.controlfd, synth->sid, 4, 6, 2); @@ -724,7 +724,7 @@ explorerFilter(guiSynth *synth, int fd, int chan, int o, int c, int v) /* * We have mod and res that just goes to each filter. * - * Cutoff and spare are a function of the eachother. + * Cutoff and spare are a function of the each other. */ bristolMidiSendMsg(global.controlfd, synth->sid, 9, 0, (int) (synth->mem.param[34] * C_RANGE_MIN_1)); @@ -914,7 +914,7 @@ explorerInit(brightonWindow *win) dispatch[37].controller = 4; dispatch[37].operator = 3; - /* Filter spacing is now in the emulater, not the filter. We also need a */ + /* Filter spacing is now in the emulator, not the filter. We also need a */ /* filter param dispatcher to configure the two filters together. */ /* Dispatcher */ dispatch[34].routine = @@ -1007,7 +1007,7 @@ explorerInit(brightonWindow *win) dispatch[MEM_START + 16].routine = dispatch[MEM_START + 17].routine = (synthRoutine) explorerMemory; - /* midi */ + /* MIDI */ dispatch[MEM_START + 12].controller = 2; dispatch[MEM_START + 13].controller = 1; dispatch[MEM_START + 12].routine = dispatch[MEM_START + 13].routine = diff --git a/brighton/brightonGranular.c b/brighton/brightonGranular.c index 640d108..d795d77 100644 --- a/brighton/brightonGranular.c +++ b/brighton/brightonGranular.c @@ -306,7 +306,7 @@ static brightonLocations options[MOD_COUNT] = { SELECTBUS(900, oR1), SELECTBUS(900, oR2), - /* Midi up/down, save */ + /* MIDI up/down, save */ {"", 2, 900, oR3, MRXS, MRYS, 0, 1, 0, "bitmaps/buttons/pressoffg.xpm", "bitmaps/buttons/pressong.xpm", BRIGHTON_CHECKBUTTON}, @@ -342,7 +342,7 @@ static brightonLocations options[MOD_COUNT] = { /* * Should try and make this one as generic as possible, and try to use it as - * a general memory routine. has Midi u/d, mem u/d, load/save and a display. + * a general memory routine. has MIDI u/d, mem u/d, load/save and a display. */ static int memCallback(brightonWindow* win, int panel, int index, float value) @@ -454,7 +454,7 @@ printf("bank %i, mem %i\n", synth->bank, synth->location); switch(index) { case MOD_COUNT - 3: /* - * Midi Down + * MIDI Down */ if ((newchan = synth->midichannel - 1) < 0) { @@ -464,7 +464,7 @@ printf("bank %i, mem %i\n", synth->bank, synth->location); if (global.libtest) { - printf("midi chan %i\n", newchan); + printf("MIDI chan %i\n", newchan); synth->midichannel = newchan; return(0); } @@ -476,7 +476,7 @@ printf("bank %i, mem %i\n", synth->bank, synth->location); break; case MOD_COUNT - 2: /* - * Midi Up + * MIDI Up */ if ((newchan = synth->midichannel + 1) > 15) { @@ -486,7 +486,7 @@ printf("bank %i, mem %i\n", synth->bank, synth->location); if (global.libtest) { - printf("midi chan %i\n", newchan); + printf("MIDI chan %i\n", newchan); synth->midichannel = newchan; return(0); } @@ -564,18 +564,18 @@ midiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemory(synth, synth->resources->name, 0, synth->bank + synth->location, synth->mem.active, 0, 0); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; break; } diff --git a/brighton/brightonHammond.c b/brighton/brightonHammond.c index f2ef899..912deae 100644 --- a/brighton/brightonHammond.c +++ b/brighton/brightonHammond.c @@ -168,7 +168,7 @@ static brightonLocations memories[MEM_COUNT] = { {"", 2, MC1 - 50, MR2, S4, S5, 0, 1, 0, /* panel switch */ "bitmaps/buttons/pressoffg.xpm", "bitmaps/buttons/pressong.xpm", 0}, - /* midi U, D, Load, Save */ + /* MIDI U, D, Load, Save */ {"", 2, MC2, MR2, S4, S5, 0, 1, 0, "bitmaps/buttons/pressoff.xpm", "bitmaps/buttons/presson.xpm", BRIGHTON_CHECKBUTTON}, @@ -323,7 +323,7 @@ brightonApp hammondApp = { "hammond", 0, /* no blueprint on wood background. */ "bitmaps/textures/wood2.xpm", - 0, /* or BRIGHTON_STRETCH, default is tesselate */ + 0, /* or BRIGHTON_STRETCH, default is tessellate */ hammondInit, hammondConfigure, /* 3 callbacks, unused? */ 0, @@ -1100,7 +1100,7 @@ hammondInit(brightonWindow *win) dispatch[OPTS_START + 26].routine = (synthRoutine) hammondOption; dispatch[OPTS_START + 26].controller = OPTS_START + 26; - /* Memory/Midi buttons */ + /* Memory/MIDI buttons */ dispatch[MEM_START + 10].routine = (synthRoutine) hammondPanelSwitch; dispatch[MEM_START + 10].controller = MEM_COUNT; dispatch[MEM_START + 10].operator = 0; @@ -1140,7 +1140,7 @@ hammondInit(brightonWindow *win) = (synthRoutine) hammondMemory; /* - * Midi up/down + * MIDI up/down */ dispatch[MEM_START + 11].controller = 2; dispatch[MEM_START + 12].controller = 1; diff --git a/brighton/brightonHammondB3.c b/brighton/brightonHammondB3.c index 5a4130a..6b3d709 100644 --- a/brighton/brightonHammondB3.c +++ b/brighton/brightonHammondB3.c @@ -220,7 +220,7 @@ static brightonLocations locations[C_COUNT] = { /* * 28 - Dummies. May one day extend the bass drawbar configuration as per - * some other emulations. It is extremely easy to do, just not convinved it + * some other emulations. It is extremely easy to do, just not convinced it * really make sense. */ {"", BRIGHTON_HAMMOND, Cm2, R1, W1, L1, 0, 8, 0, @@ -249,7 +249,7 @@ static brightonLocations leslie[2] = { "bitmaps/buttons/sw5.xpm", BRIGHTON_VERTICAL|BRIGHTON_NOSHADOW}, {"", 2, 100, 100, 800, 200, 0, 1, 0, /* - * Use a slighly older rocker than the plastic white, looks mildly more + * Use a slightly older rocker than the plastic white, looks mildly more * authentic. "bitmaps/buttons/rockerwhite.xpm", 0, 0} */ @@ -303,7 +303,7 @@ static brightonLocations mem[MEM_COUNT] = { {"", 2, mC4, mR4, S4, S5, 0, 1, 0, "bitmaps/buttons/pressoffg.xpm", "bitmaps/buttons/pressong.xpm", 0}, - /* midi U, D, Load, Save */ + /* MIDI U, D, Load, Save */ {"", 2, mC1, mR2, S4, S5, 0, 1, 0, "bitmaps/buttons/pressoff.xpm", "bitmaps/buttons/presson.xpm", BRIGHTON_CHECKBUTTON}, @@ -960,7 +960,7 @@ hammondB3Midi(guiSynth *synth, int fd, int chan, int c, int o, int v) } } else { /* - * On the upper side we need to reserve two midi channels + * On the upper side we need to reserve two MIDI channels */ if ((newchan = synth->midichannel + 1) >= 15) { @@ -970,7 +970,7 @@ hammondB3Midi(guiSynth *synth, int fd, int chan, int c, int o, int v) } /* - * Lower manual midi channel selection first + * Lower manual MIDI channel selection first */ bristolMidiSendMsg(manual.controlfd, synth->sid2, 127, 0, (BRISTOL_MIDICHANNEL|newchan) + 1); @@ -1746,7 +1746,7 @@ hammondB3Init(brightonWindow *win) dispatch[VOL_START].routine = (synthRoutine) doVolume; - /* Memory/Midi buttons */ + /* Memory/MIDI buttons */ dispatch[MEM_START + 10].controller = 12; dispatch[MEM_START + 10].operator = 0; @@ -1784,7 +1784,7 @@ hammondB3Init(brightonWindow *win) dispatch[MEM_START + 14].routine = (synthRoutine) hammondB3Memory; /* - * Midi up/down + * MIDI up/down */ dispatch[MEM_START + 10].controller = 2; dispatch[MEM_START + 11].controller = 1; @@ -1832,18 +1832,18 @@ hammondB3MidiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemory(synth, "hammondB3", 0, synth->bank + synth->location, synth->mem.active, FIRST_DEV, 0); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; break; } diff --git a/brighton/brightonJuno.c b/brighton/brightonJuno.c index 6363762..bc8e6d8 100644 --- a/brighton/brightonJuno.c +++ b/brighton/brightonJuno.c @@ -390,12 +390,12 @@ midiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; if (loadMemory(synth, "juno", 0, synth->bank + synth->location, synth->mem.active, FIRST_DEV, 0) < 0) @@ -404,7 +404,7 @@ midiCallback(brightonWindow *win, int controller, int value, float n) displayText(synth, "PRG", synth->location, DISPLAY_DEV); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; synth->location = (synth->location % 10) + value * 10; if (loadMemory(synth, "juno", 0, synth->bank + synth->location, @@ -796,7 +796,7 @@ junoInit(brightonWindow *win) dispatch[MEM_MGT + 14].routine = dispatch[MEM_MGT + 15].routine = (synthRoutine) junoMemory; - /* Midi management */ + /* MIDI management */ dispatch[MIDI_MGT].routine = dispatch[MIDI_MGT + 1].routine = (synthRoutine) junoMidi; dispatch[MIDI_MGT].controller = 2; diff --git a/brighton/brightonJupiter.c b/brighton/brightonJupiter.c index 9219d69..92ab9b8 100644 --- a/brighton/brightonJupiter.c +++ b/brighton/brightonJupiter.c @@ -538,7 +538,7 @@ static brightonLocations locations[DEVICE_COUNT] = { "bitmaps/buttons/jbb1o.xpm", 0}, /* - * The preceeding parameters are unique per synth and need to be loaded + * The preceding parameters are unique per synth and need to be loaded * from different memory files? Alternatively just load the mem and let * the last loaded parameters be active for the following ones: * @@ -897,7 +897,7 @@ midiRelease(guiSynth *synth, int fd, int chan, int c, int o, int v) if (!global.libtest) { /* - * Midi release is ALL notes, ALL synths. If this behaviour (in the + * MIDI release is ALL notes, ALL synths. If this behaviour (in the * engine) changes we may need to put in an all_notes_off on the * second manual as well. */ @@ -927,13 +927,13 @@ midiCallback(brightonWindow *win, int controller, int value, float n) guiSynth *synth = findSynth(global.synths, win); if (jupiterDebug(synth, 1)) - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: if (jupiterDebug(synth, 2)) - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemory(synth, "jupiter8", 0, synth->bank + synth->location, synth->mem.active, 0, 0); @@ -941,7 +941,7 @@ midiCallback(brightonWindow *win, int controller, int value, float n) break; case MIDI_BANK_SELECT: if (jupiterDebug(synth, 2)) - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value + 10; loadMemory(synth, "jupiter8", 0, synth->bank + synth->location, synth->mem.active, 0, 0); @@ -1197,7 +1197,7 @@ jupiterFunctionKey(guiSynth *synth, int fd, int chan, int c, int o, int v) return; } - /* Midi debug */ + /* MIDI debug */ if (o == 6) { if (v != 0) v = 1; @@ -1446,7 +1446,7 @@ jupiterMemory(guiSynth *synth, int fd, int chan, int c, int o, int v) * emulation into mode All and potentially put it into Poly-1 if * it was in Solo. * - * This code should also invistigate how to load some arpeggiator + * This code should also investigate how to load some arpeggiator * information, automated if possible into the library. */ if (brightonDoubleClick(dc1)) { @@ -1643,7 +1643,7 @@ synth->mem.param[PANEL_SELECT]); */ /* - * Load will set the displays and nothing else, they will alsways point to + * Load will set the displays and nothing else, they will always point to * the active patches. * * The buttons selections should come from the layer select or from being @@ -1666,7 +1666,7 @@ jupiterMidi(guiSynth *synth, int fd, int chan, int c, int o, int v) } else { /* * This is a little incorrect - if we are layered then we can go to - * midi channel 15. + * MIDI channel 15. */ if ((newchan = synth->midichannel + 1) >= 14) newchan = synth->midichannel = 14; @@ -2445,8 +2445,8 @@ jupiterVolume(guiSynth *synth, int fd, int chan, int c, int o, int v) /* * We have to consider layer balance and volume here, they multiply out. - * These are linear controls. They may become constand power curves but - * that reponse is not too great. + * These are linear controls. They may become constant power curves but + * that response is not too great. */ bristolMidiSendMsg(fd, synth->sid, 126, 3, (int) (volume * (1.0 - balance) * C_RANGE_MIN_1)); @@ -2566,9 +2566,9 @@ jupiterFilter(guiSynth *synth, int fd, int chan, int c, int o, int v) sid = synth->sid2; /* - * The preferred filter is the Houvilainen however as of 0.20.8 this only + * The preferred filter is the Huovilainen however as of 0.20.8 this only * does LPF. For the HPF and BPF we have to revert back to the previous - * chaimberlains + * chamberlins */ switch (v) { case 0: /* LP - 24 dB */ @@ -2987,7 +2987,7 @@ jupiterInit(brightonWindow *win) * Memory management * * Two sets of locations - 8 bank and 8 memory, then a load and a save - * button. Save will be doubleclick requirement. the selectors will be + * button. Save will be double-click requirement. the selectors will be * radio buttons. * There are also issues with the dual layering that needs to be included. * This file was copied from the Juno, but the interface is more like the @@ -3048,7 +3048,7 @@ jupiterInit(brightonWindow *win) = dispatch[MEM_MGT + 15].routine = dispatch[MEM_MGT + 16].routine = (synthRoutine) jupiterButtonPanel; - /* Midi management */ + /* MIDI management */ dispatch[MIDI_MGT].controller = 1; dispatch[MIDI_MGT + 1].controller = 2; dispatch[MIDI_MGT].routine = dispatch[MIDI_MGT + 1].routine diff --git a/brighton/brightonMS20.c b/brighton/brightonMS20.c index 3ab0a35..699221c 100644 --- a/brighton/brightonMS20.c +++ b/brighton/brightonMS20.c @@ -40,7 +40,7 @@ extern guimain global; /* 36 controllers, 4 idle, 35 patches, 5 idle, then memory. */ #define DEVICE_COUNT 98 -#define ACTIVE_DEVS 79 /* 35 of 40 jack connectors active. */ +#define ACTIVE_DEVS 79 /* 35 of 40 JACK connectors active. */ #define MEM_START (ACTIVE_DEVS + 1) #define MS20_OUTPUTS 20 #define MS20_INPUTS 20 @@ -400,7 +400,7 @@ brightonApp ms20App = { "ms20", 0, "bitmaps/textures/metal7.xpm", - BRIGHTON_STRETCH|BRIGHTON_REVERSE, /* default is tesselate */ + BRIGHTON_STRETCH|BRIGHTON_REVERSE, /* default is tessellate */ ms20Init, ms20Configure, /* 3 callbacks, unused? */ 0, @@ -762,7 +762,7 @@ ms20IOSelect(guiSynth *synth, int fd, int chan, int c, int o, int v) * can be removed. * * The structure we need should have an input and output list, this should - * give the true co-ords for the start and endpoint since it will be used + * give the true coords for the start and endpoint since it will be used * to evaluate the transforms for the patch source to the on-screen dest * bitmaps. * @@ -967,7 +967,7 @@ ms20Init(brightonWindow *win) dispatch[MEM_START + 16].routine = dispatch[MEM_START + 17].routine = (synthRoutine) ms20Memory; - /* midi */ + /* MIDI */ dispatch[MEM_START + 12].controller = 2; dispatch[MEM_START + 13].controller = 1; dispatch[MEM_START + 12].routine = dispatch[MEM_START + 13].routine = diff --git a/brighton/brightonMaster.c b/brighton/brightonMaster.c index 82bf88e..be4febc 100644 --- a/brighton/brightonMaster.c +++ b/brighton/brightonMaster.c @@ -327,7 +327,7 @@ int skip, int flags) /* * See if the memory actually exists. This is a bit of file system overhead - * but prevents attempting to load non-existant memories + * but prevents attempting to load non-existent memories */ op = loadMemory(synth, algo, name, location, active, skip, BRISTOL_STAT); @@ -397,18 +397,18 @@ masterMidiCallback(brightonWindow *win, int command, int value, float v) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", command, value); + printf("MIDI callback: %x, %i\n", command, value); switch(command) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", command, value); + printf("MIDI program: %x, %i\n", command, value); synth->location = value; masterLoadMem(synth, "master", 0, synth->location, synth->mem.active, FIRST_DEV, 0); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", command, value); + printf("MIDI banksel: %x, %i\n", command, value); synth->bank = value; break; } @@ -987,7 +987,7 @@ masterInit(brightonWindow *win) dispatch[MEM_START + 15].controller = 3; dispatch[MEM_START + 16].controller = 4; - /* Midi */ + /* MIDI */ dispatch[MEM_START + 12].controller = 2; dispatch[MEM_START + 13].controller = 1; dispatch[MEM_START + 12].routine = dispatch[MEM_START + 13].routine = diff --git a/brighton/brightonMemoryMoog.c b/brighton/brightonMemoryMoog.c index 588cf5e..44f5db8 100644 --- a/brighton/brightonMemoryMoog.c +++ b/brighton/brightonMemoryMoog.c @@ -318,7 +318,7 @@ static brightonLocations locations[DEVICE_COUNT] = { "bitmaps/buttons/touch.xpm", BRIGHTON_CHECKBUTTON|BRIGHTON_NOSHADOW}, {"", 0, C11 - 5, R0, S3, S4, 0, 1, 0, "bitmaps/knobs/knob6.xpm", 0, BRIGHTON_NOTCH}, - /* Memory/Midi - 94 */ + /* Memory/MIDI - 94 */ /* Load/Save */ {"", 2, C20 - 4, R3, S2, S1, 0, 1, 0, "bitmaps/buttons/touchogb.xpm", "bitmaps/buttons/touchgb.xpm", BRIGHTON_CHECKBUTTON|BRIGHTON_NOSHADOW}, @@ -571,18 +571,18 @@ MMmidiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value + synth->bank; loadMemory(synth, "memoryMoog", 0, synth->location, synth->mem.active, 0, 0); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value + 10; synth->location = (synth->location % 10) + synth->bank; loadMemory(synth, "memoryMoog", 0, synth->location, @@ -611,7 +611,7 @@ memMoogModCallback(brightonWindow *win, int panel, int index, float value) float bend = synth->mem.param[89]; /* * Value is between 0 and 1 latching at 0.5. Have to scale the value - * and subtrace if from the mid point + * and subtract if from the mid point */ bristolMidiSendMsg(global.controlfd, synth->midichannel, BRISTOL_EVENT_PITCH, 0, @@ -810,7 +810,7 @@ memMoogOscTranspose(guiSynth *synth, int fd, int chan, int c, int o, int v) return; /* - * We need to configure the radio set and then request the tranpose value. + * We need to configure the radio set and then request the transpose value. */ if (synth->dispatch[c].other2) { @@ -836,7 +836,7 @@ memMoogOscTranspose(guiSynth *synth, int fd, int chan, int c, int o, int v) if (o > 17) { /* - * Osc 3 - tranpose depends on mem[27] + * Osc 3 - transpose depends on mem[27] */ if (synth->mem.param[27]) return; @@ -859,7 +859,7 @@ memMoogLFOWave(guiSynth *synth, int fd, int chan, int c, int o, int v) return; /* - * We need to configure the radio set and then request the tranpose value. + * We need to configure the radio set and then request the transpose value. */ if (synth->dispatch[c].other2) { @@ -895,7 +895,7 @@ memMoogTranspose(guiSynth *synth, int fd, int chan, int c, int o, int v) return; /* - * We need to configure the radio set and then request the tranpose value. + * We need to configure the radio set and then request the transpose value. */ if (synth->dispatch[c].other2) { diff --git a/brighton/brightonMini.c b/brighton/brightonMini.c index caec2fc..fbdf971 100644 --- a/brighton/brightonMini.c +++ b/brighton/brightonMini.c @@ -98,7 +98,7 @@ static brightonLocations locations[DEVICE_COUNT] = { 0, 0}, {"Mod", 0, 80, R4, S1, S1, 0, 1, 0, "bitmaps/knobs/knob4.xpm", 0, 0}, /*3 */ -/* OSCILATORS */ +/* OSCILLATORS */ {"Osc1 Transpose", 0, C1, R1, S1, S1, 0, 5, 0, "bitmaps/knobs/knob4.xpm", 0, 0}, {"Osc2 Transpose", 0, C1, R3, S1, S1, 0, 5, 0, "bitmaps/knobs/knob4.xpm", @@ -206,7 +206,7 @@ static brightonLocations locations[DEVICE_COUNT] = { "bitmaps/digits/8.xpm", 0, BRIGHTON_CHECKBUTTON}, {"", 2, R7 + S4 * 2, R6, S4, S5, 0, 1, 0, "bitmaps/digits/9.xpm", 0, BRIGHTON_CHECKBUTTON}, - /* Up down midi */ + /* Up down MIDI */ {"", 2, R7 + S4, 415, S4, S5, 0, 1, 0, "bitmaps/digits/Down.xpm", 0, BRIGHTON_CHECKBUTTON}, {"", 2, R7 + S4 * 2, 415, S4, S5, 0, 1, 0, @@ -232,7 +232,7 @@ brightonApp miniApp = { "mini", 0, /* no blueprint on wood background. */ "bitmaps/textures/wood6.xpm", - 0, /*BRIGHTON_STRETCH, // default is tesselate */ + 0, /*BRIGHTON_STRETCH, // default is tessellate */ miniInit, miniConfigure, /* 3 callbacks, unused? */ midiCallback, @@ -357,12 +357,12 @@ midiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - //printf("midi callback: %x, %i\n", controller, value); + //printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - //printf("midi program: %x, %i\n", controller, value); + //printf("MIDI program: %x, %i\n", controller, value); synth->location = value + synth->bank * 10; if (loadMemory(synth, synth->resources->name, 0, synth->location, synth->mem.active, FIRST_DEV, 0) < 0) @@ -371,7 +371,7 @@ midiCallback(brightonWindow *win, int controller, int value, float n) displayText(synth, "PRG", synth->location, FIRST_DEV + 59); break; case MIDI_BANK_SELECT: - //printf("midi banksel: %x, %i\n", controller, value); + //printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; synth->location = (synth->location % 10) + value * 10; if (loadMemory(synth, synth->resources->name, 0, @@ -740,7 +740,7 @@ miniInit(brightonWindow *win) bristolMidiSendMsg(global.controlfd, synth->sid, 3, 4, CONTROLLER_RANGE - 1); /* - * Filter type, this selects a Houvilainen filter + * Filter type, this selects a Huovilainen filter */ bristolMidiSendMsg(global.controlfd, synth->sid, 4, 4, 4); /* @@ -973,7 +973,7 @@ miniConfigure(brightonWindow *win) * 0.9 release but configurable per synth. These are detune and gain to * start with. Some of this code could be separated as it is likely to be * common to each synth. These parameters will be sent to the engine using - * midi non-registered parameters. These will be sent as NRP-98/99 and Data + * MIDI non-registered parameters. These will be sent as NRP-98/99 and Data * Entry-6/38. To simplify the interface we should be able to make one call * send a NRP including the number and its 14 bit value. It is up to the * interface to decide how to send it depending on whether it is a repeat diff --git a/brighton/brightonMixer.c b/brighton/brightonMixer.c index d8fec94..2066017 100644 --- a/brighton/brightonMixer.c +++ b/brighton/brightonMixer.c @@ -52,7 +52,7 @@ extern void *initMixerMemory(int count); * * Personally I think we should define a memory structure that is overlayed * onto the array of floats that defines the actual memory space. To allow for - * extensability then bussing should come first, then tracks listed from '1'. + * extensibility then bussing should come first, then tracks listed from '1'. * The function section which includes master volume is not saved. */ @@ -231,7 +231,7 @@ static brightonLocations locations[MEM_COUNT] = { "bitmaps/buttons/pressoffSy.xpm", "bitmaps/buttons/pressonSy.xpm", BRIGHTON_NOSHADOW}, /* - * Effects select: reverb, echo, chorus, flanger, tremelo, vibrato, delay + * Effects select: reverb, echo, chorus, flanger, tremolo, vibrato, delay */ {"", 2, C12, R14 + 6, SB3, SB7, 0, 1.01, 0, "bitmaps/buttons/pressoffSg.xpm", "bitmaps/buttons/pressonSg.xpm", BRIGHTON_NOSHADOW}, @@ -845,7 +845,7 @@ mixMidi(guiSynth *synth, int fd, int chan, int c, int o, int v) * This is non-trivial, since the GUI does not support radio buttons, and the * memory subsystem should not know about them. Consequently they have to be * handled here, and it can create issues where the GUI, the mixer and its - * memory subsystem are not in agreament. + * memory subsystem are not in agreement. MARK */ int currentInSelect[MAX_CHAN_COUNT] = { @@ -1165,7 +1165,7 @@ trackOp(guiSynth *synth, int panel, int track, int operator, float value) * The memory structure is going to be large. To cater for future extensions * each memory component (track, bus, etc) is going to have extra memory * allocated. New parameters will occupy the extra space allowing for - * compatability of memories over releases. + * compatibility of memories over releases. */ static int mixCallback(brightonWindow * win, int panel, int index, float value) diff --git a/brighton/brightonMixerMemory.c b/brighton/brightonMixerMemory.c index bd2f862..51d9811 100644 --- a/brighton/brightonMixerMemory.c +++ b/brighton/brightonMixerMemory.c @@ -88,7 +88,7 @@ doLoadMixerMemory(guiSynth *synth) * to the GUI to draw the mixer, that will notify the engine and set the * parameters here again (as an undesirable sideffect); * - * Going to start with the steroe bus section as it is (comparatively) easy. + * Going to start with the stereo bus section as it is (comparatively) easy. */ for (channel = 0; channel < 4; channel++) { @@ -477,7 +477,7 @@ getMixerMemory(mixerMem *m, int op, int param) /* * Call a set of routines that will open the directory and then - * return its contents until finnished. + * return its contents until finished. */ return(entry->d_name); default: diff --git a/brighton/brightonMixerMenu.c b/brighton/brightonMixerMenu.c index a7d256b..13eede0 100644 --- a/brighton/brightonMixerMenu.c +++ b/brighton/brightonMixerMenu.c @@ -91,7 +91,7 @@ guiSynth *theSynth; /* * We should not really have to rely on timers within the GUI: The engine will * evaluate RMS and Peak signal values for the channels, and save them. The - * Midi thread should take these values X times per second (ie, with a timer) + * MIDI thread should take these values X times per second (ie, with a timer) * and send a message to the GUI over the interface tap. * * Whenever the GUI gets a VU message it should update the VU meter display. @@ -175,7 +175,7 @@ Menu functionMenu[MENU_COUNT] = { {"Track VU ", 3, 12, 0, 0}, {"Audio Mem ", 13, 14, 0, 0}, {"Stats Print ", 15, -1, 0, printInterface}, - {"Midi Quit ", 17, 16, 0, 0}}, + {"MIDI Quit ", 17, 16, 0, 0}}, }, { {" Effects Menu ", 0, 2, 0, 0}, @@ -310,7 +310,7 @@ Menu functionMenu[MENU_COUNT] = { {"No Yes ", 0, 3, 0, removeInterface}}, }, { - {" Midi Menu ", 0, 0, printMidiMenu, 0}, + {" MIDI Menu ", 0, 0, printMidiMenu, 0}, {{" ", -1, -1, 0, 0}, {"Channel: ", -1, -1, 0, 0}, {" Up ", -1, -1, 0, midiUp}, @@ -1153,7 +1153,7 @@ printMidiMenu(guiSynth *synth) /* * Create text for track display */ - displayPanel(synth, " Midi Menu ", + displayPanel(synth, " MIDI Menu ", 0, FUNCTION_PANEL, DISPLAY1); displayPanel(synth, diff --git a/brighton/brightonOBX.c b/brighton/brightonOBX.c index e7d69cf..5e99570 100644 --- a/brighton/brightonOBX.c +++ b/brighton/brightonOBX.c @@ -442,19 +442,19 @@ obxMidiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; /* loadMemory(synth, "obx", 0, synth->bank + synth->location, */ /* synth->mem.active, FIRST_DEV, 0); */ obxLoadMemory(synth, global.controlfd, synth->midichannel, 0, 0, 0); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; break; } @@ -491,7 +491,7 @@ obxModCallback(brightonWindow *win, int panel, int index, float value) case 1: /* * Not sure why this should work, and it probably doesn't. It is - * the 'mod' controller but appears to affect Osc-1 tranpose + * the 'mod' controller but appears to affect Osc-1 transpose */ if (narrow != 0) /*sendvalue = (int) ((value * C_RANGE_MIN_1)) >> 3; */ @@ -622,7 +622,7 @@ obxWaveform(guiSynth *synth, int fd, int chan, int c, int o, int v) { /* * If the sqr is being selected, then PW will modify this oscillator, - * and if going off then it will cotrol the other + * and if going off then it will control the other */ if (v != 0) pwSelect = c; @@ -681,7 +681,7 @@ multiTune(guiSynth *synth, int fd, int chan, int c, int o, int v) /* * The OB-X does not have a lot of memories, just 8 banks of 8 memories. This - * is a bit sparse for the emulater but it keeps the interface easy. Will be + * is a bit sparse for the emulator but it keeps the interface easy. Will be * two sets of buttons, one for the bank, one for the index, then load and * save. Load and Save will be intermittent and the banks radio buttons. */ diff --git a/brighton/brightonOBXa.c b/brighton/brightonOBXa.c index 85c38ff..f3fcda1 100644 --- a/brighton/brightonOBXa.c +++ b/brighton/brightonOBXa.c @@ -259,7 +259,7 @@ static brightonLocations locations[DEVICE_COUNT] = { "bitmaps/knobs/alpharotary.xpm", 0}, {"Reset", 2, C3 + BO, R2a, S2, S3, 0, 1, 0, "bitmaps/buttons/pressoff.xpm", "bitmaps/buttons/presson.xpm", 0}, - /* This is the Tremelo modifier */ + /* This is the Tremolo modifier */ {"LFO-Mod-VCA", 2, C7 + B2, R4, S2, S3, 0, 1, 0, "bitmaps/buttons/pressoff.xpm", "bitmaps/buttons/presson.xpm", 0}, {"Balance", 0, C3, R1 - 100, S1, S1, 0, 1, 0, "bitmaps/knobs/knob5.xpm", @@ -703,18 +703,18 @@ obxaMidiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; obxaLoadMemory(synth, synth->resources->name, 0, synth->bank * 10 + synth->location, synth->mem.active, FIRST_DEV, 0); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; break; } @@ -758,7 +758,7 @@ printf("setting split point: %i\n", index); * each channel. If split then check the key we have selected, and if * poly send to each voice in turn. * - * Take the tranpose out of here. + * Take the transpose out of here. */ if (value) bristolMidiSendMsg(global.controlfd, synth->midichannel, @@ -990,7 +990,7 @@ obxaModCallback(brightonWindow *cid, int panel, int index, float value) 126, 29, 0); } break; - case 9: /* Ammount - Wide Narrow mods */ + case 9: /* Amount - Wide Narrow mods */ /* Nothing to do - just a flag that affects swing of wheels. */ /* That is not wise, it should really go to the engine */ break; @@ -1220,7 +1220,7 @@ obxaWaveform(guiSynth *synth, int fd, int chan, int c, int o, int v) { /* * If the sqr is being selected, then PW will modify this oscillator, - * and if going off then it will cotrol the other + * and if going off then it will control the other */ if (v != 0) pwSelect = c; @@ -1884,12 +1884,12 @@ obxaMidi(guiSynth *synth, int fd, int chan, int c, int o, int v) /* * For this synth we are going to try and put everything on a single - * midi channel - split poly is all voices, split will tell the engine + * MIDI channel - split poly is all voices, split will tell the engine * which ranges apply to which voices on this synth, layer will apply * two notes on the channel, and unison all of them. Unison should really * be an engine feature to setup every voice for a given baudio structure. * - * This works badly for the Prophet10 though, so may go for two midi + * This works badly for the Prophet10 though, so may go for two MIDI * channels and decide how to intepret them. */ if (c == 2) { @@ -2234,7 +2234,7 @@ obxaInit(brightonWindow *win) dispatch[FIRST_DEV + 41].controller = 41; dispatch[FIRST_DEV + 41].operator = 0; dispatch[FIRST_DEV + 41].routine = (synthRoutine) obxaDecay; - /* Mod to tremelo */ + /* Mod to tremolo */ dispatch[FIRST_DEV + 42].controller = 126; dispatch[FIRST_DEV + 42].operator = 18; /* Balance. Should work as a dispatcher along with master volume? */ diff --git a/brighton/brightonOdyssey.c b/brighton/brightonOdyssey.c index d37b17a..24e8402 100644 --- a/brighton/brightonOdyssey.c +++ b/brighton/brightonOdyssey.c @@ -43,7 +43,7 @@ extern guimain global; #include "brightonKeys.h" #define DEVICE_COUNT 61 -#define ACTIVE_DEVS 61 /* Actually 57 - should not sve pitch control. */ +#define ACTIVE_DEVS 61 /* Actually 57 - should not have pitch control. */ #define MEM_START 0 #define MIDI_START (MEM_START + 18) @@ -588,18 +588,18 @@ midiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemory(synth, "odyssey", 0, synth->bank + synth->location, synth->mem.active, 0, 0); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; break; } @@ -614,7 +614,7 @@ odysseyMidiSendMsg(void *synth, int fd, int chan, int c, int o, int v) } /* - * This will be called back with memories, midi and panel switch. + * This will be called back with memories, MIDI and panel switch. */ static int odysseyMemory(brightonWindow * win, int panel, int index, float value) @@ -693,19 +693,19 @@ odysseyMemory(brightonWindow * win, int panel, int index, float value) break; case 18: /* - * Midi down + * MIDI down */ odysseyMidi(synth, 1); break; case 19: /* - * Midi Up + * MIDI Up */ odysseyMidi(synth, 0); break; case 20: /* - * Midi Panel Switch + * MIDI Panel Switch */ odysseyPanelSwitch(win); break; @@ -740,10 +740,10 @@ odysseyMidi(guiSynth *synth, int c) /* * To overcome that we should consider checking a sequence number in * the message library? That is non trivial since it requires that - * our midi messges have a 'ack' flag included - we cannot check for + * our MIDI messages have a 'ack' flag included - we cannot check for * ack here (actually, we could, and in the app is probably the right * place to do it rather than the lib however both would have to be - * changed to suppor this - nc). + * changed to support this - nc). */ bristolMidiSendMsg(global.controlfd, synth->sid, 127, 0, BRISTOL_MIDICHANNEL|newchan); @@ -784,7 +784,7 @@ odysseyPanelSwitch(brightonWindow * win) event.intvalue = 1; brightonParamChange(synth->win, 0, -1, &event); oMark = 0; - /* And toggle the filter type - chamberlain. */ + /* And toggle the filter type - chamberlin. */ bristolMidiSendMsg(global.controlfd, synth->sid, 3, 4, 0); } @@ -1216,7 +1216,7 @@ odysseyInit(brightonWindow *win) bristolMidiSendMsg(global.controlfd, synth->sid, 7, 2, 16383); bristolMidiSendMsg(global.controlfd, synth->sid, 7, 4, 16383); - /* Ringmodd parameters. */ + /* Ringmod parameters. */ bristolMidiSendMsg(global.controlfd, synth->sid, 8, 0, 16383); bristolMidiSendMsg(global.controlfd, synth->sid, 8, 1, 128); bristolMidiSendMsg(global.controlfd, synth->sid, 8, 2, 16383); diff --git a/brighton/brightonPoly.c b/brighton/brightonPoly.c index e92ef43..7177dbd 100644 --- a/brighton/brightonPoly.c +++ b/brighton/brightonPoly.c @@ -239,7 +239,7 @@ static brightonLocations locations[DEVICE_COUNT] = { {"", 2, C5, R3d, B1, B2, 0, 1, 0, "bitmaps/buttons/pressoffw.xpm", "bitmaps/buttons/pressonw.xpm", BRIGHTON_CHECKBUTTON}, - /* Midi */ + /* MIDI */ {"", 2, C15, R3, B1, S1, 0, 1, 0, "bitmaps/buttons/pressoff.xpm", "bitmaps/buttons/presson.xpm", BRIGHTON_CHECKBUTTON}, {"", 2, C15 + BOFF * 2, R3, B1, S1, 0, 1, 0, "bitmaps/buttons/pressoff.xpm", @@ -387,19 +387,19 @@ pmidiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemory(synth, "mono", 0, synth->bank + synth->location, synth->mem.active, FIRST_DEV, 0); fixModes(synth); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; break; } @@ -675,10 +675,10 @@ polyMidi(guiSynth *synth, int fd, int chan, int c, int o, int v) #warning if we do not check for ack then socket might hang on exit * To overcome that we should consider checking a sequence number in * the message library? That is non trivial since it requires that - * our midi messges have a 'ack' flag included - we cannot check for + * our MIDI messages have a 'ack' flag included - we cannot check for * ack here (actually, we could, and in the app is probably the right * place to do it rather than the lib however both would have to be - * changed to suppor this - nc). + * changed to support this - nc). */ bristolMidiSendMsg(global.controlfd, synth->sid, 127, 0, BRISTOL_MIDICHANNEL|newchan); diff --git a/brighton/brightonPoly6.c b/brighton/brightonPoly6.c index fdb91df..7a3872e 100644 --- a/brighton/brightonPoly6.c +++ b/brighton/brightonPoly6.c @@ -311,19 +311,19 @@ midiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemory(synth, "poly", 0, synth->bank + synth->location, synth->mem.active, 0, 0); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; break; } @@ -349,7 +349,7 @@ poly6ModCallback(brightonWindow *win, int panel, int index, float value) { /* * Value is between 0 and 1 latching at 0.5. Have to scale the value - * and subtrace if from the mid point + * and subtract if from the mid point */ bristolMidiSendMsg(global.controlfd, synth->midichannel, BRISTOL_EVENT_PITCH, 0, @@ -661,7 +661,7 @@ poly6Gain(guiSynth *synth, int fd, int chan, int c, int o, int v) break; case 100: /* - * This is the attentuator switch, 1 == gate. + * This is the attenuator switch, 1 == gate. */ if (synth->mem.param[28]) { @@ -788,7 +788,7 @@ poly6Init(brightonWindow *win) for (i = 0; i < DEVICE_COUNT; i++) synth->dispatch[i].routine = poly6MidiSendMsg; - /* Vol tune bend - NOT FINNISHED */ + /* Vol tune bend - NOT FINISHED */ dispatch[0].controller = 6; dispatch[0].operator = 4; dispatch[0].routine = (synthRoutine) poly6Gain; diff --git a/brighton/brightonPoly800.c b/brighton/brightonPoly800.c index 87dc2ab..3cad5ca 100644 --- a/brighton/brightonPoly800.c +++ b/brighton/brightonPoly800.c @@ -119,7 +119,7 @@ static int dc, mbh = 0, crl = 0; /* * We really need to define parameter types and ranges here to make the - * interface complete. For example, the midi channels only go from 1 to 16 and + * interface complete. For example, the MIDI channels only go from 1 to 16 and * when selected as the input then the pot should configure this range. * * Similarly, if this is a button it should be 0 for the first half and 1 for @@ -262,8 +262,8 @@ p800range poly800Range[DEVICE_COUNT] = { {POLY800_CONTINUOUS, 0, 15, 126, 22, 0}, /* DCO */ {POLY800_CONTINUOUS, 0, 15, 126, 23, 0}, /* VCF */ {POLY800_STEPPED, 0, 1, 126, 11, 0}, /* LFO Multi entry */ - {POLY800_STEPPED, 1, 16, 126, 126, P800_REZERO}, /* Midi Chan Shim */ - {POLY800_STEPPED, 0, 1, 126, 126, 0}, /* Midi Prog Change */ + {POLY800_STEPPED, 1, 16, 126, 126, P800_REZERO}, /* MIDI Chan Shim */ + {POLY800_STEPPED, 0, 1, 126, 126, 0}, /* MIDI Prog Change */ {POLY800_STEPPED, 1, 2, 126, 126, P800_REZERO}, /* OMNI */ }; @@ -684,7 +684,7 @@ brightonLocations p800mods[MODS_COUNT] = { /* Entry pot 18 */ {"DataEntry", 0, 835, 750, 100, 140, 0, 1, 0, "bitmaps/knobs/knob1.xpm", 0, 0}, - /* Midi is now in the memory */ + /* MIDI is now in the memory */ {"", 2, 0, 0, 25, 140, 0, 1, 0, "bitmaps/buttons/polywhiteV.xpm", "bitmaps/buttons/polyredV.xpm",BRIGHTON_CHECKBUTTON|BRIGHTON_WITHDRAWN}, {"", 2, 600, 340, 18, 35, 0, 1, 0, "bitmaps/textures/p8b.xpm", @@ -861,9 +861,9 @@ poly800ChordInsert(arpeggiatorMemory *seq, int note, int transpose) } /* - * We really want to just use one midi channel and let the midi library decide + * We really want to just use one MIDI channel and let the MIDI library decide * that we have multiple synths on the channel with their own split points. - * The lower layer should define the midi channel, split point and transpose + * The lower layer should define the MIDI channel, split point and transpose * of upper layer. */ static int @@ -972,12 +972,12 @@ midiCallback(brightonWindow *win, int controller, int value, float n) * We should accept 0..74 as lower layer and above that as dual * loading requests. */ - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemoryShim(synth, synth->location); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; break; } diff --git a/brighton/brightonProOne.c b/brighton/brightonProOne.c index 2f2fea2..b8f3dcd 100644 --- a/brighton/brightonProOne.c +++ b/brighton/brightonProOne.c @@ -436,19 +436,19 @@ midiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->bank = value - (value % 8); synth->location = value % 8; loadMemory(synth, "pro1", 0, synth->bank * 10 + synth->location, synth->mem.active, 0, 0); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; break; } diff --git a/brighton/brightonProphet.c b/brighton/brightonProphet.c index 58e26f9..c851bd0 100644 --- a/brighton/brightonProphet.c +++ b/brighton/brightonProphet.c @@ -347,18 +347,18 @@ midiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemory(synth, "prophet", 0, synth->bank + synth->location, synth->mem.active, FIRST_DEV, 0); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; break; } diff --git a/brighton/brightonProphet10.c b/brighton/brightonProphet10.c index d11ce61..051b44c 100644 --- a/brighton/brightonProphet10.c +++ b/brighton/brightonProphet10.c @@ -296,7 +296,7 @@ static brightonLocations locations[DEVICE_COUNT] = { /* * This is for the lower mod panel. It will control the MIDI operational mode * for poly/split/layer stuff and mod routing. It is not totally according to - * the original that used the panel for argeggio. This may also control some + * the original that used the panel for arpeggio. This may also control some * of the mod routing for each layer. It will not be saved in the memories. */ #define P10_MOD_COUNT 15 @@ -482,18 +482,18 @@ midiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %i, %i\n", controller, value); + printf("MIDI callback: %i, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemory(synth, "prophet", 0, synth->bank + synth->location, synth->mem.active, 0, 0); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; break; } @@ -545,13 +545,13 @@ pro10DLP(guiSynth *synth, int fd, int chan, int c, int o, int v) /* * Dual keyboard: * - * Separate the midi channels + * Separate the MIDI channels * Half the key count for primary layer * Max out the split for second layer */ keymode = MODE_DUAL; - /* Separate the midi channels */ + /* Separate the MIDI channels */ if (synth->midichannel == 15) { synth->midichannel--; bristolMidiSendMsg(global.controlfd, synth->sid, @@ -576,13 +576,13 @@ pro10DLP(guiSynth *synth, int fd, int chan, int c, int o, int v) /* * Layered keyboards * - * Join up the midi channels + * Join up the MIDI channels * Half the key count for primary layer * Max out the split for second layer */ keymode = MODE_LAYER; - /* Join the midi channel */ + /* Join the MIDI channel */ bristolMidiSendMsg(global.controlfd, synth->sid2, 127, 0, (BRISTOL_MIDICHANNEL|synth->midichannel)); /* Halve the voicecount */ @@ -598,13 +598,13 @@ pro10DLP(guiSynth *synth, int fd, int chan, int c, int o, int v) /* * 10 Note Poly keyboards * - * Join up the midi channels + * Join up the MIDI channels * Double the key count for primary layer * Zero out the split for second layer */ keymode = MODE_POLY; - /* Join the midi channel although this is superfluous */ + /* Join the MIDI channel although this is superfluous */ bristolMidiSendMsg(global.controlfd, synth->sid2, 127, 0, (BRISTOL_MIDICHANNEL|synth->midichannel)); /* Whole the voicecount */ @@ -705,7 +705,7 @@ midiRelease(guiSynth *synth, int fd, int chan, int c, int o, int v) if (!global.libtest) { /* - * Midi release is ALL notes, ALL synths. If this behaviour (in the + * MIDI release is ALL notes, ALL synths. If this behaviour (in the * engine) changes we may need to put in an all_notes_off on the * second manual as well. */ @@ -722,7 +722,7 @@ ummodCallback(brightonWindow *win, int panel, int index, float value) synth->mem.param[UM_MOD_INDEX + index] = value; /* - * Selector buttonn debugs. + * Selector button debugs. printf("ummodCallback(%i, %i, %f) [%f %f %f %f]\n", panel, index, value, synth->mem.param[UM_MOD_INDEX + 2], synth->mem.param[UM_MOD_INDEX + 3], @@ -979,7 +979,7 @@ printf(" Learning on second layer\n"); /* * This used to send key events on one or two channels depending on the config. * Nothing really wrong with that however it would be better to actually tell - * the emmulator what midi channels to use so that other master keyboards work + * the emulator what MIDI channels to use so that other master keyboards work * as expected. * * For 10 vs 5 layered voices (layer versus poly) we also need to add some @@ -1698,7 +1698,7 @@ pro10Init(brightonWindow *win) /* * This looks a bit evil now but whatever happens it gets fixed later * when the dual/split/layer is configured - that will 'retweak' the - * midi channels. + * MIDI channels. */ if (++synth->midichannel > 15) synth->midichannel = 15; diff --git a/brighton/brightonProphet52.c b/brighton/brightonProphet52.c index 51fe908..c0b1bdd 100644 --- a/brighton/brightonProphet52.c +++ b/brighton/brightonProphet52.c @@ -328,18 +328,18 @@ midiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemory(synth, "prophet52", 0, synth->bank + synth->location, synth->mem.active, FIRST_DEV, 0); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; break; } diff --git a/brighton/brightonRealistic.c b/brighton/brightonRealistic.c index 70abc8e..cec73d3 100644 --- a/brighton/brightonRealistic.c +++ b/brighton/brightonRealistic.c @@ -178,7 +178,7 @@ static brightonLocations locations[MOD_COUNT] = { /* Volume 27 */ {"MasterVolume", 0, C13 - 15, R0 + 50, W3, W3, 0, 1, 0, "bitmaps/knobs/knob3.xpm", 0, 0}, - /* Midi Up/Down, save */ + /* MIDI Up/Down, save */ {"", 2, C15, R0, W1, 100, 0, 1, 0, "bitmaps/buttons/pressoff.xpm", "bitmaps/buttons/presson.xpm", BRIGHTON_CHECKBUTTON|BRIGHTON_WITHDRAWN}, {"", 2, C15, R2, W1, 100, 0, 1, 0, "bitmaps/buttons/pressoff.xpm", @@ -455,12 +455,12 @@ realisticMidiCallback(brightonWindow *win, int command, int value, float v) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", command, value); + printf("MIDI callback: %x, %i\n", command, value); switch(command) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", command, value); + printf("MIDI program: %x, %i\n", command, value); synth->location = value; realisticMemory(synth, global.controlfd, synth->sid, @@ -469,7 +469,7 @@ realisticMidiCallback(brightonWindow *win, int command, int value, float v) break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", command, value); + printf("MIDI banksel: %x, %i\n", command, value); synth->bank = value; break; } diff --git a/brighton/brightonRhodes.c b/brighton/brightonRhodes.c index 58f72ac..666a4ac 100644 --- a/brighton/brightonRhodes.c +++ b/brighton/brightonRhodes.c @@ -347,7 +347,7 @@ rhodesProgramme(guiSynth *synth, int fd, int chan, int cont, int op, int value) /* * Each of the 8 voices has an associated set of DX parameters. We * need to get hold of these, and send them directly over our config - * interface tap - we cannot forward via the normal GUi interface since + * interface tap - we cannot forward via the normal GUI interface since * we do not have these parameters mapped. * * The memories are mapped as 6 operators, each with 20 parameters, @@ -439,12 +439,12 @@ rhodesMidiCallback(brightonWindow *win, int command, int value, float v) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", command, value); + printf("MIDI callback: %x, %i\n", command, value); switch(command) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", command, value); + printf("MIDI program: %x, %i\n", command, value); synth->location = value; rhodesProgramme(synth, global.controlfd, synth->sid, @@ -453,7 +453,7 @@ rhodesMidiCallback(brightonWindow *win, int command, int value, float v) break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", command, value); + printf("MIDI banksel: %x, %i\n", command, value); synth->bank = value; break; } diff --git a/brighton/brightonRhodesBass.c b/brighton/brightonRhodesBass.c index cbe78a3..9bd2d48 100644 --- a/brighton/brightonRhodesBass.c +++ b/brighton/brightonRhodesBass.c @@ -337,7 +337,7 @@ rBassProgramme(guiSynth *synth, int fd, int chan, int cont, int op, int value) /* * Each of the 8 voices has an associated set of DX parameters. We * need to get hold of these, and send them directly over our config - * interface tap - we cannot forward via the normal GUi interface since + * interface tap - we cannot forward via the normal GUI interface since * we do not have these parameters mapped. * * The memories are mapped as 6 operators, each with 20 parameters, @@ -422,12 +422,12 @@ rBassMidiCallback(brightonWindow *win, int command, int value, float v) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", command, value); + printf("MIDI callback: %x, %i\n", command, value); switch(command) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", command, value); + printf("MIDI program: %x, %i\n", command, value); synth->location = value; rBassProgramme(synth, global.controlfd, synth->sid, @@ -436,7 +436,7 @@ rBassMidiCallback(brightonWindow *win, int command, int value, float v) break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", command, value); + printf("MIDI banksel: %x, %i\n", command, value); synth->bank = value; break; } diff --git a/brighton/brightonRoadRunner.c b/brighton/brightonRoadRunner.c index 746c3e7..b48cddd 100644 --- a/brighton/brightonRoadRunner.c +++ b/brighton/brightonRoadRunner.c @@ -167,8 +167,8 @@ static brightonLocations options[OPTS_COUNT] = { {"TouchSense", 2, oC6, 100, 27, 600, 0, 1, 0, "bitmaps/buttons/rockersmoothBW.xpm", "bitmaps/buttons/rockersmoothBWd.xpm", 0}, - /* Tremelo */ - {"Tremelo", 0, oC16, oR1, oW1, oL1, 0, 1, 0, 0, 0, 0}, + /* Tremolo */ + {"Tremolo", 0, oC16, oR1, oW1, oL1, 0, 1, 0, 0, 0, 0}, /* Chorus */ {"Choris Wet", 0, oC7, oR1, oW1, oL1, 0, 1, 0, 0, 0, 0}, @@ -240,7 +240,7 @@ brightonLocations mem[MEM_COUNT] = { {"", 1, 0, 0, 50, 50, 0, 1, 0, "bitmaps/knobs/sliderpointL.xpm", 0, BRIGHTON_VERTICAL|BRIGHTON_REVERSE|BRIGHTON_WITHDRAWN}, - /* mem U/D, midi U/D, Load + Save */ + /* mem U/D, MIDI U/D, Load + Save */ {"", 2, mC0 + 35, mR3, S4, S6, 0, 1, 0, "bitmaps/buttons/pressoffg.xpm", "bitmaps/buttons/pressong.xpm", BRIGHTON_CHECKBUTTON|BRIGHTON_NOSHADOW}, {"", 2, mC0 + 35, mR2, S4, S6, 0, 1, 0, "bitmaps/buttons/pressoffg.xpm", @@ -255,7 +255,7 @@ int singleclick = 0; /* * Should try and make this one as generic as possible, and try to use it as - * a general memory routine. has Midi u/d, mem u/d, load/save and a display. + * a general memory routine. has MIDI u/d, mem u/d, load/save and a display. */ static int memCallback(brightonWindow* win, int panel, int index, float value) @@ -370,7 +370,7 @@ memCallback(brightonWindow* win, int panel, int index, float value) switch(index) { case 10: /* - * Midi Down + * MIDI Down */ if ((newchan = synth->midichannel - 1) < 0) { @@ -380,7 +380,7 @@ memCallback(brightonWindow* win, int panel, int index, float value) if (global.libtest) { - printf("midi chan %i\n", newchan); + printf("MIDI chan %i\n", newchan); synth->midichannel = newchan; return(0); } @@ -392,7 +392,7 @@ memCallback(brightonWindow* win, int panel, int index, float value) break; case 11: /* - * Midi Up + * MIDI Up */ if ((newchan = synth->midichannel + 1) > 15) { @@ -402,7 +402,7 @@ memCallback(brightonWindow* win, int panel, int index, float value) if (global.libtest) { - printf("midi chan %i\n", newchan); + printf("MIDI chan %i\n", newchan); synth->midichannel = newchan; return(0); } @@ -532,18 +532,18 @@ midiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemory(synth, synth->resources->name, 0, synth->bank + synth->location, synth->mem.active, 0, 0); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; break; } @@ -903,7 +903,7 @@ roadrunnerInit(brightonWindow* win) synth->dispatch[OPTS_START + 11].controller = 3; synth->dispatch[OPTS_START + 11].operator = 5; - synth->dispatch[OPTS_START + 12].controller = 126; /* Tremelo */ + synth->dispatch[OPTS_START + 12].controller = 126; /* Tremolo */ synth->dispatch[OPTS_START + 12].operator = 8; /* Almost done effects - a couple may have to be compound parameters */ diff --git a/brighton/brightonRoutines.c b/brighton/brightonRoutines.c index d1b7d71..1d49cc1 100644 --- a/brighton/brightonRoutines.c +++ b/brighton/brightonRoutines.c @@ -400,7 +400,7 @@ bsmCopy(char *src, char *dst) /* * The next two will copy files into and out of the bristol cache. Read is only - * really used on system startup if a session file has been given by Jack SM but + * really used on system startup if a session file has been given by JACK SM but * it could be more general. Write will copy cache files out to wherever they * have been requested. */ diff --git a/brighton/brightonSAks.c b/brighton/brightonSAks.c index 4f41c6a..05ed020 100644 --- a/brighton/brightonSAks.c +++ b/brighton/brightonSAks.c @@ -330,7 +330,7 @@ static brightonLocations locations[DEVICE_COUNT] = { #define S5 17 #define S6 20 - /* Memory/Midi */ + /* Memory/MIDI */ /* Load/Save */ {"", 2, C20, R22_1, S5, S6, 0, 1, 0, "bitmaps/buttons/touchnl.xpm", "bitmaps/buttons/touchgb.xpm", BRIGHTON_CHECKBUTTON|BRIGHTON_NOSHADOW}, @@ -855,7 +855,7 @@ sAksInit(brightonWindow *win) dispatch[MIDI_START].routine = dispatch[MIDI_START + 1].routine = (synthRoutine) sAksMidi; - /* Set the oscillator indeces */ + /* Set the oscillator indexes */ bristolMidiSendMsg(global.controlfd, synth->sid, 1, 5, 1); bristolMidiSendMsg(global.controlfd, synth->sid, 2, 5, 2); /* Pink noise source (is variable with filter) */ diff --git a/brighton/brightonSID.c b/brighton/brightonSID.c index 634f6d6..48fb9ab 100644 --- a/brighton/brightonSID.c +++ b/brighton/brightonSID.c @@ -95,7 +95,7 @@ static int dc, mbh = 0; * mono (with detune then between voices in emulator) * three voice poly-1: all play same sound * three voice poly-2: all have their own sound - * two voice poly, voice 3 arpeggio - argeggiate all other held notes + * two voice poly, voice 3 arpeggio - arpeggiate all other held notes * * Arpeggiator to have rate, retrig and wavescanning, rates down to X samples. * @@ -155,7 +155,7 @@ static int dc, mbh = 0; * need Mod env retrig option - legato? * need Aud env retrig option - legato? * access to analogue parameters from GUI - * filter tracking keyboard - whick key? + * filter tracking keyboard - which key? * velocity to mod, filter, pw * arpeg direction */ @@ -282,7 +282,7 @@ brightonLocations modwheel[5] = { static brightonLocations locations[DEVICE_COUNT] = { /* - * Three voices with same parameterisation, roughly + * Three voices with same parametrisation, roughly * Tri/Ramp/Square/Noise Buttons * RM/SYNC/Mute/Routing(Multi global) Buttons * PW/Tune/transpose(/Glide?) - Pots @@ -663,9 +663,9 @@ brightonApp sidApp = { }; /* - * We really want to just use one midi channel and let the midi library decide + * We really want to just use one MIDI channel and let the MIDI library decide * that we have multiple synths on the channel with their own split points. - * The lower layer should define the midi channel, split point and transpose + * The lower layer should define the MIDI channel, split point and transpose * of upper layer. */ static int @@ -812,12 +812,12 @@ midiCallback(brightonWindow *win, int controller, int value, float n) * We should accept 0..74 as lower layer and above that as dual * loading requests. */ - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemoryMidiShim(synth, synth->location); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; break; } @@ -1109,7 +1109,7 @@ sidMemory(guiSynth *synth, int fd, int chan, int c, int o, int v) synth->flags &= ~BANK_SELECT; /* - * Doubleclick on load will toggle debugging + * Double-click on load will toggle debugging if (brightonDoubleClick(dc) != 0) bristolMidiSendMsg(fd, synth->sid, 126, 4, 1); */ diff --git a/brighton/brightonSID2.c b/brighton/brightonSID2.c index 0b4adf0..d93b67b 100644 --- a/brighton/brightonSID2.c +++ b/brighton/brightonSID2.c @@ -122,7 +122,7 @@ static int dc, mbh = 0; * also some voice controls I need to add. * * FIX: - * Velocity opion per voice - could be in PolyMods? + * Velocity option per voice - could be in PolyMods? * Keyboard ranging per voice (and arpeggiate?) * Pan - per voice or Mono/All use slightly different positioning +/- * @@ -284,7 +284,7 @@ brightonLocations modwheel[5] = { static brightonLocations locations[DEVICE_COUNT] = { /* - * Three voices with same parameterisation, roughly + * Three voices with same parametrisation, roughly * Tri/Ramp/Square/Noise Buttons * RM/SYNC/Mute/Routing(Multi global) Buttons * PW/Tune/transpose(/Glide?) - Pots @@ -867,7 +867,7 @@ brightonLocations locations[DEVICE_COUNT] = { {"", 2, S2C21, S2R9, VBW1, VBH1, 0, 1, 0, "bitmaps/buttons/sidb.xpm", "bitmaps/buttons/sidbon.xpm", BRIGHTON_CHECKBUTTON}, - /* Midi */ + /* MIDI */ {"", 2, S3C5, S2R2, VBW1, VBH1, 0, 1, 0, "bitmaps/buttons/sidb.xpm", "bitmaps/buttons/sidbon.xpm", BRIGHTON_CHECKBUTTON}, {"", 2, S3C5, S2R3, VBW1, VBH1, 0, 1, 0, "bitmaps/buttons/sidb.xpm", @@ -942,9 +942,9 @@ brightonApp sid2App = { }; /* - * We really want to just use one midi channel and let the midi library decide + * We really want to just use one MIDI channel and let the MIDI library decide * that we have multiple synths on the channel with their own split points. - * The lower layer should define the midi channel, split point and transpose + * The lower layer should define the MIDI channel, split point and transpose * of upper layer. */ static int @@ -974,7 +974,7 @@ sid2KeyCallback(brightonWindow *win, int panel, int index, float value) /* * At this point we have loaded a memory so we need to send those actual new * parameters to the engine. This is an issue for MIDI program load, perhaps - * we should consid2er dual load above memory 74 as per the original? + * we should consider dual load above memory 74 as per the original? * * The path of least resistance here is to scan through the the memory table * incrementing the input selector and delivering the memory value to the @@ -1081,12 +1081,12 @@ midiCallback(brightonWindow *win, int controller, int value, float n) * We should accept 0..74 as lower layer and above that as dual * loading requests. */ - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemoryMidiShim(synth, synth->location); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; break; } @@ -1377,7 +1377,7 @@ sid2Memory(guiSynth *synth, int fd, int chan, int c, int o, int v) } synth->flags &= ~BANK_SELECT; - /* Doubleclick on load will toggle debugging */ + /* Double-click on load will toggle debugging */ if (brightonDoubleClick(dc) != 0) bristolMidiSendMsg(fd, synth->sid2, 126, 4, 1); diff --git a/brighton/brightonSolina.c b/brighton/brightonSolina.c index 2a59c5e..41b85d9 100644 --- a/brighton/brightonSolina.c +++ b/brighton/brightonSolina.c @@ -188,9 +188,9 @@ static brightonLocations options[MOD_COUNT] = { {"Reverb Crossover", 1, oC13, oR1, oW1, oL1, 0, 1, 0, "bitmaps/knobs/sliderred.xpm", 0, 0}, {"Reverb Depth", 1, oC14, oR1, oW1, oL1, 0, 1, 0, "bitmaps/knobs/sliderred.xpm", 0, 0}, - /* Vibrato and tremelo */ - {"Vibraro", 1, oC15, oR1, oW1, oL1, 0, 1, 0, "bitmaps/knobs/sliderred.xpm", 0, 0}, - {"Tremelo", 1, oC16, oR1, oW1, oL1, 0, 1, 0, "bitmaps/knobs/sliderred.xpm", 0, 0}, + /* Vibrato and tremolo */ + {"Vibrato", 1, oC15, oR1, oW1, oL1, 0, 1, 0, "bitmaps/knobs/sliderred.xpm", 0, 0}, + {"Tremolo", 1, oC16, oR1, oW1, oL1, 0, 1, 0, "bitmaps/knobs/sliderred.xpm", 0, 0}, }; #define mR1 200 @@ -248,7 +248,7 @@ brightonLocations mem[MEM_COUNT] = { {"", 2, mC5, mR2, S3, S5, 0, 1, 0, "bitmaps/buttons/solinaOff.xpm", "bitmaps/buttons/solinaOn.xpm", 0}, - /* mem U/D, midi U/D, Load + Save */ + /* mem U/D, MIDI U/D, Load + Save */ {"", 2, mC1, mR3, S4, S6, 0, 1, 0, "bitmaps/buttons/pressoffg.xpm", "bitmaps/buttons/pressong.xpm", BRIGHTON_CHECKBUTTON}, @@ -271,7 +271,7 @@ brightonLocations fx[FX_COUNT] = { /* * Should try and make this one as generic as possible, and try to use it as - * a general memory routine. has Midi u/d, mem u/d, load/save and a display. + * a general memory routine. has MIDI u/d, mem u/d, load/save and a display. */ static int memCallback(brightonWindow* win, int panel, int index, float value) @@ -361,7 +361,7 @@ memCallback(brightonWindow* win, int panel, int index, float value) switch(index) { case 10: /* - * Midi Down + * MIDI Down */ if ((newchan = synth->midichannel - 1) < 0) { @@ -371,7 +371,7 @@ memCallback(brightonWindow* win, int panel, int index, float value) if (global.libtest) { - printf("midi chan %i\n", newchan); + printf("MIDI chan %i\n", newchan); synth->midichannel = newchan; return(0); } @@ -383,7 +383,7 @@ memCallback(brightonWindow* win, int panel, int index, float value) break; case 11: /* - * Midi Up + * MIDI Up */ if ((newchan = synth->midichannel + 1) > 15) { @@ -393,7 +393,7 @@ memCallback(brightonWindow* win, int panel, int index, float value) if (global.libtest) { - printf("midi chan %i\n", newchan); + printf("MIDI chan %i\n", newchan); synth->midichannel = newchan; return(0); } @@ -532,18 +532,18 @@ midiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemory(synth, synth->resources->name, 0, synth->bank + synth->location, synth->mem.active, 0, 0); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; break; } diff --git a/brighton/brightonSonic6.c b/brighton/brightonSonic6.c index a225b5e..a80b3ab 100644 --- a/brighton/brightonSonic6.c +++ b/brighton/brightonSonic6.c @@ -477,18 +477,18 @@ midiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemory(synth, "sonic6", 0, synth->bank + synth->location, synth->mem.active, FIRST_DEV, 0); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; break; } diff --git a/brighton/brightonStratus.c b/brighton/brightonStratus.c index 5347f95..2acf078 100644 --- a/brighton/brightonStratus.c +++ b/brighton/brightonStratus.c @@ -32,7 +32,7 @@ * Fixed Legato waveforms and waveform selection (alternate osc1/osc2). DONE * * Fixed Osc2 trill - Osc-1 trill is a function of joystick plus mod routing, - * Osc-2 trill is a funtion of this button? DONE + * Osc-2 trill is a function of this button? DONE * * Fixed glides DONE * @@ -74,7 +74,7 @@ * * Fix envelope touch sense, emulation touch sense DONE * - * Doublecheck options DONE + * Double-check options DONE * * Fix sync. This could be postponed but can try and look into whether the * noise comes from the syncing waveform or the synced waveform. @@ -593,12 +593,12 @@ stratusMidiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemory(synth, synth->resources->name, 0, synth->bank + synth->location, synth->mem.active, 0, 0); @@ -606,7 +606,7 @@ stratusMidiCallback(brightonWindow *win, int controller, int value, float n) // 0, 0, 0); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; break; } @@ -622,7 +622,7 @@ stratusLoadMemory(guiSynth *synth, int fd, int chan, int c, int o, int v) /* * This is now a shim to map the opts and mods, we have to send the events * twice since these controls are in the basic set and the shadow set since - * the different emulations have the envelope parameters in differents + * the different emulations have the envelope parameters in different * panels. */ event.type = BRISTOL_FLOAT; diff --git a/brighton/brightonTrilogy.c b/brighton/brightonTrilogy.c index e259524..d6efe69 100644 --- a/brighton/brightonTrilogy.c +++ b/brighton/brightonTrilogy.c @@ -21,7 +21,7 @@ /* * This file is just the visible presentation code for the trilogy. The stratus - * was already architected to support the extra parameterisation for the trilogy + * was already architected to support the extra parametrisation for the trilogy * so this just now needed a different layout of a few of the parameters. * * Check String options. diff --git a/brighton/brightonVox.c b/brighton/brightonVox.c index 2454186..0f4d783 100644 --- a/brighton/brightonVox.c +++ b/brighton/brightonVox.c @@ -171,7 +171,7 @@ brightonLocations mem[MEM_COUNT] = { {"", 2, mC5, mR4, S4, S5, 0, 1, 0, "bitmaps/buttons/pressoff.xpm", "bitmaps/buttons/presson.xpm", 0}, - /* mem U/D, midi U/D, Load + Save */ + /* mem U/D, MIDI U/D, Load + Save */ {"", 2, mC11, mR2, S4, S5, 0, 1, 0, "bitmaps/buttons/pressoffg.xpm", "bitmaps/buttons/pressong.xpm", BRIGHTON_CHECKBUTTON}, @@ -196,7 +196,7 @@ brightonLocations mem[MEM_COUNT] = { /* * Should try and make this one as generic as possible, and try to use it as - * a general memory routine. has Midi u/d, mem u/d, load/save and a display. + * a general memory routine. has MIDI u/d, mem u/d, load/save and a display. */ int memCallback(brightonWindow* win, int panel, int index, float value) @@ -212,7 +212,7 @@ memCallback(brightonWindow* win, int panel, int index, float value) /* * We need to convert the index into an offset into the mem structure. - * To do this we make a simple parse of the panels preceeding this panel. + * To do this we make a simple parse of the panels preceding this panel. */ for (i = 0; i < panel; i++) memindex += synth->resources->resources[i].ndevices; @@ -269,7 +269,7 @@ memCallback(brightonWindow* win, int panel, int index, float value) switch(index) { case 10: /* - * Midi Down + * MIDI Down */ if ((newchan = synth->midichannel - 1) < 0) { @@ -287,7 +287,7 @@ memCallback(brightonWindow* win, int panel, int index, float value) break; case 11: /* - * Midi Up + * MIDI Up */ if ((newchan = synth->midichannel + 1) > 15) { @@ -476,18 +476,18 @@ midiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemory(synth, synth->resources->name, 0, synth->bank + synth->location, synth->mem.active, FIRST_DEV, 0); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; break; } diff --git a/brighton/brightonVoxM2.c b/brighton/brightonVoxM2.c index 0f4fe5b..1acdf77 100644 --- a/brighton/brightonVoxM2.c +++ b/brighton/brightonVoxM2.c @@ -327,7 +327,7 @@ memCallback(brightonWindow* win, int panel, int index, float value) /* * Is this one of the presets? * - * We should consider making these require a doubleclick also. + * We should consider making these require a double-click also. */ if (index >= MEM_START) { @@ -601,12 +601,12 @@ midiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); -/* printf("midi callback: %x, %i\n", controller, value); */ +/* printf("MIDI callback: %x, %i\n", controller, value); */ switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemory(synth, synth->resources->name, 0, synth->bank + synth->location, @@ -616,7 +616,7 @@ midiCallback(brightonWindow *win, int controller, int value, float n) break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value * 10; break; } @@ -778,7 +778,7 @@ voxM2Option(guiSynth *synth, int fd, int chan, int cont, int op, int value) return; case 27: /* - * The next 4 are percusive controls. We have to see if they are + * The next 4 are percussive controls. We have to see if they are * active and get their values before we send the requests. * * We have short/long/soft/loud @@ -1048,7 +1048,7 @@ voxM2Init(brightonWindow* win) synth->dispatch[MOD_START + 19].controller = 2; synth->dispatch[MOD_START + 19].operator = 0; synth->dispatch[MOD_START + 19].routine = (synthRoutine) voxM2Bass; - /* Bass sustain (actualy env release). */ + /* Bass sustain (actually env release). */ synth->dispatch[MOD_START + 20].controller = 3; synth->dispatch[MOD_START + 20].operator = 3; diff --git a/brighton/brightonVoyager.c b/brighton/brightonVoyager.c index 68c016e..6874f71 100644 --- a/brighton/brightonVoyager.c +++ b/brighton/brightonVoyager.c @@ -269,7 +269,7 @@ brightonApp voyagerApp = { "voyager", 0, /* no blueprint on wood background. */ "bitmaps/textures/voyagerpaint.xpm", - 0, /* or BRIGHTON_STRETCH, default is tesselate */ + 0, /* or BRIGHTON_STRETCH, default is tessellate */ explorerInit, voyagerConfigure, /* 3 callbacks, unused? */ midiCallback, @@ -360,18 +360,18 @@ midiCallback(brightonWindow *win, int controller, int value, float n) { guiSynth *synth = findSynth(global.synths, win); - printf("midi callback: %x, %i\n", controller, value); + printf("MIDI callback: %x, %i\n", controller, value); switch(controller) { case MIDI_PROGRAM: - printf("midi program: %x, %i\n", controller, value); + printf("MIDI program: %x, %i\n", controller, value); synth->location = value; loadMemory(synth, "explorer", 0, synth->bank + synth->location, synth->mem.active, FIRST_DEV, 0); break; case MIDI_BANK_SELECT: - printf("midi banksel: %x, %i\n", controller, value); + printf("MIDI banksel: %x, %i\n", controller, value); synth->bank = value; break; } diff --git a/brighton/brightonhelp.h b/brighton/brightonhelp.h index 709a76f..3c33c47 100644 --- a/brighton/brightonhelp.h +++ b/brighton/brightonhelp.h @@ -28,48 +28,48 @@ char *helptext = "\nA synthesiser emulation package.\n\ \n\ Emulation:\n\ \n\ - -mini - moog mini\n\ - -explorer - moog voyager\n\ - -voyager - moog voyager electric blue\n\ - -memory - moog memory\n\ - -sonic6 - moog sonic 6\n\ - -mg1 - moog/realistic mg-1 concertmate\n\ - -hammond - hammond module (deprecated, use -b3)\n\ - -b3 - hammond B3 (default)\n\ - -prophet - sequential circuits prophet-5\n\ - -pro52 - sequential circuits prophet-5/fx\n\ - -pro10 - sequential circuits prophet-10\n\ - -pro1 - sequential circuits pro-one\n\ - -rhodes - fender rhodes mark-I stage 73\n\ - -rhodesbass - fender rhodes bass piano\n\ - -roadrunner - crumar roadrunner electric piano\n\ - -bitone - crumar bit 01\n\ - -bit99 - crumar bit 99\n\ - -bit100 - crumar bit + mods\n\ - -stratus - crumar stratus synth/organ combo\n\ - -trilogy - crumar trilogy synth/organ/string combo\n\ - -obx - oberheim OB-X\n\ - -obxa - oberheim OB-Xa\n\ - -axxe - arp axxe\n\ - -odyssey - arp odyssey\n\ - -arp2600 - arp 2600\n\ - -solina - arp/solina string ensemble\n\ - -polysix - korg polysix\n\ - -poly800 - korg poly-800\n\ - -monopoly - korg mono/poly\n\ - -ms20 - korg ms20 (unfinished: -libtest only)\n\ - -vox - vox continental\n\ - -voxM2 - vox continental super/300/II\n\ - -juno - roland juno-60\n\ - -jupiter - roland jupiter-8\n\ - -bme700 - baumann bme-700\n\ - -bm - bristol bassmaker sequencer\n\ - -dx - yamaha dx-7\n\ - -cs80 - yamaha cs-80 (unfinished)\n\ - -sidney - commodore-64 SID chip synth\n\ - -melbourne - commodore-64 SID polyphonic synth (unfinished)\n\ - -granular - granular synthesiser (unfinished)\n\ - -aks - ems synthi-a (unfinished)\n\ + -mini - Moog Mini\n\ + -explorer - Moog Voyager\n\ + -voyager - Moog Voyager Electric Blue\n\ + -memory - Moog Memory\n\ + -sonic6 - Moog Sonic 6\n\ + -mg1 - Moog/Realistic MG-1 Concertmate\n\ + -hammond - Hammond module (deprecated, use -b3)\n\ + -b3 - Hammond B3 (default)\n\ + -prophet - Sequential Circuits Prophet-5\n\ + -pro52 - Sequential Circuits Prophet-5/FX\n\ + -pro10 - Sequential Circuits Prophet-10\n\ + -pro1 - Sequential Circuits pro-one\n\ + -rhodes - Fender Rhodes Mark-I Stage 73\n\ + -rhodesbass - Fender Rhodes Piano Bass\n\ + -roadrunner - Crumar Roadrunner electric piano\n\ + -bitone - Crumar bit 01\n\ + -bit99 - Crumar bit 99\n\ + -bit100 - Crumar bit + mods\n\ + -stratus - Crumar Stratus synth/organ combo\n\ + -trilogy - Crumar Trilogy synth/organ/string combo\n\ + -obx - Oberheim OB-X\n\ + -obxa - Oberheim OB-Xa\n\ + -axxe - ARP Axxe\n\ + -odyssey - ARP Odyssey\n\ + -arp2600 - ARP 2600\n\ + -solina - ARP/Solina String Ensemble\n\ + -polysix - Korg Polysix\n\ + -poly800 - Korg Poly-800\n\ + -monopoly - Korg Mono/Poly\n\ + -ms20 - Korg MS-20 (unfinished: -libtest only)\n\ + -vox - Vox Continental\n\ + -voxM2 - Vox Continental Super/300/II\n\ + -juno - Roland Juno-60\n\ + -jupiter - Roland Jupiter-8\n\ + -bme700 - Baumann BME-700\n\ + -bm - Bristol bassmaker sequencer\n\ + -dx - Yamaha DX7\n\ + -cs80 - Yamaha CS-80 (unfinished)\n\ + -sidney - Commodore-64 SID chip synth\n\ + -melbourne - Commodore-64 SID polyphonic synth (unfinished)\n\ + -granular - Granular synthesiser (unfinished)\n\ + -aks - EMS Synthi A (unfinished)\n\ -mixer - 16 track mixer (unfinished: -libtest only)\n\ \n\ Synthesiser:\n\ @@ -81,7 +81,7 @@ char *helptext = "\nA synthesiser emulation package.\n\ -nnp - no/last note preference (-mono)\n\ -retrig - monophonic note logic legato trigger (-mono)\n\ -lvel - monophonic note logic legato velocity (-mono)\n\ - -channel - initial midi channel selected to 'c' (default 1)\n\ + -channel - initial MIDI channel selected to 'c' (default 1)\n\ -lowkey - minimum MIDI note response (0)\n\ -highkey - maximum MIDI note response (127)\n\ -detune <%> - 'temperature sensitivity' of emulation (0)\n\ @@ -90,13 +90,13 @@ char *helptext = "\nA synthesiser emulation package.\n\ -velocity - MIDI velocity mapping curve (510) (-mvc)\n\ -glide - MIDI glide duration (5)\n\ -emulate - search for the named synth or exit\n\ - -register - name used for jack and alsa device regisration\n\ + -register - name used for JACK and ALSA device registration\n\ -lwf - emulator lightweight filters\n\ -nwf - emulator default filters\n\ -wwf - emulator welterweight filters\n\ -hwf - emulator heavyweight filters\n\ -blo - maximum # band limited harmonics (31)\n\ - -blofraction - band limiting nyquist fraction (0.8)\n\ + -blofraction - band limiting Nyquist fraction (0.8)\n\ -scala - read the scala .scl tonal mapping table\n\ \n\ User Interface:\n\ @@ -122,14 +122,14 @@ char *helptext = "\nA synthesiser emulation package.\n\ -mbi - master bank index (0)\n\ -activesense - active sense rate (2000 ms)\n\ -ast - active sense timeout (15000 ms)\n\ - -mct - midi cycle timeout (50 ms)\n\ + -mct - MIDI cycle timeout (50 ms)\n\ -ar|-aspect - ignore emulator requested aspect ratio\n\ -iconify - start with iconified window\n\ - -window - toggle switch to enable X11 window interfacen\n\ + -window - toggle switch to enable X11 window interface\n\ -cli - enable command line interface\n\ -libtest - gui test option, engine not invoked\n\ \n\ - Gui keyboard shortcuts:\n\ + GUI keyboard shortcuts:\n\ \n\ 's' - save settings to current memory\n\ 'l' - (re)load current memory\n\ @@ -160,8 +160,8 @@ char *helptext = "\nA synthesiser emulation package.\n\ \n\ -engine - don't start engine (connect to existing engine)\n\ -gui - don't start gui (only start engine)\n\ - -server - run engine as a permanant server\n\ - -daemon - run engine as a detached permanant server\n\ + -server - run engine as a permanent server\n\ + -daemon - run engine as a detached permanent server\n\ -watchdog - audio thread initialisation timeout (30s)\n\ -log - redirect diagnostic to $HOME/.bristol/log\n\ -syslog - redirect diagnostic to syslog\n\ @@ -172,7 +172,7 @@ char *helptext = "\nA synthesiser emulation package.\n\ -kill <-emu> - terminate all bristol processes emulating -emu\n\ -cache - memory and profile cache location (~/.bristol)\n\ -memdump - copy full set of memories to , with -emulate\n\ - -debug <1-16> - debuging level (0)\n\ + -debug <1-16> - debugging level (0)\n\ -readme [-] - show readme [for emulator ] to console\n\ -glwf - global lightweight filters - no overrides\n\ -host - connect to engine on host 'h' (localhost)\n\ @@ -181,14 +181,14 @@ char *helptext = "\nA synthesiser emulation package.\n\ -gmc - open a MIDI connection to the brighton GUI\n\ -oss - use OSS defaults for audio and MIDI\n\ -alsa - use ALSA defaults for audio and MIDI (default)\n\ - -jack - use Jack defaults for audio and MIDI\n\ + -jack - use JACK defaults for audio and MIDI\n\ -jackstats - avoid use of bristoljackstats\n\ - -jsmuuid - jack session unique identifier\n\ - -jsmfile - jack session setting path\n\ - -jsmd - jack session file load delay (5000)\n\ + -jsmuuid - JACK session unique identifier\n\ + -jsmfile - JACK session setting path\n\ + -jsmd - JACK session file load delay (5000)\n\ -sleep - delay init for 'n' seconds (jsm patch)\n\ -session - disable session management\n\ - -jdo - use separate Jack clients for audio and MIDI\n\ + -jdo - use separate JACK clients for audio and MIDI\n\ -osc - use OSC for control interface (unfinished)\n\ -forward - disable MIDI event forwarding globally\n\ -localforward - disable emulator gui->engine event forwarding\n\ @@ -209,19 +209,19 @@ char *helptext = "\nA synthesiser emulation package.\n\ -preload - configure preload buffer count (default 4)\n\ -rate - sample rate (44100)\n\ -priority

- audio RT priority, 0=no realtime (75)\n\ - -autoconn - attempt jack port auto-connect\n\ + -autoconn - attempt JACK port auto-connect\n\ -multi - register 'c' IO channels (jack only)\n\ -migc - multi IO input gain scaling (jack only)\n\ -mogc - multi IO output gain scaling (jack only)\n\ \n\ - Midi driver:\n\ + MIDI driver:\n\ \n\ - -midi [oss|[raw]alsa|jack] - midi driver selection (alsa)\n\ - -mididev - midi device selection\n\ + -midi [oss|[raw]alsa|jack] - MIDI driver selection (alsa)\n\ + -mididev - MIDI device selection\n\ -seq - use the ALSA SEQ interface (default)\n\ - -mididbg - midi debug-1 enable\n\ - -mididbg2 - midi debug-2 enable\n\ - -sysid - MIDI SYSEX system identifier\n\ + -mididbg - MIDI debug-1 enable\n\ + -mididbg2 - MIDI debug-2 enable\n\ + -sysid - MIDI SysEx system identifier\n\ \n\ LADI driver (level 1 compliant):\n\ \n\ @@ -229,7 +229,7 @@ char *helptext = "\nA synthesiser emulation package.\n\ -ladi bristol - only execute LADI in engine\n\ -ladi - LADI state memory index (1024)\n\ \n\ - Audio drivers are PCM/PCM_plug or Jack. Midi drivers are either OSS/ALSA\n\ + Audio drivers are PCM/PCM_plug or JACK. MIDI drivers are either OSS/ALSA\n\ rawmidi interface, or ALSA SEQ. Multiple GUIs can connect to the single\n\ audio engine which then operates multitimbrally.\n\ \n\ @@ -250,36 +250,36 @@ char *helptext = "\nA synthesiser emulation package.\n\ \n\ startBristol -mini\n\ \n\ - Run a minimoog using ALSA interface for audio and midi seq. This is\n\ + Run a Minimoog using ALSA interface for audio and MIDI seq. This is\n\ equivalent to all the following options:\n\ -mini -alsa -audiodev plughw:0,0 -midi seq -count 256 -preload 8 \n\ -port 5028 -voices 32 -channel 1 -rate 44100 -gain 4 -ingain 4\n\ \n\ startBristol -alsa -mini\n\ \n\ - Run a minimoog using ALSA interface for audio and midi. This is\n\ + Run a Minimoog using ALSA interface for audio and MIDI. This is\n\ equivalent to all the following options:\n\ -mini -audio alsa -audiodev plughw:0,0 -midi alsa -mididev hw:0\n\ -count 256 -preload 8 -port 5028 -voices 32 -channel 1 -rate 44100\n\ \n\ startBristol -explorer -voices 1 -oss\n\ \n\ - Run a moog explorer as a monophonic instrument, using OSS interface for\n\ - audio and midi.\n\ + Run a Moog Explorer as a monophonic instrument, using OSS interface for\n\ + audio and MIDI.\n\ \n\ startBristol -prophet -channel 3\n\ \n\ - Run a prophet-5 using ALSA for audio and midi on channel 3.\n\ + Run a Prophet-5 using ALSA for audio and MIDI on channel 3.\n\ \n\ startBristol -b3 -count 512 -preload 2\n\ \n\ - Run a hammond b3 with a buffer size of 512 samples, and preload two \n\ + Run a Hammond B3 with a buffer size of 512 samples, and preload two \n\ such buffers before going active. Some Live! cards need this larger\n\ buffer size with ALSA drivers.\n\ \n\ startBristol -oss -audiodev /dev/dsp1 -vox -voices 8\n\ \n\ - Run a vox continental using OSS device 1, and default midi device\n\ + Run a Vox Continental using OSS device 1, and default MIDI device\n\ /dev/midi0. Operate with just 8 voices.\n\ \n\ startBristol -b3 -audio alsa -audiodev plughw:0,0 -seq -mididev 128.0\n\ @@ -290,16 +290,16 @@ char *helptext = "\nA synthesiser emulation package.\n\ startBristol -juno &\n\ startBristol -prophet -channel 2 -engine\n\ \n\ - Start two synthesisers, a juno and a prophet. Both synthesisers will\n\ + Start two synthesisers, a Juno and a Prophet. Both synthesisers \n\ will be executed on one engine (multitimbral) with 32 voices between \n\ - them. The juno will be on default midi channel (1), and the prophet on\n\ + them. The Juno will be on default MIDI channel (1), and the Prophet on\n\ channel 2. Output over the same default ALSA audio device.\n\ \n\ startBristol -juno &\n\ startBristol -port 5029 -audio oss -audiodev /dev/dsp1 -mididev /dev/midi1\n\ \n\ - Start two synthesisers, a juno on the first ALSA soundcard, and a\n\ - mini on the second OSS soundcard. Each synth is totally independent\n\ + Start two synthesisers, a Juno on the first ALSA soundcard, and a\n\ + Minimoog on the second OSS soundcard. Each synth is totally independent\n\ and runs with 32 voice polyphony (looks nice, not been tested).\n\ \n\ The location of the bristol binaries can be specified in the BRISTOL\n\ @@ -498,4 +498,3 @@ bm \ dx \ sidney \ "; - diff --git a/brighton/brightonreadme.h b/brighton/brightonreadme.h index c0f135d..9d9aa02 100644 --- a/brighton/brightonreadme.h +++ b/brighton/brightonreadme.h @@ -40,7 +40,7 @@ synth, is common to all the emulations. The filter implements a few different \n algorithms and these do separate each of the synths: the Explorer layering\n\ two low pass filters on top of each other: the OB-Xa using different types\n\ depending on 'Pole' selection. Since release 0.20.8 the emulator has had a\n\ -Houvillainen non-linear ladder filter integrated which massively improves \n\ +Huovilainen non-linear ladder filter integrated which massively improves \n\ the quality at considerable expense to the CPU.\n\ There is one further filter algorithm used solely for the Leslie rotary \n\ emulator crossover, this is a butterworth type filter.\n\ @@ -52,7 +52,7 @@ original instrument, and the author maintains that if you want the original\n\ sound then you are advised to seek out the original product. Alternatively a\n\ number of the original manufacturers now provide their own vintage collections\n\ which are anticipated to be more authentic. All names and trademarks used by\n\ -Bristol are ownership of the respective companies and it is not inteded to \n\ +Bristol are ownership of the respective companies and it is not intended to \n\ misappropriate their use here. If you have concerns you are kindly requested\n\ to contact the author.\n\ \n\ @@ -66,7 +66,7 @@ really want to know about the synths that are not in this document then you\n\ might want to search for their owners manuals.\n\ \n\ All emulations are available from the same engine, just launch multiple GUIs\n\ -and adjust the midi channels for multi timbrality and layering.\n\ +and adjust the MIDI channels for multitimbrality and layering.\n\ \n\ It is noted here that the engine is relatively 'dumb'. Ok, it generates a very\n\ broad range of sounds, currently about 25 different synthesisers and organs,\n\ @@ -76,7 +76,7 @@ calls a memory routine that configures all the GUI controllers and a side effect of setting the controllers is that their values are sent to the engine. This is\n\ arguably the correct model but it can affect the use of MIDI master keyboards.\n\ The reason is that the GUI is really just a master keyboard for the engine and\n\ -drives it with MIDI SYSEX messages over TCP sessions. If you were to alter the\n\ +drives it with MIDI SysEx messages over TCP sessions. If you were to alter the\n\ keyboard transpose, for example, this would result in the GUI sending different\n\ 'key' numbers to the engine when you press a note. If you were already driving\n\ the synth from a master keyboard then the transpose button in the Brighton GUI\n\ @@ -119,7 +119,7 @@ Popular as it was about the first non-modular synthesiser, built as a fixed\n\ configuration of the racked or modular predecessors.\n\ \n\ Best known at the time on Pink Floyd 'Dark Side of the Moon' and other albums.\n\ -Rick Wakefield used it as did Jean Michel Jarre. Wakefield could actually\n\ +Rick Wakefield used it as did Jean-Michel Jarre. Wakefield could actually\n\ predict the sound it would make by just looking at the settings, nice to be\n\ able to do if a little unproductive but it went to show how this was treated\n\ as an instrument in its own right. It takes a bit of work to get the same sweet,\n\ @@ -222,10 +222,10 @@ Contour:\n\ \n\ Improvements to the Mini would be some better oscillator waveforms, plus an\n\ alternative filter as this is a relatively simple synthesiser and could do\n\ -with a warmer filter (this was fixed with integration of the houvillanen filters\n\ +with a warmer filter (this was fixed with integration of the Huovilainen filters\n\ although the do consume a lot of CPU to do it).\n\ \n\ -The Output selection has a Midi channel up/down selector and memory selector.\n\ +The Output selection has a MIDI channel up/down selector and memory selector.\n\ To read a memory either use the up/down arrows to go to the next available\n\ memory, or type in a 3 digit number on the telephone keypad and press 'L' for\n\ load or 'S' for save.\n\ @@ -290,7 +290,7 @@ Sequential circuits released amongst the first truly polyphonic synthesisers\n\ where a group of voice circuits (5 in this case) were linked to an onboard\n\ computer that gave the same parameters to each voice and drove the notes to\n\ each voice from the keyboard. The device had some limited memories to allow \n\ -for real live stage work. The synth was amazingly flexible regaring the\n\ +for real live stage work. The synth was amazingly flexible regarding the\n\ oscillator options and modulation routing, producing some of the fattest \n\ sounds around. They also had some of the fattest pricing as well, putting it\n\ out of reach of all but the select few, something that maintained its mythical\n\ @@ -474,7 +474,7 @@ that would not be difficult to implement.\n\ The addition of triangle of other complex waveforms could be a fun development\n\ effort (if anyone were to want to do it).\n\ \n\ -The DX still has a prependancy to seg fault, especially when large gains are\n\ +The DX still has a prependency to segfault, especially when large gains are\n\ applied to input signals. This is due to loose bounds checking that will be\n\ extended in a present release.\n\ \n", @@ -527,7 +527,7 @@ DCO:\n\ ENV/LFO/MANUAL: Modulator for PWM\n\ \n\ Waveform:\n\ - Pulse or Ramp wave. Pulse has PWM capabily.\n\ + Pulse or Ramp wave. Pulse has PWM capability.\n\ \n\ Sub oscillator:\n\ On/Off first fundamental square wave.\n\ @@ -717,11 +717,11 @@ the memory section plus a panel that can modify any of the synth parameters as\n a real time control. Press the first mouse key here and move the mouse around\n\ to adjust the controls. Default values are LFO frequency and filter cutoff \n\ but values can be changed with the 'panel' button. This is done by selecting\n\ -'panel' rather than 'midi', and then using the up/down keys to select parameter\n\ +'panel' rather than 'MIDI', and then using the up/down keys to select parameter\n\ that will be affected by the x and y motion of the mouse. At the moment the\n\ mod routing from the pad controller is not saved to the memories, and it will\n\ remain so since the pad controller is not exactly omnipresent on MIDI master\n\ -keyboards - the capabilities was put into the GIU to be 'exact' to the design.\n\ +keyboards - the capabilities was put into the GUI to be 'exact' to the design.\n\ \n\ This synth is amazingly flexible and difficult to advise on its best use. Try\n\ starting by mixing just oscillator 1 through to the filter, working on mod \n\ @@ -739,8 +739,8 @@ will show whether it is is free (FRE) or programmed already (PRG).\n\ \n\ The author first implemented the Hammond module, then extended it to the B3\n\ emulation. Users of this are too numerous to mention and the organ is still\n\ -popular. Jimmy Smith, Screaming Jay Hawkins, Kieth Emerson, Doors and \n\ -almost all american gospel blues. Smith was profuse, using the instrument for\n\ +popular. Jimmy Smith, Screaming Jay Hawkins, Keith Emerson, Doors and \n\ +almost all American gospel blues. Smith was profuse, using the instrument for\n\ a jazz audience, even using its defects (key noise) to great effect. Emerson\n\ had two on stage, one to play and another to kick around, even including\n\ stabbing the keyboard with a knife to force keylock during performances\n\ @@ -764,7 +764,7 @@ fared only a little better than that. The age of the Hammond organ had arrived.\ \n\ The company had a love/hate relationship with the Leslie speaker company - the\n\ latter making money by selling their rotary speakers along with the organ to\n\ -wide acceptance. The fat hammond 'chorus' was a failed attempt to distance\n\ +wide acceptance. The fat Hammond 'chorus' was a failed attempt to distance\n\ themselves from Leslie. That was never achieved due to the acceptance of the\n\ Leslie, but the chorus did add another unique sound to the already awesome\n\ instrument. The rotary speaker itself still added an extra something to the\n\ @@ -774,7 +774,7 @@ range of operating modes most of which are included in this emulator.\n\ The chorus emulation is an 8 stage phase shifting filter algorithm with a \n\ linear rotor between the taps.\n\ \n\ -Parameterisation of the first B3 window follows the original design:\n\ +Parametrisation of the first B3 window follows the original design:\n\ \n\ Leslie: Rotary speaker on/off\n\ Reverb: Reverb on/off\n\ @@ -1027,14 +1027,14 @@ wearing gloves to quite good effect. After that The Specials began the Mod/Ska\n revival using one. The sharp and strong harmonic content has the ability to\n\ cut into a mix and make its presence known.\n\ \n\ -The organ was a british design, eventually sold (to Crumar?) and made into a\n\ +The organ was a British design, eventually sold (to Crumar?) and made into a\n\ number of plastic alternatives. Compared to the Hammond this was a fully \n\ electronic instrument, no moving parts, and much simpler. It had a very\n\ characteristic sound though, sharper and perhaps thinner but was far cheaper\n\ than its larger cousin. It used a master oscillator that was divided down to\n\ each harmonic for each key (as did the later Hammonds for price reasons). This\n\ oscillator division design was used in the first of the polyphonic synthesisers\n\ -where the divided note was fead through individual envelope generators and\n\ +where the divided note was fed through individual envelope generators and\n\ a shared or individual filter (Polymoog et al).\n\ \n\ The Vox is also a drawbar instrument, but far simplified compared to the\n\ @@ -1099,7 +1099,7 @@ were not big sellers, they were temperamental and liable to be temperature \n\ sensitive due to the amount of electronics hidden away inside. The original\n\ layering and 'unison' allowed the original to function as two independent\n\ synths, a pair of layered synths (both keyboards then played the same sound),\n\ -as a monophonic synth in 'unison' mode on one keybaord with a second polyphonic\n\ +as a monophonic synth in 'unison' mode on one keyboard with a second polyphonic\n\ unit on the other, or even all 10 voices on a single keyed note for a humongous\n\ 20 oscillator monophonic monster.\n\ \n\ @@ -1204,7 +1204,7 @@ Oscillators:\n\ \n\ ** If no waveform is selected then a triangle is generated.\n\ \n\ - *** The original synth had Osc-2 crossmodifying Osc-1, this is not totally\n\ + *** The original synth had Osc-2 cross-modifying Osc-1, this is not totally\n\ feasible with the sync options as they are not mutually exclusive here.\n\ Cross modulation is noisy if the source or dest wave is pulse, something\n\ that may be fixed in a future release.\n\ @@ -1263,7 +1263,7 @@ me know.\n\ \n\ This is almost two OB-X in a single unit. With one keyboard they could provide\n\ the same sounds but with added voicing for split/layers/poly options. The OB-Xa\n\ -did at least work with all 10 voices, had a single keyboard, and is renound for\n\ +did at least work with all 10 voices, had a single keyboard, and is renown for\n\ the sounds of van Halen 'Jump' and Stranglers 'Strange Little Girl'. The sound\n\ had the capability to cut through a mix to upstage even guitar solo's. Oberheim\n\ went on to make the most over the top analogue synths before the cut price\n\ @@ -1306,7 +1306,7 @@ Modulation:\n\ PWM: Amount of LFO going to:\n\ PWM Osc-1\n\ PWM Osc-2\n\ - Tremelo\n\ + Tremolo\n\ \n\ Oscillators:\n\ \n\ @@ -1425,7 +1425,7 @@ The chord memory is similar to the Unison mode except that Unison plays all\n\ voices with the same note. Chording will assign one voice to each notes in\n\ the chord for a richer sound. To enable Chording press the 'Hold' button. This\n\ is not the same as the original since it used the hold button as a sustain\n\ -option however that does not function well with a Gui and so it was reused.\n\ +option however that does not function well with a GUI and so it was reused.\n\ \n\ To reprogram the Chord memory do the following: press the PRG button then the\n\ Hold button. You can then press the keys, up to 8, that you want in the chord,\n\ @@ -1487,7 +1487,7 @@ configure all the oscillators/filters/envelopes. The synth stages do follow the\ typical synth design, there are modulation controllers and an FX section\n\ feeding into the oscillators and filter. The effects section is a set of\n\ controllers that can be configured and then enabled/disabled with a button\n\ -press. The overall layout is rather kludgy, with some controllers that are\n\ +press. The overall layout is rather kludgey, with some controllers that are\n\ typically grouped being dispersed over the control panel.\n\ \n\ Control:\n\ @@ -1495,7 +1495,7 @@ Control:\n\ Volume\n\ \n\ Arpeg:\n\ - Whether arpegiator steps up, down, or down then up. This works in\n\ + Whether arpeggiator steps up, down, or down then up. This works in\n\ conjunction with the 'Hold' mode described later.\n\ \n\ Glide: glissando note to note. Does not operate in all modes\n\ @@ -1568,14 +1568,14 @@ Mode:\n\ Mono: First 4 keypresses are memorised, further notes are then chorded\n\ together monophonically.\n\ Poly:\n\ - Notes are argeggiated in sequence, new note presses are appended\n\ + Notes are arpeggiated in sequence, new note presses are appended\n\ to the chain. Arpeggiation is up, down or up/down.\n\ Share:\n\ - First 4 notes are memorised and are then argeggiated in sequence,\n\ + First 4 notes are memorised and are then arpeggiated in sequence,\n\ new note presses will transpose the arpeggiation. Stepping is up,\n\ down or up/down.\n\ \n\ - There are several controllers that affect arpeggation:\n\ + There are several controllers that affect arpeggiation:\n\ \n\ Arpeg - direction of stepping\n\ MG-2 - Frequency of steps from about 10 seconds down to 50 bps.\n\ @@ -1584,7 +1584,7 @@ Mode:\n\ Effects:\n\ \n\ There are three main effects, or perhaps rather modulations, that are\n\ - controlled in this section. These are vibrato, crossmodulated frequency\n\ + controlled in this section. These are vibrato, cross-modulated frequency\n\ and oscillator synchronisation. The application of each mod is configured\n\ with the controllers and then all of them can be enabled/disabled with\n\ the 'Effects' button. This allows for big differences in sound to be \n\ @@ -1595,13 +1595,13 @@ Effects:\n\ be changed afterwards for Effects/Poly for example, and they work with the\n\ arpeggiation function.\n\ \n\ - X-Mod: frequency crossmodulation between oscillators\n\ - Freq: frequency modulation by MG-1 (vibrato) or Envlope (sweep)\n\ + X-Mod: frequency cross-modulation between oscillators\n\ + Freq: frequency modulation by MG-1 (vibrato) or Envelope (sweep)\n\ \n\ Mode:\n\ Syn: Oscillators are synchronised\n\ - X-M: Oscillators are crossmodulated\n\ - S-X: Oscillators are crossmodulated and synchronised\n\ + X-M: Oscillators are cross-modulated\n\ + S-X: Oscillators are cross-modulated and synchronised\n\ \n\ SNG:\n\ Single mode: synth had a master oscillator (1) and three slaves (2/3/4)\n\ @@ -1686,7 +1686,7 @@ different Slave modes. This is the first and probably the only bristol synth tha will have an inbuilt arpeggiator. The feature was possible here due to the mono\n\ synth specification, and whilst it could be built into the MIDI library for\n\ general use it is left up to the MIDI sequencers (that largely came along to \n\ -replace the 1980s arpeggiators anyway) that are generally availlable on Linux.\n\ +replace the 1980s arpeggiators anyway) that are generally available on Linux.\n\ [Other instruments emulated by bristol that also included arpeggiation but do\n\ not have in the emulation were the Juno-6, Prophet-10, Oberheim OB-Xa, Poly6].\n\ \n\ @@ -1701,7 +1701,7 @@ assignment may be wrong.\n\ Korg in no way endorses this emulation of their classic synthesiser and have\n\ their own emulation product that gives the features offered here. Korg,\n\ Mono/Poly, Poly-6, MS-20, Vox and Continental are all registered names or\n\ -trademarks of Korg Inc of Japan.\n\ +trademarks of Korg Inc. of Japan.\n\ \n\ Quite a few liberties were taken with this synth. There were extremely few \n\ differences between the original and the Roland Juno 6, they both had one osc \n\ @@ -1808,7 +1808,7 @@ different. The emulation does not have an arpeggiator. \n\ VCA: \n\ \n\ Env: When on, this causes the Amplitude envelope to affect the sound.\n\ - I.E, If you have a long attack time, you get a long attack time. \n\ + i.e., If you have a long attack time, you get a long attack time. \n\ Gate: When on, this causes the Amplitude envelope only (not the filter\n\ envelope) to be be bypassed. \n\ Gain: Gain of signal. \n\ @@ -1822,12 +1822,12 @@ different. The emulation does not have an arpeggiator. \n\ \n\ Intensity: How much the effects affect the output. \n\ \n\ -There are some mildly anomolous effects possible from the MG section, especially\n\ +There are some mildly anomalous effects possible from the MG section, especially\n\ with the VCA. The MG and the env are summed into the VCA which means if the env\n\ decays to zero then the LFO may end up pumping the volume, something that may\n\ be unexpected. Similarly, if the LFO is pumping and the voice finally stops its\n\ cycle then the closing gate may cause a pop on the MG signal. These can be \n\ -resolved however the current behavious is probably close to the original.\n\ +resolved however the current behaviour is probably close to the original.\n\ \n\ Bristol thanks Andrew Coughlan for patches, bug reports, this manual page and\n\ diverse suggestions to help improve the application.\n\ @@ -1835,7 +1835,7 @@ diverse suggestions to help improve the application.\n\ Korg in no way endorses this emulation of their classic synthesiser and have \n\ their own emulation product that gives the features offered here. Korg, \n\ Mono/Poly, Poly-6, MS-20, Vox and Continental are all registered names or \n\ -trademarks of Korg Inc of Japan.\n\ +trademarks of Korg Inc. of Japan.\n\ \n", " ARP AXXE\n\ @@ -1873,7 +1873,7 @@ TBD.\n\ This is actually a lot warmer than the Mini emulator, largely due to being\n\ later code. The mini should be revisited but I am saving that pleasure for when\n\ some more filters are available. [This was done during the 0.20 stream using the\n\ -Houvilainen filters and bandwidth limited oscillators to produce a far richer\n\ +Huovilainen filters and bandwidth limited oscillators to produce a far richer\n\ sound. Also incorporate a number of fixes to the emulation stages.].\n\ \n", @@ -1902,7 +1902,7 @@ can be repatched into any of the 50 or so inputs. Patches cause no overhead in\n the engine as it uses default buffering when not repatched, so feel free to put\n\ in as many cables as you can fit. Patches in the GUI still demand a lot of CPU\n\ cycles. Release -77 improved this about 5-fold and further improvements are in\n\ -the pipeline: the 0.10 stream implemented color caching and XImage graphics\n\ +the pipeline: the 0.10 stream implemented colour caching and XImage graphics\n\ interface which massively improved GUI performance.\n\ \n", @@ -2012,14 +2012,14 @@ from the poly section. This is a minor issue as the poly oscillator can be\n\ zeroed out in the mixer.\n\ \n\ It is noted here that this emulation is just a freebie, the interface is kept\n\ -simple with no midi channel selection (start it with the -channel option and\n\ +simple with no MIDI channel selection (start it with the -channel option and\n\ it stays there) and no real memories (start it with the -load option and it\n\ will stay on that memory location). There is an extra button on the front\n\ panel (a mod?) and pressing it will save the current settings for next time\n\ it is started. I could have done more, and will if people are interested, but\n\ I built it since the current developments were a granular synth and it was\n\ hard work getting my head around the grain/wave manipulations, so to give \n\ -myself a rest I put this together one weekend. The Rhodesbass and ARP AXXE\n\ +myself a rest I put this together one weekend. The Rhodesbass and ARP Axxe\n\ were done for similar reasons. I considered adding another mod button, to make\n\ the mono section also truly polyphonic but that kind of detracts from the\n\ original. Perhaps I should put together a Polymoog sometime that did kind of\n\ @@ -2027,7 +2027,7 @@ work like that anyway.\n\ \n\ This was perhaps a strange choice, however I like the way it highlights the\n\ difference between monophonic, polyphonic and 'neopolyphonic' synthesised\n\ -organs (such as the polymoog). Its a fun synth as well, few people are likely\n\ +organs (such as the Polymoog). Its a fun synth as well, few people are likely\n\ to every bother buying one as they cost more now than when they were produced\n\ due to being collectable: for the few hundred dollars they would set you back\n\ on eBay you can get a respectable polyphonic unit.\n\ @@ -2070,7 +2070,7 @@ the feature.\n\ The lower manual responds to the MIDI channel on which the emulation was \n\ started. The upper manual responds to notes greater than MIDI key 48 on the\n\ next channel up. The Bass section also responds to this second channel on keys\n\ -lower than #48. Once started you cannot change the midi channel - use the \n\ +lower than #48. Once started you cannot change the MIDI channel - use the \n\ '-channel' option at startup to select the one you want. The actual available\n\ max is 15 and that is enforced.\n\ \n\ @@ -2136,7 +2136,7 @@ PWM:\n\ Modified by Env-1 or LFO\n\ \n\ DCO-1:\n\ - Crossmod (FM) from DCO2 to DCO1\n\ + Cross-mod (FM) from DCO2 to DCO1\n\ Modified by Env-1\n\ \n\ Octave range 16' to 2' (all mixable)\n\ @@ -2225,7 +2225,7 @@ this will initiate the recording. It does not matter which of the mode is\n\ selected since they will all start the recording sequence. When you have\n\ finished then select the mode button again (you may want to clear the function\n\ key if still active). You can record up to 256 steps, either from the GUI\n\ -keyboard or from a master controller and the notes are saved into a midi\n\ +keyboard or from a master controller and the notes are saved into a MIDI\n\ key memory.\n\ \n\ There is no capability to edit the sequences once they have been entered, that\n\ @@ -2310,7 +2310,7 @@ in either the Jupiter-6 or -8.\n\ \n\ There are several parts to the synth memories. Layer parameters govern sound\n\ generation, synth parameters that govern operating modes such Dual/Split,\n\ -Solo/Unison etc, Function settings that modify internal operations, the\n\ +Solo/Unison etc., Function settings that modify internal operations, the\n\ parameters for the mod panel and finally the Arpeggiator sequences. These\n\ sequences are actually separate from the arpeggiator settings however that\n\ was covered in the notes above.\n\ @@ -2392,7 +2392,7 @@ cleaner and not as phat as the original. You might say it sounds more like\n\ something that comes from Uranus rather than Jupiter and consideration was\n\ indeed given to a tongue in cheek renaming of the emulation..... The author is\n\ allowed this criticism as he wrote the application - as ever, if you want the\n\ -original sound then buy the original synth (or get Rolands own emulation?).\n\ +original sound then buy the original synth (or get Roland's own emulation?).\n\ \n\ A few notes are required on oscillator sync since by default it will seem to \n\ be quite noisy. The original could only product a single waveform at a single\n\ @@ -2401,7 +2401,7 @@ oscillator which generates complex waveforms. The Bristol Bitone can generate\n\ up to 4 waveforms simultaneously at different levels for 5 different harmonics\n\ and the consequent output is very rich, the waves can be slightly detuned, \n\ the pulse output can be PW modulated. As with all the bristol oscillators that\n\ -support sync, the sync pulse is extracted as a postive leading zero crossing.\n\ +support sync, the sync pulse is extracted as a positive leading zero crossing.\n\ Unfortunately if the complex bitone output is used as input to sync another\n\ oscillator then the result is far too many zero crossings to extract a good\n\ sync. For the time being you will have to simplify the sync source to get a\n\ @@ -2558,8 +2558,8 @@ code maintains separate directories.\n\ \n\ There are three slightly different Bit GUI's. The first is the bit-1 with a \n\ limited parameter set as it only had 64 parameters. The second is the bit-99\n\ -that included midi and split options in the GUI and has the white design that\n\ -was an offered by Crumar. The third is a slightly homogenous design that is \n\ +that included MIDI and split options in the GUI and has the white design that\n\ +was an offered by Crumar. The third is a slightly homogeneous design that is \n\ specific to bristol, similar to the black panelled bit99 but with a couple of\n\ extra parameters. All the emulations have the same parameters, some require you\n\ use the data entry controls to access them. This is the same as the original, \n\ @@ -2820,7 +2820,7 @@ oscillator which generates complex waveforms. The Bristol Bitone can generate\n\ up to 4 waveforms simultaneously at different levels for 5 different harmonics\n\ and the consequent output is very rich, the waves can be slightly detuned, \n\ the pulse output can be PW modulated. As with all the bristol oscillators that\n\ -support sync, the sync pulse is extracted as a postive leading zero crossing.\n\ +support sync, the sync pulse is extracted as a positive leading zero crossing.\n\ Unfortunately if the complex bitone output is used as input to sync another\n\ oscillator then the result is far too many zero crossings to extract a good\n\ sync.\n\ @@ -2838,7 +2838,7 @@ NULL, /* CS-80 */ Sequential circuits released amongst the first truly polyphonic synthesisers\n\ where a group of voice circuits (5 to 10 of them) were linked to an onboard\n\ computer that gave the same parameters to each voice and drove the notes to\n\ -each voice from the keyboard. The costs were nothing short of exhorbitant and\n\ +each voice from the keyboard. The costs were nothing short of exorbitant and\n\ this lead to Sequential releasing a model with just one voice board as a mono-\n\ phonic equivalent. The sales ran up to 10,000 units, a measure of its success\n\ and it continues to be recognised alongside the Mini Moog as a fat bass synth.\n\ @@ -2905,7 +2905,7 @@ Filter:\n\ Cutoff: cuttof frequency\n\ Res: Resonance/Q/Emphasis\n\ Env: amount of modulation affecting to cutoff.\n\ - KBD: amount of keyboard trackingn to cutoff\n\ + KBD: amount of keyboard tracking to cutoff\n\ \n\ Envelopes: One each for PolyMod (filter) and amplifier.\n\ \n\ @@ -2960,7 +2960,7 @@ it has not been coded that way).\n\ The filter envelope is configured to ignore velocity.\n\ \n\ The default filters are quite expensive. The -lwf option will select the less\n\ -computationally expensive lightweight Chamberlain filters which have a colder\n\ +computationally expensive lightweight Chamberlin filters which have a colder\n\ response but require zonks fewer CPU cycles.\n\ \n", @@ -2970,7 +2970,7 @@ NULL, /* Voyager = explorer, stuff later */ ------------\n\ \n\ This original design was made by an engineer who had previously worked with \n\ -Moog on the big modular systems, Gene Zumchek. He tried to get Moog Inc to \n\ +Moog on the big modular systems, Gene Zumchek. He tried to get Moog Inc. to \n\ develop a small standalone unit rather than the behemoths however he could \n\ not get heard. After leaving he built a synth eventually called a Sonic-5 that\n\ did fit the bill but sales volumes were rather small. He had tied up with a\n\ @@ -2979,7 +2979,7 @@ not being known, muSonics.\n\ This was quickly overcome by accident. Moog managed to run his company into\n\ rather large debt and the company folded. Bill Waytena, working with Zumcheck,\n\ gathered together the funding needed to buy the remains of the failed company\n\ -and hence Moog Inc was labled on the rebadged Sonic-6. Zumcheck was eventually\n\ +and hence Moog Inc. was labeled on the rebadged Sonic-6. Zumcheck was eventually\n\ forced to leave this company (or agreed to) as he could not work with Moog.\n\ After a few modifications Bob Moog actually used this unit quite widely for\n\ lecturing on electronic music. For demonstrative purposes it is far more\n\ @@ -2999,7 +2999,7 @@ the original\n\ The original was duophonic, kind of. It had a keyboard with high note and low\n\ note precedence and the two oscillators could be driven from different notes.\n\ Its not really duophony and was reportedly not nice to play but it added some\n\ -flexibility to the instrument. This features was dropped largley because it\n\ +flexibility to the instrument. This features was dropped largely because it\n\ is ugly to emulate in a polyphonic environment but the code still has glide\n\ only on Osc-B. It has the two LFO that can be mixed, or at full throw of the \n\ GenXY mixer they will link X->A and Y->B giving some interesting routing, two\n\ @@ -3014,7 +3014,7 @@ There is currently no likely use for an external signal even though the\n\ graphics are there.\n\ \n\ The original envelope was AR or ASR. The emulator has a single ADSR and a \n\ -control switch to select AR (actually AD), ASR, ADSD (MiniMoog envelope) or\n\ +control switch to select AR (actually AD), ASR, ADSD (Minimoog envelope) or\n\ ADSR.\n\ \n\ Generator-Y has a S/H function on the noise source for a random signal which \n\ @@ -3096,7 +3096,7 @@ Modulators:\n\ Envelope:\n\ \n\ AR/ASR/ADSD/ADSR\n\ - Velociy on/off\n\ + Velocity on/off\n\ \n\ Trigger:\n\ \n\ @@ -3146,7 +3146,7 @@ result is a lot more predictable.\n\ The Sonic-6 as often described as having bad tuning, that probably depends on \n\ model since different oscillators were used at times. Also, different units\n\ had different filters (Zumchek used a ladder of diodes to overcome the Moog\n\ -ladder of transister patent). The original was often described as only being\n\ +ladder of transistor patent). The original was often described as only being\n\ useful for sound effects. Personally I don't think that was true however the\n\ design is extremely flexible and the mods are applied with high gains so to\n\ get subtle sounds they only have to be applied lightly. Also, this critique\n\ @@ -3169,7 +3169,7 @@ a save button which should require a double click but does not yet (0.30.0),\n\ a pair of buttons for searching up and down the available memories and a button\n\ called 'Find' which will select the next available free memory.\n\ \n\ -Midi options include channel, channel down and, er, thats it.\n\ +MIDI options include channel, channel down and, er, that's it.\n\ \n", " CRUMAR TRILOGY\n\ @@ -3207,10 +3207,10 @@ fatter than the original. In 'Mono' mode there is only one LFO that all voices\n will share and the envelope is triggered in Legato style, ie, only once for\n\ a sequence of notes - all have to be released for the envelope to recover.\n\ \n\ -VCO: The original allowed for wavaeform selection to alternate between notes, \n\ +VCO: The original allowed for waveform selection to alternate between notes, \n\ something that is rather ugly to do with the bristol architecture. This is \n\ replaced with a VCO selector where each note will only take the output from\n\ -one of the two avalable oscillators and gives the ntoes a little more\n\ +one of the two available oscillators and gives the notes a little more\n\ separation. The legato mode works whereby the oscillator selection is only\n\ made for the first note in a sequence to give a little more sound consistency.\n\ \n\ @@ -3351,8 +3351,8 @@ produced 4 pure (infinite bandwidth) square waves that were mixed together, \n\ an overly weak result. The emulator adds a waveform distort (P3), an notched\n\ control that produces a pure sine wave at centre point. Going down it will\n\ generate gradually increasing 3rd and 5th harmonics to give it a squarey wave\n\ -with a distinct hammond tone. The distortion actually came from the B3 emulator\n\ -which models the distort on the shape of the hammond tonewheels themselves.\n\ +with a distinct Hammond tone. The distortion actually came from the B3 emulator\n\ +which models the distort on the shape of the Hammond tonewheels themselves.\n\ Going up from centre point will produce gradually sharper sawtooth waves using\n\ a different phase distortion.\n\ \n\ @@ -3366,7 +3366,7 @@ audible clicks from the key on and off events or when selected will produce \n\ something akin to a percussive ping for the start of the note.\n\ \n\ The result for the organ section is that it can produce some quite nice sounds\n\ -reminiscent of the farfisa range to not quite hammond, either way far more\n\ +reminiscent of the Farfisa range to not quite Hammond, either way far more\n\ useful than the flat, honking square waves. The original sound can be made by\n\ waveform to a quarter turn or less, spacialisation and mod to zero, key\n\ grooming off.\n\ @@ -3392,7 +3392,7 @@ used to have the filter open up with velocity if desired.\n\ The mod application is different from the original. It had a three way selector\n\ for routing the LFO to either VCO, VCA or VCF but only a single route. This\n\ emulation uses a continuous notched control where full off is VCO only, notch\n\ -is VCF only and full on is VCA however the intermidiate positions will route\n\ +is VCF only and full on is VCA however the intermediate positions will route\n\ proportional amounts to two components.\n\ \n\ The LFO has more options (Ramp and Saw) than the original (Tri and Square).\n\ @@ -3432,7 +3432,7 @@ oscillator which generates complex waveforms. The Bristol Bitone can generate\n\ up to 4 waveforms simultaneously at different levels for 5 different harmonics\n\ and the consequent output is very rich, the waves can be slightly detuned, \n\ the pulse output can be PW modulated. As with all the bristol oscillators that\n\ -support sync, the sync pulse is extracted as a postive leading zero crossing.\n\ +support sync, the sync pulse is extracted as a positive leading zero crossing.\n\ Unfortunately if the complex bitone output is used as input to sync another\n\ oscillator then the result is far too many zero crossings to extract a good\n\ sync. For the time being you will have to simplify the sync source to get a\n\ @@ -3474,10 +3474,10 @@ fatter than the original. In 'Mono' mode there is only one LFO that all voices\n will share and the envelope is triggered in Legato style, ie, only once for\n\ a sequence of notes - all have to be released for the envelope to recover.\n\ \n\ -VCO: The original allowed for wavaeform selection to alternate between notes, \n\ +VCO: The original allowed for waveform selection to alternate between notes, \n\ something that is rather ugly to do with the bristol architecture. This is \n\ replaced with a VCO selector where each note will only take the output from\n\ -one of the two avalable oscillators and gives the ntoes a little more\n\ +one of the two available oscillators and gives the notes a little more\n\ separation. The legato mode works whereby the oscillator selection is only\n\ made for the first note in a sequence to give a little more sound consistency.\n\ \n\ @@ -3603,8 +3603,8 @@ produced 4 pure (infinite bandwidth) square waves that were mixed together, \n\ an overly weak result. The emulator adds a waveform distort (P3), an notched\n\ control that produces a pure sine wave at centre point. Going down it will\n\ generate gradually increasing 3rd and 5th harmonics to give it a squarey wave\n\ -with a distinct hammond tone. The distortion actually came from the B3 emulator\n\ -which models the distort on the shape of the hammond tonewheels themselves.\n\ +with a distinct Hammond tone. The distortion actually came from the B3 emulator\n\ +which models the distort on the shape of the Hammond tonewheels themselves.\n\ Going up from centre point will produce gradually sharper sawtooth waves using\n\ a different phase distortion.\n\ \n\ @@ -3618,7 +3618,7 @@ audible clicks from the key on and off events or when selected will produce \n\ something akin to a percussive ping for the start of the note.\n\ \n\ The result for the organ section is that it can produce some quite nice sounds\n\ -reminiscent of the farfisa range to not quite hammond, either way far more\n\ +reminiscent of the Farfisa range to not quite Hammond, either way far more\n\ useful than the flat, honking square waves. The original sound can be made by\n\ waveform to a quarter turn or less, spacialisation and mod to zero, key\n\ grooming off.\n\ @@ -3644,7 +3644,7 @@ used to have the filter open up with velocity if desired.\n\ The mod application is different from the original. It had a three way selector\n\ for routing the LFO to either VCO, VCA or VCF but only a single route. This\n\ emulation uses a continuous notched control where full off is VCO only, notch\n\ -is VCF only and full on is VCA however the intermidiate positions will route\n\ +is VCF only and full on is VCA however the intermediate positions will route\n\ proportional amounts to two components.\n\ \n\ The LFO has more options (Ramp and Saw) than the original (Tri and Square).\n\ @@ -3684,7 +3684,7 @@ oscillator which generates complex waveforms. The Bristol Bitone can generate\n\ up to 4 waveforms simultaneously at different levels for 5 different harmonics\n\ and the consequent output is very rich, the waves can be slightly detuned, \n\ the pulse output can be PW modulated. As with all the bristol oscillators that\n\ -support sync, the sync pulse is extracted as a postive leading zero crossing.\n\ +support sync, the sync pulse is extracted as a positive leading zero crossing.\n\ Unfortunately if the complex bitone output is used as input to sync another\n\ oscillator then the result is far too many zero crossings to extract a good\n\ sync. For the time being you will have to simplify the sync source to get a\n\ @@ -3707,7 +3707,7 @@ would be indicative of a divider circuit.\n\ \n\ It featured 8 oscillators that could be applied as either 4 voices with dual\n\ osc or 8 voices with a single osc. The architecture was verging on the\n\ -interesting since each oscillator was fead into an individual envelope generator\n\ +interesting since each oscillator was fed into an individual envelope generator\n\ (described below) and then summed into the single filter, the filter having\n\ another envelope generator, 9 in total. This lead to cost reduction over having\n\ a filter per voice however the single filter leads to breathing, also discussed\n\ @@ -3717,7 +3717,7 @@ The control panel has a volume, global tuning control and a 'Bend' control\n\ that governs the depth of the pitch bend from the joystick and the overall \n\ amount of DCO modulation applied by the joystick. There is no sequencer in\n\ this emulation largely because there are far better options now available than\n\ -this had but also due to a shortage of onscreen realestate.\n\ +this had but also due to a shortage of on-screen real estate.\n\ \n\ The Poly, Chord and Hold keys are emulated, hold being a sustain key. The\n\ Chord relearn function works follows:\n\ @@ -3804,11 +3804,11 @@ available from the original instrument:\n\ DE 83 Mod DCO\n\ DE 84 Mod VCF\n\ \n\ - DE 86 Midi channel\n\ - DE 87 Midi program change enable\n\ - DE 88 Midi OMNI\n\ + DE 86 MIDI channel\n\ + DE 87 MIDI program change enable\n\ + DE 88 MIDI OMNI\n\ \n\ -Of these 25 pararmeters, the emulation has changed 88 to be OMNI mode rather \n\ +Of these 25 parameters, the emulation has changed 88 to be OMNI mode rather \n\ than the original sequence clock as internal or external. This is because the\n\ sequencer function was dropped as explained above.\n\ \n\ @@ -3832,7 +3832,7 @@ the noise signal level.\n\ \n\ The single filter always responded to the highest note on the keyboard. This\n\ gives a weaker overall sound and if playing with two hands then there is a\n\ -noticible effect with keytracking - left hand held chords will cause filter\n\ +noticeable effect with keytracking - left hand held chords will cause filter\n\ breathing as the right hand plays solos and the keyboard tracking changes \n\ from high to low octaves. Note that the emulator will implement a single\n\ filter if you select DE 46 filter envelope retrigger to be single trigger, it\n\ @@ -3888,13 +3888,13 @@ gain:\n\ \n\ This gives some interesting velocity tracking capabilities where just one osc\n\ can track velocity to introduce harmonic content keeping the filter at a fixed\n\ -cutoff frequence. Having a bit of detune applied globally and locally will keep\n\ +cutoff frequency. Having a bit of detune applied globally and locally will keep\n\ the sound reasonably fat for each oscillator.\n\ \n\ The filter envelope does not track velocity for any of the distributed voices,\n\ this was intentional since when using high resonance it is not desirable that\n\ the filter cutoff changes with velocity, it tends to be inconsistently \n\ -disonant.\n\ +dissonant.\n\ \n\ If you want to use this synth with controller mappings then map the value \n\ entry pot to your easiest to find rotary, then click the mouse on the membrane\n\ @@ -3927,9 +3927,9 @@ locations on the front panel with Load, Save and Increment buttons and one\n\ panel of options to adjust a few parameters on the oscillator and filters. It\n\ is possible to get extra memories by loading banks with -load: if you request\n\ starting in memory #21 the emulator will stuff 20 into the bank and 1 into the\n\ -memory location. There is no apparant midi channel selector, use -channel \n\ +memory location. There is no apparent MIDI channel selector, use -channel \n\ and then stay on it. This could have been put into the options panel however \n\ -having midi channel in a memory is generally a bad idea.\n\ +having MIDI channel in a memory is generally a bad idea.\n\ \n\ A. MOD\n\ \n\ @@ -4006,7 +4006,7 @@ it interprets signal ramps and drains from an analogue circuit this is one area\ of improvement in the emulator. There are options to produce multiple waveforms\n\ described below.\n\ \n\ -The resonant filter is implemented with a single Houvilainen and actually only\n\ +The resonant filter is implemented with a single Huovilainen and actually only\n\ runs at 24dB/Oct. There are controls for remixing the different taps, a form\n\ of feedforward and when in 'Flat' mod there is more remixing of the poles, this\n\ does generate a slower roll off but gives the signal a bit more warmth than a\n\ @@ -4058,7 +4058,7 @@ triggers.\n\ \n\ The options from section G are only loaded under two circumstances: at system\n\ start from the first selected memory location and if the Load button is given\n\ -a DoubleClick. All other memory load functions will inherrit the settings that\n\ +a double-click. All other memory load functions will inherit the settings that\n\ are currently active.\n\ \n", @@ -4068,7 +4068,7 @@ are currently active.\n\ The BassMaker is not actually an emulator, it is a bespoke sequencer design but\n\ based on the capabilities of some of the early analogue sequencers such as the\n\ Korg SQ-10. Supplying this probably leaves bristol open to a lot of feature\n\ -requests for sequencer functionaliity and it is stated here that the BassMaker\n\ +requests for sequencer functionality and it is stated here that the BassMaker\n\ is supposed to be simple so excess functionality will probably be declined as\n\ there are plenty of other sequencing applications that can provide a richer\n\ feature set.\n\ @@ -4129,7 +4129,7 @@ following functions:\n\ Memory:\n\ 0..9 key entry buttons, 1000 memories available\n\ Load\n\ - Save: doubleclick to save current sequence\n\ + Save: double-click to save current sequence\n\ \n\ Menu Panel\n\ Up, Down menu\n\ @@ -4158,13 +4158,13 @@ menu or activate any option. The 'Fn' button returns one level:\n\ expression pedal (controller value)\n\ note events\n\ \n\ - First midi channel\n\ + First MIDI channel\n\ \n\ - Primary midi channel for note events\n\ + Primary MIDI channel for note events\n\ \n\ - Second midi channel\n\ + Second MIDI channel\n\ \n\ - Secondary midi channel when 'Control' configured to 'Note' events.\n\ + Secondary MIDI channel when 'Control' configured to 'Note' events.\n\ \n\ Global Transpose\n\ \n\ @@ -4199,8 +4199,8 @@ code, for the filter and S/N generation.\n\ The oscillators will run as per the original using a single phase accumulator\n\ and 16 bit frequency space. All the waveforms are extracted logically from the\n\ ramp waveform generated by the phase accumulation. Sync and RingMod are also\n\ -extracted with the same methods. The noise generation is exor/add as per the\n\ -original however the noise signal will not degenerate when mixing waveforms.\n\ +extracted with the same methods. The noise generation is XOR/add as per the\n\ +original, however the noise signal will not degenerate when mixing waveforms.\n\ The output waves are ANDed together. The bristol control register has an option\n\ for Multi waveforms and when selected each oscillator will have its own phase\n\ accumulator, can have a detune applied and will be mixed by summation rather\n\ @@ -4212,7 +4212,7 @@ exponential decay and release. Attack is a linear function and the sustain level can only be decreased when active as the counter also refuses to count back up\n\ when passed its peak.\n\ \n\ -The filter implements a 12dB/Octave multimode chamberlain filter providing LP,\n\ +The filter implements a 12dB/Octave multimode Chamberlin filter providing LP,\n\ BP and HP signals. This is not the best filter in the world however neither was\n\ the original. An additional 24dB/Octave LP filter has been added, optionally \n\ available and with feedforward to provide 12/18dB signals. Between them the \n\ diff --git a/bristol/activesense.c b/bristol/activesense.c index 9b0683a..27f81fb 100644 --- a/bristol/activesense.c +++ b/bristol/activesense.c @@ -23,7 +23,7 @@ #include "bristolactivesense.h" /* - * This code is called from midihandlers.c when ACTIVE_SENSE is recieved from + * This code is called from midihandlers.c when ACTIVE_SENSE is received from * the GUI. Once they have been seen then every 'once in a while' this check * is done to ensure it is still being received. * diff --git a/bristol/aksdco.c b/bristol/aksdco.c index 45ac4d1..a4da72b 100644 --- a/bristol/aksdco.c +++ b/bristol/aksdco.c @@ -148,7 +148,7 @@ static int param(bristolOP *operator, bristolOPParams *param, break; case 0: /* Tune in large amounts */ /* - * This should be exponential 15 to 15 KHz for an audible oscillator + * This should be exponential 15 to 15 kHz for an audible oscillator * and something like 0.02 to 500 Hz for an 'LFO'. */ { @@ -212,7 +212,7 @@ static int param(bristolOP *operator, bristolOPParams *param, param->param[4].float_val); } break; - case 5: /* LFO.... Encodes the type of oscilllator. */ + case 5: /* LFO.... Encodes the type of oscillator. */ param->param[index].int_val = value * CONTROLLER_RANGE; break; case 7: /* sync flag */ @@ -297,7 +297,7 @@ static int param(bristolOP *operator, bristolOPParams *param, /* * This oscillator takes an input frequency buffer that is related to the - * midi key, glide and pitch bend, all frequency matched so that glide is + * MIDI key, glide and pitch bend, all frequency matched so that glide is * at a constant rate irrespective of pitch and pitch bend is +/- a given * range. It then takes a mod buf which contains anything we want to put into * it - for the AKS it is the result of all the patch pins in the matrix. It @@ -305,13 +305,13 @@ static int param(bristolOP *operator, bristolOPParams *param, * [Notes 3 Nov 06: Perhaps the freq buf should not be used. Pitch bend will * be mapped to the X axis of the joystick in the modbuffer, and glide was not * implemented by this synth and will have the value 0 (no glide)]. - * [Alternatively allow the midi library to map pitch bend (coarse and fine) to + * [Alternatively allow the MIDI library to map pitch bend (coarse and fine) to * another set of controllers that can then be used here for X axis modulation.] * * There are then two output buffers, one for each of the generated waveforms. * - * Target tuning is 0.02 Hz to 16KHz, and we are probably going to have two - * coarrse/fine controllers to cover it, 28bits. + * Target tuning is 0.02 Hz to 16kHz, and we are probably going to have two + * coarse/fine controllers to cover it, 28bits. */ static int operate(bristolOP *operator, bristolVoice *voice, @@ -359,7 +359,7 @@ static int operate(bristolOP *operator, * Take a sample from the wavetable into the output buffer. This * should also be scaled by gain parameter. * - * We can seperate this into subroutine calls, or we can take our + * We can separate this into subroutine calls, or we can take our * values and take each wave? */ gdelta = wtp - ((float) ((int) wtp)); @@ -415,7 +415,7 @@ aksdcoinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; @@ -619,7 +619,7 @@ fillSineWave(float *mem, float count, float distort, float gain) * We are going to distort the sine wave by altering the rate at which it * scans through each of its two halves. The value can go from 0 to 1.0 * and that should be controlled. - * It defines the poing at which we reach PI, or half of a sine. + * It defines the point at which we reach PI, or half of a sine. */ inc1 = ((float) M_PI) / (distort * count); inc2 = ((float) M_PI) / (count - distort * count); diff --git a/bristol/aksenv.c b/bristol/aksenv.c index 32a80fb..914a190 100644 --- a/bristol/aksenv.c +++ b/bristol/aksenv.c @@ -343,7 +343,7 @@ aksenvinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; diff --git a/bristol/aksfilter.c b/bristol/aksfilter.c index 2db36c6..a2f3138 100644 --- a/bristol/aksfilter.c +++ b/bristol/aksfilter.c @@ -35,7 +35,7 @@ */ /* * This implements three filter algorithms used by the different bristol - * emulations. These are a butterworth used by the leslie, a chamberlain + * emulations. These are a butterworth used by the leslie, a chamberlin * used generally, and a rooney used for some of the filter layering and * eventually the mixing. */ @@ -93,7 +93,7 @@ static int reset(bristolOP *operator, bristolOPParams *param) param->param[1].float_val = 0.5; param->param[2].float_val = 0.5; param->param[3].int_val = 0; /* Keyboard tracking */ - param->param[4].int_val = 0; /* Filter algorithhm */ + param->param[4].int_val = 0; /* Filter algorithm */ param->param[5].float_val = 1.0; return(0); } @@ -187,7 +187,7 @@ static int operate(register bristolOP *operator, bristolVoice *voice, /* * Every operator accesses these variables, the count, and a pointer to - * each buffer. We should consider passing them as readymade parameters? + * each buffer. We should consider passing them as ready-made parameters? * * The Filter now takes normalised inputs, in ranges of 12PO. */ @@ -271,7 +271,7 @@ static int operate(register bristolOP *operator, bristolVoice *voice, * Due to that, what we are going to do is use another filter, a low * pass filter with a different frequency to the primary filter. It * will give us a high pass envelope that will control the gain of - * the resonace. As resonance goes up its gain does, but also lowers + * the resonance. As resonance goes up its gain does, but also lowers * the frequency of the HPF used so that it tends to flat. * * At full on then the HPF will tend to be a flat signal, the gain will @@ -326,7 +326,7 @@ aksfilterinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; @@ -387,7 +387,7 @@ aksfilterinit(bristolOP **operator, int index, int samplerate, int samplecount) specs->spec.param[3].flags = BRISTOL_BUTTON; specs->spec.param[4].pname = "filter type"; - specs->spec.param[4].description = "Rooney, Butterworth, Chamberlain"; + specs->spec.param[4].description = "Rooney, Butterworth, Chamberlin"; specs->spec.param[4].type = BRISTOL_TOGGLE; specs->spec.param[4].low = 0; specs->spec.param[4].high = 1; diff --git a/bristol/aksreverb.c b/bristol/aksreverb.c index 13937f0..ef59416 100644 --- a/bristol/aksreverb.c +++ b/bristol/aksreverb.c @@ -207,7 +207,7 @@ aksreverbinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; diff --git a/bristol/arpdco.c b/bristol/arpdco.c index b4f475b..dc6d21e 100644 --- a/bristol/arpdco.c +++ b/bristol/arpdco.c @@ -425,7 +425,7 @@ static int operate(bristolOP *operator, * Take a sample from the wavetable into the output buffer. This * should also be scaled by gain parameter. * - * We can seperate this into subroutine calls, or we can take our + * We can separate this into subroutine calls, or we can take our * values and take each wave? */ gdelta = wtp - ((float) ((int) wtp)); @@ -548,7 +548,7 @@ arpdcoinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; @@ -870,7 +870,7 @@ fillWave(float *mem, int count, int type) return; case 6: /* - * Tangiential wave. We limit some of the values, since they do get + * Tangential wave. We limit some of the values, since they do get * excessive. This is only half a tan as well, to maintain the * base frequency. */ diff --git a/bristol/arpeggiator.c b/bristol/arpeggiator.c index a789082..f73de5a 100644 --- a/bristol/arpeggiator.c +++ b/bristol/arpeggiator.c @@ -45,7 +45,7 @@ static void desequence(audioMain *am, Baudio *ba) * and does the configuration of the arpeggiator. * * The code supports sequencing where steps can be learnt from the keyboard - * and then stepped through them sequencially, chording where a similar learn + * and then stepped through them sequentially, chording where a similar learn * process is executed and then each note can play the chord singularly, and * arpeggiation where we scan through the active (pressed) notes. */ @@ -252,7 +252,7 @@ bristolArpeggiator(audioMain *audiomain, bristolMidiMsg *msg) * arpeggiator or putting in some silly long step time? * * When we have requested a resequence then we start accepting - * midi note events in our hook and also key requests from the GUI. + * MIDI note events in our hook and also key requests from the GUI. * At the moment key requests do not carry velocity, that is for * future study since we don't even use it here, we just maintain * it in the engine. Velocity support in the engine would require @@ -615,7 +615,7 @@ arpeggioCounterCheck(arpSeq *seq, int samplecount) * * This should be redefined. We have a step sequencer and a chording system * however for performance it would be better to have a true arpeggiator: - * Out of the available pressed noes scan through them up/down/ud/rnd. + * Out of the available pressed notes scan through them up/down/ud/rnd. * * This is called once per baudio per frame. Another call, ArpegReFreq() is * called per voice. @@ -639,7 +639,7 @@ bristolArpegReAudio(audioMain *audiomain, Baudio *baudio) * If we are sequencing or arpeggiating then we need to look at their * counters here. The counters are moved just once for however many voices * we have but the counters are separate so we could anticipate sequencing - * arpeggios? Hm, perhaps not, but we can garantee exclusion elsewhere. + * arpeggios? Hm, perhaps not, but we can guarantee exclusion elsewhere. */ if (baudio->mixflags & BRISTOL_SEQUENCE) { diff --git a/bristol/audioEngine.c b/bristol/audioEngine.c index c5b6b07..569dcb4 100644 --- a/bristol/audioEngine.c +++ b/bristol/audioEngine.c @@ -85,7 +85,7 @@ bristolUnlinkVoice(audioMain *audiomain, bristolVoice *v) } /* - * This should be organised to be a callback for the Jack and DSSI interfaces. + * This should be organised to be a callback for the JACK and DSSI interfaces. * there may be issues of internal buffering that will have to be reviewed, and * potentially if we are called with less than our desired number of samples * then we buffer them internally and return data slightly behind the real @@ -127,7 +127,7 @@ doAudioOps(audioMain *audiomain, float *outbuf, float *startbuf) { #ifndef BRISTOL_SEMAPHORE /* - * This is not threadsafe. We should flag the rb as inactive. + * This is not thread-safe. We should flag the rb as inactive. */ jack_ringbuffer_stop(audiomain->rb); jack_ringbuffer_reset(audiomain->rb); @@ -417,7 +417,7 @@ doAudioOps(audioMain *audiomain, float *outbuf, float *startbuf) * then get the locals and params, and call the operator, summing * the outputs into our single float buf. * - * Each voice, or channel if you want, has its own independant + * Each voice, or channel if you want, has its own independent * limit on voice counts. This strange hack works only if we have * allocated a new voice to the head of the list. If we stole an * existing voice or two it may fail however that is unlikely @@ -429,7 +429,7 @@ doAudioOps(audioMain *audiomain, float *outbuf, float *startbuf) if (++voice->baudio->cvoices > voice->baudio->voicecount) { /* - * This looks a bit brutal however the assignement code should + * This looks a bit brutal however the assignment code should * avoid this situation. */ if (voice->baudio->midiflags & BRISTOL_MIDI_DEBUG2) @@ -572,7 +572,7 @@ doAudioOps(audioMain *audiomain, float *outbuf, float *startbuf) thisaudio = thisaudio->next; continue; } -#warning - this voice may have been reassigned. check midi channel +#warning - this voice may have been reassigned. check MIDI channel if (thisaudio->firstVoice != NULL) (*thisaudio->effect[0]).operate( audiomain->palette[index], @@ -618,7 +618,7 @@ doAudioOps(audioMain *audiomain, float *outbuf, float *startbuf) thisaudio = thisaudio->next; continue; } -#warning - this voice may have been reassigned. check midi channel +#warning - this voice may have been reassigned. check MIDI channel if (thisaudio->firstVoice != NULL) (*thisaudio->effect[1]).operate( audiomain->palette[index], diff --git a/bristol/audiothread.c b/bristol/audiothread.c index e3a0611..834bede 100644 --- a/bristol/audiothread.c +++ b/bristol/audiothread.c @@ -93,10 +93,10 @@ audioThread(audioMain *audiomain) printf("starting audio thread\n"); /* - * Due to the nature of the jack interface, we need to have this file be - * minimally jack aware. The rest of the code takes an audio device, does + * Due to the nature of the JACK interface, we need to have this file be + * minimally JACK aware. The rest of the code takes an audio device, does * its own read and write calls, then dispatches to doAudioOps(). This is - * not the same with jack, we register a callback and let it do the work + * not the same with JACK, we register a callback and let it do the work * for us. */ @@ -106,7 +106,7 @@ audioThread(audioMain *audiomain) while (audiomain->atReq != BRISTOL_REQSTOP) { /* - * This will not return except when problem arise with the jack + * This will not return except when problem arise with the JACK * interface. The returning code will decide whether to flag a * reqstop to exit */ @@ -138,7 +138,7 @@ audioThread(audioMain *audiomain) while (audiomain->atReq != BRISTOL_REQSTOP) { /* - * This will not return except when problem arise with the jack + * This will not return except when problem arise with the JACK * interface. The returning code will decide whether to flag a * reqstop to exit */ @@ -146,14 +146,14 @@ audioThread(audioMain *audiomain) audiomain->atStatus = BRISTOL_EXIT; - printf("jack audio interface returned\n"); + printf("JACK audio interface returned\n"); _exit(0); } return; #else - printf("jack requested but not compiled with engine\n"); + printf("JACK requested but not compiled with engine\n"); audiomain->atStatus = BRISTOL_EXIT; @@ -170,15 +170,15 @@ audioThread(audioMain *audiomain) < 0) { /* - * If we have Jack support but have not request jack audio then this - * failure is typically due to not giving the -jack option. Chekc for + * If we have JACK support but have not request JACK audio then this + * failure is typically due to not giving the -jack option. Check for * it and report. */ #ifdef _BRISTOL_JACK if (~audiomain->flags & BRISTOL_JACK) { printf("Failed to open audio device %s\n", device); - printf("If jack is running then use 'startBristol -jack'\n"); + printf("If JACK is running then use 'startBristol -jack'\n"); } else #endif printf("Problem opening audio device %s, exiting audio thread\n", @@ -424,7 +424,7 @@ bristolMidiController(Baudio *baudio, int NRP, float value) case 0: /* was heavyweight, now medium */ break; case 1: - /* Chamberlains - not changed */ + /* Chamberlins - not changed */ baudio->mixflags |= BRISTOL_LW_FILTER; break; case 2: @@ -467,14 +467,14 @@ bristolMidiController(Baudio *baudio, int NRP, float value) return(0); case BRISTOL_NRP_DEBUG: /* - * This is a little unfortunte, we do not have direct access to - * the midi library structures here so can only enable MIDI debug + * This is a little unfortunate, we do not have direct access to + * the MIDI library structures here so can only enable MIDI debug * for the emulator. This does not have to be an issue, it allows - * us to view what each emulation is delivered by midi through the + * us to view what each emulation is delivered by MIDI through the * bristol API. * * 052009 - integrate code to request the MIDI library include byte - * debuging of interfaces. + * debugging of interfaces. */ if ((value * C_RANGE_MIN_1) == 0) baudio->midiflags &= ~(BRISTOL_MIDI_DEBUG1|BRISTOL_MIDI_DEBUG2); @@ -517,10 +517,10 @@ bristolMidiController(Baudio *baudio, int NRP, float value) /* * This could also go into the library so the engine and GUI use the same code? * It might have been possible other than that the GUI code works with integer - * values (mappings the actual controller indeces) and this code is for the + * values (mappings the actual controller indexes) and this code is for the * float curves in the engine, will leave that FFS. * - * We want to go through the midi controller mapping file for this synth and + * We want to go through the MIDI controller mapping file for this synth and * search for directives for value maps. The names are taken from the midi * header file and we want to add a few others for preconfigured value tables. */ @@ -692,7 +692,7 @@ mapVelocityCurve(int velocity, float map[128]) } /* - * This was initiallly a call made in the MIDI thread. That naturally led to + * This was initially a call made in the MIDI thread. That naturally led to * problems with timing and was eventually moved as a request from the MIDI * thread to the audio thread. */ @@ -916,7 +916,7 @@ initAudioThread(audioMain *audiomain) bristolmalloc0(sizeof(bristolOP *) * audiomain->opCount); /* - * Now that we have some basic stuctures we should start initiating the + * Now that we have some basic structures we should start initiating the * operators. This is done one by one, for the * * DCO/DCF/DCA/ADSR/NOISE/LFO/FX/OTHERS @@ -983,7 +983,7 @@ freeBristolAudio(audioMain *audiomain, Baudio *baudio) for (i = 0; i < audiomain->voiceCount; i++) { /* - * Free the inividual locals. + * Free the individual locals. */ if (baudio->FXlocals[i][0] == NULL) continue; diff --git a/bristol/bit1osc.c b/bristol/bit1osc.c index 886ea99..ce1b0da 100644 --- a/bristol/bit1osc.c +++ b/bristol/bit1osc.c @@ -497,7 +497,7 @@ bit1oscinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; @@ -826,7 +826,7 @@ buildBitoneSound(bristolOP *operator, bristolOPParams *param) source = specs->wave[2]; for (i = 0; i < 5; i++) { - /* We should try some semi random start indeces? */ + /* We should try some semi random start indexes? */ oscindex = 0; dest = param->param[0].mem; diff --git a/bristol/blo.c b/bristol/blo.c index b4474c4..0f50cec 100644 --- a/bristol/blo.c +++ b/bristol/blo.c @@ -46,7 +46,7 @@ static float blopulse[BRISTOL_BLO_SIZE]; /* * Generate the waveforms to the given harmonic reference size. The code could * be optimised however it is really only likely to ever be called once at - * startup or 'intermittently' whilst programmming a synth (depending on the + * startup or 'intermittently' whilst programming a synth (depending on the * oscillator implementation - most use a private cache stuffed at init time). */ void diff --git a/bristol/bristol.c b/bristol/bristol.c index 19425e5..c47f54d 100644 --- a/bristol/bristol.c +++ b/bristol/bristol.c @@ -154,17 +154,17 @@ buildCmdLine(audioMain *audiomain, int argc, char **argv) } sprintf(audiomain->cmdline, "%s %s", audiomain->cmdline, argv[i]); } - printf("\njsm will use '%s'\n", audiomain->cmdline); + printf("\nJSM will use '%s'\n", audiomain->cmdline); } /* * We are going to create, initially, two threads. One will field MIDI events, * and translate the (for now) raw data into bristol MIDI messages. The messages * are queued, and then fielded by the audio thread. The audio thread reacts to - * the midi events and starts sound generation operations. The MIDI thread will + * the MIDI events and starts sound generation operations. The MIDI thread will * remain responsible for MIDI parameter management, but not real-time messages. * - * It could make sense to move the threads requests into the midi library for + * It could make sense to move the threads requests into the MIDI library for * use with other programmes? */ int @@ -185,7 +185,7 @@ main(int argc, char **argv) #endif bzero(&audiomain, sizeof(audioMain)); - audiomain.samplecount = 256; /* default this - gets overriden later */ + audiomain.samplecount = 256; /* default this - gets overridden later */ audiomain.iosize = 0; /* This needs to be calculated, samplecount * float */ audiomain.preload = 4; /* This should be less, preferably 4 (was 8). */ audiomain.ingain = 0; @@ -351,7 +351,7 @@ main(int argc, char **argv) * Note that some of these types of interface to not actually * apply to MIDI at the moment. OSS and ALSA are rawmidi specs. * SEQ is ALSA sequencer support. The others may or may not - * provide midi messaging, however it is possible to have jack + * provide MIDI messaging, however it is possible to have JACK * audio drivers with ALSA rawmidi interfacing, for example. */ if ((strcmp(argv[argCount], "none") == 0) @@ -606,7 +606,7 @@ main(int argc, char **argv) bristolMidiOption(0, BRISTOL_NRP_SYSID_L, sysid & 0x0000ffff); audiomain.SysID = sysid; if (audiomain.debuglevel) - printf("fixing sysex system id at 0x%x\n", audiomain.SysID); + printf("fixing SysEx system id at 0x%x\n", audiomain.SysID); } } @@ -655,11 +655,11 @@ main(int argc, char **argv) * Create two threads, one for midi, then one for audio. * * We cannot create the audio thread yet, since we do not know how many - * voices to create - this is a function of the midi start requests from + * voices to create - this is a function of the MIDI start requests from * some controller. */ if (audiomain.debuglevel) - printf("spawning midi thread\n"); + printf("spawning MIDI thread\n"); midithread = spawnThread(midiThread, audiomain.priority == 0? 0: audiomain.priority > 25? audiomain.priority - 25: @@ -675,10 +675,10 @@ main(int argc, char **argv) printf("parent going into idle loop\n"); /* - * To support jack we are going to use this parent thread. We will have it + * To support JACK we are going to use this parent thread. We will have it * reschedule itself to something less than that requested for the audio - * thread and have it handle MIDI events from the Jack interface at some - * higher priority than than the midi thread. The actual MIDI thread will + * thread and have it handle MIDI events from the JACK interface at some + * higher priority than than the MIDI thread. The actual MIDI thread will * still accept events from the GUI but they are generally long events * for audio reconfiguration. * @@ -689,27 +689,27 @@ main(int argc, char **argv) { if (audiomain.atReq == BRISTOL_REQSTOP) /* - * Midi thread init failed, exit to prevent a lockout. Might + * MIDI thread init failed, exit to prevent a lockout. Might * look odd that it is in the atReq and not in some mt status - * however the midi thread is rquesting the audiothread to exit. + * however the MIDI thread is requesting the audiothread to exit. * Since we have not started it yet then we can kind of exit * here. */ exit(0); if (audiomain.debuglevel) - printf("Init waiting for midi thread OK status\n"); + printf("Init waiting for MIDI thread OK status\n"); usleep(100000); } if (audiomain.debuglevel) - printf("Got midi thread OK status\n"); + printf("Got MIDI thread OK status\n"); while (!exitReq) { /* * We should wait for children here, and restart them. We should also - * monitor any bristol system sysex messages, since they will be used + * monitor any bristol system SysEx messages, since they will be used * to request we start the audio thread. */ if (audiomain.atReq & BRISTOL_REQSTART) @@ -733,7 +733,7 @@ main(int argc, char **argv) /* * If we don't have an audio thread then there is * probably an issue with the audio devices so reap the - * midi thread too. + * MIDI thread too. */ pthread_cancel(midithread); break; @@ -753,8 +753,8 @@ main(int argc, char **argv) } /* - * Request jack linkup to its midi sequencer. If we did not - * compile with jack for whatever reason then the library will + * Request JACK linkup to its MIDI sequencer. If we did not + * compile with JACK for whatever reason then the library will * report it. * * This call will not reschedule the thread, we need to do that, @@ -773,10 +773,10 @@ main(int argc, char **argv) (audiomain.flags & BRISTOL_JACK_DUAL)| BRISTOL_CONN_JACK|BRISTOL_DUPLEX, -1, BRISTOL_REQ_NSX, midiMsgHandler, audiomain)) < 0) - printf("requested jack midi did not link up\n"); + printf("requested JACK MIDI did not link up\n"); else { if (audiomain.debuglevel) - printf("requested jack midi link: %i\n", jh); + printf("requested JACK MIDI link: %i\n", jh); bristolMidiOption(0, BRISTOL_NRP_MIDI_GO, 1); } @@ -807,7 +807,7 @@ main(int argc, char **argv) /* * If we do not get an audio thread start request within an amount * of time (should be a parameter) and we have not been given the - * daemon flag then we should consider failing and stoping the + * daemon flag then we should consider failing and stopping the * process. */ if ((watchdog -= exitdecr) <= 0) @@ -894,7 +894,7 @@ main(int argc, char **argv) break; case 4: // Presumptious load Template //if (audiomain.debuglevel) - printf("potentially precocious jsm load request\n"); + printf("potentially precocious JSM load request\n"); midiThreadLoadReq(&audiomain); break; } @@ -923,7 +923,7 @@ main(int argc, char **argv) #endif } - /* Unregister the jack interface */ + /* Unregister the JACK interface */ if ((jh >= 0) && (audiomain.flags & BRISTOL_MIDI_JACK) && (audiomain.flags & BRISTOL_JACK_DUAL)) bristolMidiClose(jh); @@ -989,7 +989,7 @@ pthread_t spawnThread(void * (*threadcode)(void *), int priority) #endif /* - * This may have to go into a subroutine as the midi thread may need to + * This may have to go into a subroutine as the MIDI thread may need to * reuse it to ensure we do not get priority inversion. At the moment both * threads are RT FIFO though. */ diff --git a/bristol/bristolaks.c b/bristol/bristolaks.c index 2c89d5f..9259441 100644 --- a/bristol/bristolaks.c +++ b/bristol/bristolaks.c @@ -29,7 +29,7 @@ * VU Meter does not operate, but that is outside the scope of this emulator. * * Frequency range too small and biased to low end. - * Frequency rangee of Osc-3 should be lower. + * Frequency range of Osc-3 should be lower. */ /*#define DEBUG */ @@ -478,7 +478,7 @@ bristolVoice *voice, register float *startbuf) AKS_I_METER, voice->index, sc); /* * There are pins to go to the output mix, which are fed back into the - * mix. Then they are filtered (HM, panned and actualy go to the outputs. + * mix. Then they are filtered (HM, panned and actually go to the outputs. * * The signal from the patch panel is amplified with the mod buffer then * filtered, then sent back to the panel and to speakers. diff --git a/bristol/bristolaks.h b/bristol/bristolaks.h index c5ea263..6cd3298 100644 --- a/bristol/bristolaks.h +++ b/bristol/bristolaks.h @@ -28,7 +28,7 @@ #define A_AR_ON 0x0010 /* - * These are the output indeces. + * These are the output indexes. */ #define AKS_O_CH1 0 #define AKS_O_CH2 1 diff --git a/bristol/bristolarp2600.c b/bristol/bristolarp2600.c index efc78d3..1d51ee3 100644 --- a/bristol/bristolarp2600.c +++ b/bristol/bristolarp2600.c @@ -77,7 +77,7 @@ arp2600ClearPatchtable() /* * We need to put in all the default patches such that all the inputs - * point to the desised output buffers. + * point to the desired output buffers. */ for (i = 0; i < ARP_INCOUNT; i++) { @@ -532,7 +532,7 @@ bristolVoice *voice, register float *startbuf) * We need to make this connection for CV KBD open again. If nothing is * patched in then we execute this code, or rather, this freq table goes * into a buffer which is the default input. If the control is repatched - * then we need to configure a 1/Octave intepretter for the alternative + * then we need to configure a 1/Octave interpreter for the alternative * buffer. This leads to a few issues with the filter which I think takes * a linear 1.0f for frequency control - these differences are historical * and we should see about resolving them for this emulator, later the @@ -566,7 +566,7 @@ bristolVoice *voice, register float *startbuf) * about 400 times. * * Frequency of OSC without keyboard control is under management of - * midi continuous controller 1. + * MIDI continuous controller 1. */ for (i = 0; i < sc; i+=8) { @@ -651,7 +651,7 @@ bristolVoice *voice, register float *startbuf) * about 400 times. * * Frequency of OSC without keyboard control is under management of - * midi continuous controller 1. + * MIDI continuous controller 1. */ for (i = 0; i < sc; i+=8) { @@ -735,7 +735,7 @@ bristolVoice *voice, register float *startbuf) * about 400 times. * * Frequency of OSC without keyboard control is under management of - * midi continuous controller 1. + * MIDI continuous controller 1. */ for (i = 0; i < sc; i+=8) { @@ -961,7 +961,7 @@ bristolVoice *voice, register float *startbuf) * Still need to get the specifications of the mixer output. It minimally * goes into the panning as seen in the postOps, but there are two other * input/outputs and they are either full mix outputs, or, as done here, - * 'postfades' on the respetive inputs. + * 'postfades' on the respective inputs. * * Mixing: * This is the polyphonic algorithm. There are several components that diff --git a/bristol/bristolarp2600.h b/bristol/bristolarp2600.h index 4f5ef8a..d1f0d41 100644 --- a/bristol/bristolarp2600.h +++ b/bristol/bristolarp2600.h @@ -32,7 +32,7 @@ #define ARP_OSC3_LFO 0x0080 /* - * These are the output indeces. + * These are the output indexes. */ #define ARP_O_PREAMP 0 #define ARP_O_RINGMOD 1 diff --git a/bristol/bristolaxxe.c b/bristol/bristolaxxe.c index f512ee8..24444e5 100644 --- a/bristol/bristolaxxe.c +++ b/bristol/bristolaxxe.c @@ -263,7 +263,7 @@ bristolVoice *voice, register float *startbuf) bristolbzero(scratch, audiomain->segmentsize); /* * There are a lot of mods in this synth, each operator will produce its - * output buffer, and then they will modulate eachother. + * output buffer, and then they will modulate each other. * * Noise is done, run the LFO and ADSR. */ diff --git a/bristol/bristolcs80.c b/bristol/bristolcs80.c index bfad179..e9c7c92 100644 --- a/bristol/bristolcs80.c +++ b/bristol/bristolcs80.c @@ -94,7 +94,7 @@ printf("bristolcs80Control(%i, %i, %f)\n", operator, controller, value); /* * Since we are using here 'lpan = 1.0 - rpan' we could consider * just using one value. It is maintained as two since we may still - * reinvoke the midi spec panning at some point. + * reinvoke the MIDI spec panning at some point. */ ((csmods *) baudio->mixlocals)->lpan[CH_I] = (1.0 - value); ((csmods *) baudio->mixlocals)->rpan[CH_I] = value; @@ -116,7 +116,7 @@ printf("bristolcs80Control(%i, %i, %f)\n", operator, controller, value); break; case 5: /* - * This is a correct midi paninng calculation roughly as taken from + * This is a correct MIDI panning calculation roughly as taken from * MMA corrective notes for stereo panning. It does not work * too well for an L/R mix though as it applies a constant power * algorithm and gets very unbalanced at full throws. @@ -415,7 +415,7 @@ bristolVoice *voice, bristolSound **sound, int channel) * have to split the calculation up a little bit. * * Need to make sure the filters work to expectation as well since the - * brilliance value also widens the bandpass apeture. + * brilliance value also widens the bandpass aperture. */ if (bkey <= 30) { if (bkey <= 0) { @@ -778,7 +778,7 @@ bristolCs80Init(audioMain *audiomain, Baudio *baudio) * * LFO - PWM * DCO - modified bitone oscillator. - * VCF - two, one HP onoe LP + * VCF - two, one HP one LP * ENV - two, filter and amp. One needs some mods for IL * * Global operators: @@ -787,14 +787,14 @@ bristolCs80Init(audioMain *audiomain, Baudio *baudio) * RingMod * LFO - subosc modifier. * VibraChorus - * Tremelo + * Tremolo * * We need to work on ensuring that brilliance is implemented and that - * polyphonic aftertouch is emulated. Brilliance should affect serveral + * polyphonic aftertouch is emulated. Brilliance should affect several * components: * * Filter cutoff should be adjusted - * VCO harmoonics should be layred in + * VCO harmonics should be layered in * * The brilliance also has several options that probably need to be totalled * up to a maximum value then applies: @@ -805,7 +805,7 @@ bristolCs80Init(audioMain *audiomain, Baudio *baudio) * Keyboard span setting * * Keyboard response also has its own modifiers from low to high. Touch also - * drives into the global LFO speed and moification depths but need to find + * drives into the global LFO speed and modification depths but need to find * out if this was velocity or polypressure. */ baudio->soundCount = 19; /* Number of operators in this voice */ @@ -858,7 +858,7 @@ bristolCs80Init(audioMain *audiomain, Baudio *baudio) /* AMP */ initSoundAlgo(2, 17, baudio, audiomain, baudio->sound); - /* VibraChorus - Tremelo is an osc that gets mixed in with the AMP ADSR */ + /* VibraChorus - Tremolo is an osc that gets mixed in with the AMP ADSR */ initSoundAlgo(16, 18, baudio, audiomain, baudio->sound); baudio->param = cs80Controller; diff --git a/bristol/bristoldx.c b/bristol/bristoldx.c index dbdbf7b..5ce6b33 100644 --- a/bristol/bristoldx.c +++ b/bristol/bristoldx.c @@ -100,7 +100,7 @@ u_char operator, float value) /* * We have an algorithm parameter which configures the order of IO for the - * fm operators, and a set of flags for key tracking per operator. + * FM operators, and a set of flags for key tracking per operator. */ op = operator / 10; index = operator - (op * 10); @@ -123,7 +123,7 @@ u_char operator, float value) break; case 3: /* - * Configure cont controller 1 to adust IGAIN. + * Configure cont controller 1 to adjust IGAIN. */ if (value == 0) mix[op].flags &= ~DX_IGC; @@ -439,7 +439,7 @@ DXalgoN(audioMain *am, register Baudio *ba, bristolVoice *voice, float *kb) break; case 8: /* - * Op0 and op1 feed op2, and ops 3 to 6 feed eachother. + * Op0 and op1 feed op2, and ops 3 to 6 feed each other. */ dxOpOne(0, kb, op0buf, op1buf, sc, mix, am, ba, voice); dxOpOne(1, kb, op1buf, op0buf, sc, mix, am, ba, voice); diff --git a/bristol/bristolexplorer.c b/bristol/bristolexplorer.c index 00a2d2e..1708f67 100644 --- a/bristol/bristolexplorer.c +++ b/bristol/bristolexplorer.c @@ -529,7 +529,7 @@ bristolVoice *voice, register float *startbuf) * about 400 times. * * Frequency of OSC-3 without keyboard control is under management of - * midi continuous controller 1. + * MIDI continuous controller 1. */ for (i = 0; i < samplecount; i+=8) { diff --git a/bristol/bristolgranular.c b/bristol/bristolgranular.c index c94c6c0..0398a0e 100644 --- a/bristol/bristolgranular.c +++ b/bristol/bristolgranular.c @@ -22,12 +22,12 @@ * This will be a granular synthesiser. We need to build an efficient method to * generate a potentially very large number of grains, each of which will take * - * a gain curve, initially an inverted, normalised cosine or gaussian envelope + * a gain curve, initially an inverted, normalised cosine or Gaussian envelope * a wave table * * The wavetable will be resampled to a given frequency at some extraction of * the given note, and its gain will be defined by a multiple of the resampled - * gain curve. The multiple will be partially randomised by parameterisation. + * gain curve. The multiple will be partially randomised by parametrisation. * We should allow for glissando of the waveforms. Grain time shall be from 2 * to 100ms. * diff --git a/bristol/bristolhammond.c b/bristol/bristolhammond.c index 45391e5..cdd8513 100644 --- a/bristol/bristolhammond.c +++ b/bristol/bristolhammond.c @@ -62,7 +62,7 @@ u_char operator, float value) * Need to put some logic in here for start/stop. It is easy * enough to migrate the speed to some ridiculously slow * amount such that the leslie does not appear to rotate, but - * then we also need to get it kickstarted afterwards. + * then we also need to get it kick-started afterwards. */ baudio->effect[1]->param->param[operator].int_val = 515 - value * 512; diff --git a/bristol/bristoljuno.c b/bristol/bristoljuno.c index 676b29b..867930e 100644 --- a/bristol/bristoljuno.c +++ b/bristol/bristoljuno.c @@ -328,7 +328,7 @@ bristolVoice *voice, register float *startbuf) ((jmods *) baudio->mixlocals)->lfolocals); /* - * And amplifly it + * And amplify it */ audiomain->palette[(*baudio->sound[8]).index]->specs->io[0].buf = oscabuf; audiomain->palette[(*baudio->sound[8]).index]->specs->io[1].buf = adsrbuf; diff --git a/bristol/bristoljuno.h b/bristol/bristoljuno.h index 4f20b77..863bd78 100644 --- a/bristol/bristoljuno.h +++ b/bristol/bristoljuno.h @@ -21,6 +21,6 @@ #define J_LFO_MAN 0x0001 #define HAVE_STARTED 0x0002 -#define HAVE_FINNISHED 0x0004 +#define HAVE_FINISHED 0x0004 #define J_LFO_AUTO 0x0008 diff --git a/bristol/bristoljupiter.c b/bristol/bristoljupiter.c index 1472acd..56ae9f0 100644 --- a/bristol/bristoljupiter.c +++ b/bristol/bristoljupiter.c @@ -166,7 +166,7 @@ u_char controller, float value) break; case 6: /* - * This is a correct midi paninng calculation roughly as taken from + * This is a correct MIDI panning calculation roughly as taken from * MMA corrective notes for stereo panning. It does not work * too well for an L/R mix though as it applies a constant power * algorithm and gets very unbalanced at full throws. diff --git a/bristol/bristolmm.c b/bristol/bristolmm.c index 12bbf7e..9f1dd15 100644 --- a/bristol/bristolmm.c +++ b/bristol/bristolmm.c @@ -259,7 +259,7 @@ bristolVoice *voice, register float *startbuf) * about 400 times. * * Frequency of OSC-3 without keyboard control is under management of - * midi continuous controller 1. + * MIDI continuous controller 1. */ for (i = 0; i < samplecount; i+=8) { diff --git a/bristol/bristolobx.h b/bristol/bristolobx.h index 8c078e9..666d0a3 100644 --- a/bristol/bristolobx.h +++ b/bristol/bristolobx.h @@ -23,7 +23,7 @@ /* * Have to watch out here, mixflags are also used globally in the range - * 0xffff0000.00000000 for midi ops, we can use the rest in the algo though. + * 0xffff0000.00000000 for MIDI ops, we can use the rest in the algo though. */ #define O_S_H 0x00000002ULL #define O_FREQ_1 0x00000004ULL diff --git a/bristol/bristolodyssey.c b/bristol/bristolodyssey.c index 98f38e3..ef296b3 100644 --- a/bristol/bristolodyssey.c +++ b/bristol/bristolodyssey.c @@ -25,7 +25,7 @@ * Due to the complex routing here, there will be some odd effects of voice * cross modulation, especially using a lot of SHMix information - the mix * may come from a previously sounded voice for this synth, there is not other - * way to have a device modulate itself currently. It could be extende to use + * way to have a device modulate itself currently. It could be extended to use * per voice buffers, but this is FFS. Mono operation should be correct. */ @@ -434,7 +434,7 @@ bristolVoice *voice, register float *startbuf) bristolbzero(filtbuf, audiomain->segmentsize); /* * There are a lot of mods in this synth, each operator will produce its - * output buffer, and then they will modulate eachother. + * output buffer, and then they will modulate each other. * * Noise is done, run the LFO and ADSR. */ diff --git a/bristol/bristolpoly.c b/bristol/bristolpoly.c index edcfdb6..cb79948 100644 --- a/bristol/bristolpoly.c +++ b/bristol/bristolpoly.c @@ -234,7 +234,7 @@ polyController(Baudio *baudio, u_char operator, u_char controller, float value) * Chord will operate in different modes. There will be MONO chord * which will accept 4 notes and hold them, and transpose them * for each keypress. In Poly mode will arpeggiate between the - * notes for cheesey 80's style arpeg and transpose the arpeggiation + * notes for cheesy 80's style arpeg and transpose the arpeggiation * with new notes. In share mode will just rotate through the notes * accepting each onto the next in the sequence. */ @@ -309,7 +309,7 @@ polyNoteOn(audioMain *audiomain, Baudio *baudio, bristolVoice *voice) * Do transpose stuff, etc. Three modes of operation: * * MONO: accept 4 notes and hold them, and transpose them. - * SHARE: arpeggiate between the notes for cheesey 80's style arpeg. + * SHARE: arpeggiate between the notes for cheesy 80's style arpeg. * POLY: rotate through the notes accepting each. */ if (baudio->mixflags & (P_UNISON|P_SHARE)) { @@ -396,7 +396,7 @@ polyNoteOn(audioMain *audiomain, Baudio *baudio, bristolVoice *voice) } /* - * If this is after the first voice then clear the trigger if nec. + * If this is after the first voice then clear the trigger if necessary. */ if (((baudio->mixflags & P_MULTI) == 0) && (i > 0)) voice->flags &= ~(BRISTOL_KEYON|BRISTOL_KEYREON); @@ -414,7 +414,7 @@ polyNoteOn(audioMain *audiomain, Baudio *baudio, bristolVoice *voice) mods->keydata[i].lastkey = voice->lastkey; /* - * If this is after the first voice then clear the trigger if nec. + * If this is after the first voice then clear the trigger if necessary. */ if (((baudio->mixflags & P_MULTI) == 0) && (i > 1)) voice->flags &= ~(BRISTOL_KEYON|BRISTOL_KEYREON); @@ -642,7 +642,7 @@ polyNoteOff(audioMain *audiomain, Baudio *baudio, bristolVoice *voice) pmods *mods = ((pmods *) baudio->mixlocals); int i = 0; -#warning issues here if we have two midi events between frames +#warning issues here if we have two MIDI events between frames /* * Find out how many keys are on */ @@ -1354,7 +1354,7 @@ bristolVoice *voice, register float *startbuf) /* Arpeggiated mixer. */ /* * Take each osc buf and mix into leftbuf ready for filter. We need to - * consider what do to with argep at this point, since if we are chorded + * consider what do to with arpeg at this point, since if we are chorded * the only selected oscillators may actually voice. */ if (baudio->mixflags & P_CHORD) diff --git a/bristol/bristolpoly.h b/bristol/bristolpoly.h index 136ef7f..f293edd 100644 --- a/bristol/bristolpoly.h +++ b/bristol/bristolpoly.h @@ -50,7 +50,7 @@ /* * Have to watch out here, mixflags are also used globally in the range - * 0xffff0000.00000000 for midi ops, we can use the rest in the algo though. + * 0xffff0000.00000000 for MIDI ops, we can use the rest in the algo though. * * These need to go into some local structure for multiple instances * of the poly - malloc()ed into the baudio->mixlocals. diff --git a/bristol/bristolpoly6.c b/bristol/bristolpoly6.c index 096d894..98a8ae2 100644 --- a/bristol/bristolpoly6.c +++ b/bristol/bristolpoly6.c @@ -219,7 +219,7 @@ bristolVoice *voice, register float *startbuf) ((p6mods *) baudio->mixlocals)->lfolocals); /* - * And amplifly it for the delay. + * And amplify it for the delay. */ audiomain->palette[(*baudio->sound[9]).index]->specs->io[0].buf = lfobuf; audiomain->palette[(*baudio->sound[9]).index]->specs->io[1].buf = adsrbuf; diff --git a/bristol/bristolpoly6.h b/bristol/bristolpoly6.h index 62cf148..f3c41ab 100644 --- a/bristol/bristolpoly6.h +++ b/bristol/bristolpoly6.h @@ -21,7 +21,7 @@ #define P6_PWM 0x0001 #define HAVE_STARTED 0x0002 -#define HAVE_FINNISHED 0x0004 +#define HAVE_FINISHED 0x0004 #define P6_M_VCO 0x0008 #define P6_M_VCA 0x0010 #define P6_M_VCF 0x0020 diff --git a/bristol/bristolpoly800.c b/bristol/bristolpoly800.c index 8a35e12..82ebc3b 100644 --- a/bristol/bristolpoly800.c +++ b/bristol/bristolpoly800.c @@ -427,7 +427,7 @@ bristolVoice *voice, register float *startbuf) if (baudio->mixflags & P800_SYNC) { /* - * If sync is enabled then the LFO was not fead into DCO1 but we + * If sync is enabled then the LFO was not fed into DCO1 but we * do want it in DCO-2 for sync modulations. It is still possible * to get vibrato on DCO1 with sync but it requires the joystick. */ diff --git a/bristol/bristolpoly800.h b/bristol/bristolpoly800.h index 73b52ab..61f008c 100644 --- a/bristol/bristolpoly800.h +++ b/bristol/bristolpoly800.h @@ -23,7 +23,7 @@ #define P800_PWM 0x0001 #define HAVE_STARTED 0x0002 -#define HAVE_FINNISHED 0x0004 +#define HAVE_FINISHED 0x0004 #define P800_M_VCO 0x0010 #define P800_M_VCA 0x0020 diff --git a/bristol/bristolprophet.c b/bristol/bristolprophet.c index 4420890..91f1ad4 100644 --- a/bristol/bristolprophet.c +++ b/bristol/bristolprophet.c @@ -27,7 +27,7 @@ /* * Use of these prophet global buffers will be an issue with use of multiple * audio threads, unless we ensure a single thread deals with any given algo - * type, since then they are only used sequencially. + * type, since then they are only used sequentially. * * These should really be hidden in the pMods structure for multiple instances. */ @@ -88,7 +88,7 @@ float value) break; case 4: /* - * Release all notes - issue for midi interface? + * Release all notes - issue for MIDI interface? */ break; case 5: @@ -466,7 +466,7 @@ bristolVoice *voice, register float *startbuf) /* * This needs to be fixed however I cannot test it right now: * The ADSR should be amplified in as a function of the voice frequency - * so that it is constand for every note and can then stay in tune. + * so that it is constant for every note and can then stay in tune. */ #warning adsr2osca needs amplification by frequency bufmerge(adsrbuf, 0.04 * ((pmods *) baudio->mixlocals)->pm_filtenv, diff --git a/bristol/bristolprophet1.c b/bristol/bristolprophet1.c index 60df5dd..168b4fa 100644 --- a/bristol/bristolprophet1.c +++ b/bristol/bristolprophet1.c @@ -27,7 +27,7 @@ /* * Use of these pro1 global buffers will be an issue with use of multiple * audio threads, unless we ensure a single thread deals with any given algo - * type, since then they are only used sequencially. + * type, since then they are only used sequentially. * * These should really be hidden in the pMods structure for multiple instances. */ @@ -401,7 +401,7 @@ bristolVoice *voice, register float *startbuf) /* * This needs to be fixed however I cannot test it right now: * The ADSR should be amplified in as a function of the voice frequency - * so that it is constand for every note and can then stay in tune. + * so that it is constant for every note and can then stay in tune. */ #warning osc mod needs amplification by frequency if (baudio->mixflags & P1_OSCB_F_WM) diff --git a/bristol/bristolroadrunner.c b/bristol/bristolroadrunner.c index f7d7256..f722db4 100644 --- a/bristol/bristolroadrunner.c +++ b/bristol/bristolroadrunner.c @@ -113,7 +113,7 @@ baudio->effect[0]->param->param[5].float_val); ((roadrunnermods *) baudio->mixlocals)->vibrato = value * 0.25; break; case 8: - ((roadrunnermods *) baudio->mixlocals)->tremelo = value; + ((roadrunnermods *) baudio->mixlocals)->tremolo = value; break; case 10: if (value == 0) @@ -335,7 +335,7 @@ bristolVoice *voice, register float *startbuf) audiomain->palette[(*baudio->sound[4]).index]->specs->io[2].buf = baudio->leftbuf; - bufmerge(lfobuf, mods->tremelo, freqbuf, 1.0, samplecount); + bufmerge(lfobuf, mods->tremolo, freqbuf, 1.0, samplecount); (*baudio->sound[4]).operate( (audiomain->palette)[2], diff --git a/bristol/bristolsampler.c b/bristol/bristolsampler.c index d462731..328105e 100644 --- a/bristol/bristolsampler.c +++ b/bristol/bristolsampler.c @@ -27,7 +27,7 @@ /* * Use of these sampler global buffers will be an issue with use of multiple * audio threads, unless we ensure a single thread deals with any given algo - * type, since then they are only used sequencially. + * type, since then they are only used sequentially. */ static float *freqbuf = (float *) NULL; static float *pmodbuf = (float *) NULL; @@ -305,7 +305,7 @@ bristolVoice *voice, register float *startbuf) ((jmods *) baudio->mixlocals)->lfolocals); /* - * And amplifly it + * And amplify it */ audiomain->palette[(*baudio->sound[8]).index]->specs->io[0].buf = oscabuf; audiomain->palette[(*baudio->sound[8]).index]->specs->io[1].buf = adsrbuf; diff --git a/bristol/bristolsampler.h b/bristol/bristolsampler.h index 4f20b77..863bd78 100644 --- a/bristol/bristolsampler.h +++ b/bristol/bristolsampler.h @@ -21,6 +21,6 @@ #define J_LFO_MAN 0x0001 #define HAVE_STARTED 0x0002 -#define HAVE_FINNISHED 0x0004 +#define HAVE_FINISHED 0x0004 #define J_LFO_AUTO 0x0008 diff --git a/bristol/bristolsid1.c b/bristol/bristolsid1.c index e23c4eb..558f040 100644 --- a/bristol/bristolsid1.c +++ b/bristol/bristolsid1.c @@ -435,7 +435,7 @@ sidController(Baudio *baudio, u_char operator, u_char controller, float value) * sample and hold on the noise that comes out of the MOD_SID * analogue IO * - * The GUI is responsable for ensuring the square wave is correctly + * The GUI is responsible for ensuring the square wave is correctly * selected. */ sidflag(smods, MOD_SID, B_SID_V3_CONTROL, B_SID_V_SQUARE, ivalue); @@ -490,7 +490,7 @@ sidController(Baudio *baudio, u_char operator, u_char controller, float value) /* LFO mod rate and level */ case 77: /* - * Need to generate phase incrementor for 0.1 to 10 Hz, note here + * Need to generate phase incrementer for 0.1 to 10 Hz, note here * that the resolution at these low frequencies is not great. * * Phase for 0.1Hz is 0.1 * B_SID_FREQ_MULT = 1.6777216 @@ -762,8 +762,8 @@ sidAssignVoice(sidmods *smods, int voice, int flags) * If we have less than 3 voices assigned just look for the next free voice. * If not look for the middle note. * - * flag voice as occupying this midi note, - * flag the midi note as known, + * flag voice as occupying this MIDI note, + * flag the MIDI note as known, */ static void sidPoly1NoteLogic(Baudio *baudio, sidmods *smods) @@ -800,7 +800,7 @@ sidPoly1NoteLogic(Baudio *baudio, sidmods *smods) /* * This will be poly. We cannot use the KEYON flags since we are in * mono mode but probably also want to actually see other notes being - * pressed, our monophonic note logic supresses events for notes outside + * pressed, our monophonic note logic suppresses events for notes outside * of the preference however they are still kept in the note mapping * table, we need to look at that. * @@ -890,7 +890,7 @@ sidPoly1NoteLogic(Baudio *baudio, sidmods *smods) * all the voices have the same sounds. What we want to do is try * to ensure that if we have keys pressed that we attempt to use * the voices and for now we will do that irrespective of the mode - * since three voices is pretty spartan. + * since three voices is pretty Spartan. */ if (fv >= B_SID_VOICE_1) for (j = 128; j > 0; j--) @@ -1178,16 +1178,16 @@ sidCheckModTrigger(sidmods *smods) /* * We have monophonic voice assignment, ie, this should only be called once * although that can be overridden with options. We are not too concerned with - * the midi note logic giving us its idea of which note we should be playing, - * we have 'n' voices, 3 to start with, and some note assignement logic: + * the MIDI note logic giving us its idea of which note we should be playing, + * we have 'n' voices, 3 to start with, and some note assignment logic: * * Mono: assign all voices to the suggested key * Poly-1: all voices will have the same sound, 3 voices. GUI to enforce this. * Poly-2: each voice can have its own sound, 3 voices. * Poly-3: two lead voices, rest of notes have rapid arpeggiation * - * We need to keep a mapping of midi note to voice allocation and also of voice - * to midi note for tuning so there will be a few numbers hanging around in + * We need to keep a mapping of MIDI note to voice allocation and also of voice + * to MIDI note for tuning so there will be a few numbers hanging around in * different tables. If a voice gets a new frequency then it should also be * given a GATE off/on to trigger the env. Poly note logic in 3 voice mode * should not take the extreme notes, it should take middle ones. @@ -1195,7 +1195,7 @@ sidCheckModTrigger(sidmods *smods) * The code should be written with multiple SID in mind. The first release had * two SID: one for 3 audio voices and another for mods. It would be quite * easy to have generalised this to 5 voices with one for mod and the two - * filter under commmon control. This should be considered for the poly modes, + * filter under common control. This should be considered for the poly modes, * mono is probably already enough with 3 voices and up to 9 oscillators. */ int diff --git a/bristol/bristolsid2.c b/bristol/bristolsid2.c index 786e9d4..c7cbcd6 100644 --- a/bristol/bristolsid2.c +++ b/bristol/bristolsid2.c @@ -435,7 +435,7 @@ sid2Controller(Baudio *baudio, u_char operator, u_char controller, float value) * sample and hold on the noise that comes out of the MOD_SID * analogue IO * - * The GUI is responsable for ensuring the square wave is correctly + * The GUI is responsible for ensuring the square wave is correctly * selected. */ sid2flag(smods, MOD_SID, B_SID_V3_CONTROL, B_SID_V_SQUARE, ivalue); @@ -490,7 +490,7 @@ sid2Controller(Baudio *baudio, u_char operator, u_char controller, float value) /* LFO mod rate and level */ case 77: /* - * Need to generate phase incrementor for 0.1 to 10 Hz, note here + * Need to generate phase incrementer for 0.1 to 10 Hz, note here * that the resolution at these low frequencies is not great. * * Phase for 0.1Hz is 0.1 * B_SID_FREQ_MULT = 1.6777216 @@ -762,8 +762,8 @@ sid2AssignVoice(sid2mods *smods, int voice, int flags) * If we have less than 3 voices assigned just look for the next free voice. * If not look for the middle note. * - * flag voice as occupying this midi note, - * flag the midi note as known, + * flag voice as occupying this MIDI note, + * flag the MIDI note as known, */ static void sid2Poly1NoteLogic(Baudio *baudio, sid2mods *smods) @@ -800,7 +800,7 @@ sid2Poly1NoteLogic(Baudio *baudio, sid2mods *smods) /* * This will be poly. We cannot use the KEYON flags since we are in * mono mode but probably also want to actually see other notes being - * pressed, our monophonic note logic supresses events for notes outsid2e + * pressed, our monophonic note logic suppresses events for notes outside * of the preference however they are still kept in the note mapping * table, we need to look at that. * @@ -884,13 +884,13 @@ sid2Poly1NoteLogic(Baudio *baudio, sid2mods *smods) smods->ccount = 0; /* - * We should also consid2er what could be done if ccount was three + * We should also consider what could be done if ccount was three * and falls such that we could reassign a key back to another note * that was pre-empted. We can only really do this in Poly-1 where * all the voices have the same sounds. What we want to do is try * to ensure that if we have keys pressed that we attempt to use * the voices and for now we will do that irrespective of the mode - * since three voices is pretty spartan. + * since three voices is pretty Spartan. */ if (fv >= B_SID_VOICE_1) for (j = 128; j > 0; j--) @@ -916,7 +916,7 @@ sid2Poly1NoteLogic(Baudio *baudio, sid2mods *smods) /* * Take a fixed split point, below this point stuff the arpeggiation table, - * above this point use duophonic note preference - we should consid2er always + * above this point use duophonic note preference - we should consider always * having the voices active if there is a note pressed, acting as a monophonic * with two voices where there is only one note. */ @@ -1013,7 +1013,7 @@ sid2Poly3NoteLogic(Baudio *baudio, sid2mods *smods) /* * Take a fixed split point, below this point stuff the arpeggiation table, - * above this point use duophonic note preference - we should consid2er always + * above this point use duophonic note preference - we should consider always * having the voices active if there is a note pressed, acting as a monophonic * with two voices where there is only one note. */ @@ -1178,16 +1178,16 @@ sid2CheckModTrigger(sid2mods *smods) /* * We have monophonic voice assignment, ie, this should only be called once * although that can be overridden with options. We are not too concerned with - * the midi note logic giving us its idea of which note we should be playing, - * we have 'n' voices, 3 to start with, and some note assignement logic: + * the MIDI note logic giving us its idea of which note we should be playing, + * we have 'n' voices, 3 to start with, and some note assignment logic: * * Mono: assign all voices to the suggested key * Poly-1: all voices will have the same sound, 3 voices. GUI to enforce this. * Poly-2: each voice can have its own sound, 3 voices. * Poly-3: two lead voices, rest of notes have rapid arpeggiation * - * We need to keep a mapping of midi note to voice allocation and also of voice - * to midi note for tuning so there will be a few numbers hanging around in + * We need to keep a mapping of MIDI note to voice allocation and also of voice + * to MIDI note for tuning so there will be a few numbers hanging around in * different tables. If a voice gets a new frequency then it should also be * given a GATE off/on to trigger the env. Poly note logic in 3 voice mode * should not take the extreme notes, it should take middle ones. @@ -1195,7 +1195,7 @@ sid2CheckModTrigger(sid2mods *smods) * The code should be written with multiple SID in mind. The first release had * two SID: one for 3 audio voices and another for mods. It would be quite * easy to have generalised this to 5 voices with one for mod and the two - * filter under commmon control. This should be consid2ered for the poly modes, + * filter under common control. This should be considered for the poly modes, * mono is probably already enough with 3 voices and up to 9 oscillators. */ int diff --git a/bristol/bristolsolina.c b/bristol/bristolsolina.c index 1ed7667..ccdf6c8 100644 --- a/bristol/bristolsolina.c +++ b/bristol/bristolsolina.c @@ -112,7 +112,7 @@ baudio->effect[0]->param->param[5].float_val); ((solinamods *) baudio->mixlocals)->vibrato = value / 128; break; case 8: - ((solinamods *) baudio->mixlocals)->tremelo = value / 8; + ((solinamods *) baudio->mixlocals)->tremolo = value / 8; break; case 10: if (value == 0) @@ -313,7 +313,7 @@ bristolVoice *voice, register float *startbuf) audiomain->palette[(*baudio->sound[4]).index]->specs->io[2].buf = baudio->leftbuf; - bufmerge(lfobuf, mods->tremelo, freqbuf, 1.0, samplecount); + bufmerge(lfobuf, mods->tremolo, freqbuf, 1.0, samplecount); (*baudio->sound[4]).operate( (audiomain->palette)[2], diff --git a/bristol/bristolsystem.c b/bristol/bristolsystem.c index 25f5edc..1823b4f 100644 --- a/bristol/bristolsystem.c +++ b/bristol/bristolsystem.c @@ -95,9 +95,9 @@ bristolSystem(audioMain *audiomain, bristolMidiMsg *msg) { int x, y; /* - * When we get a hello we need to suppress midi processing for a + * When we get a hello we need to suppress MIDI processing for a * period of time whilst the new emulator is activated. It will be - * reactivated when the algorithm has initted later. + * reactivated when the algorithm has init'ed later. */ bristolMidiOption(0, BRISTOL_NRP_MIDI_GO, 0); @@ -317,10 +317,10 @@ bristolSystem(audioMain *audiomain, bristolMidiMsg *msg) /* * It looks like this should be called first however we do - * still need the audio thread to be called by jack for the + * still need the audio thread to be called by JACK for the * time being: the audio thread has do clean its stuff up * before exit. When it has done its cleanup it returns to - * jack immediately if the audiolist is empty so now we can + * JACK immediately if the audiolist is empty so now we can * unregister the interface and clean up the rest of the * app */ @@ -385,7 +385,7 @@ bristolSystem(audioMain *audiomain, bristolMidiMsg *msg) baudio->transpose = ((int) (BRISTOL_PARAMMASK & flags)) - 24; if (baudio->midiflags & BRISTOL_MIDI_DEBUG1) - printf("tranpose now %i\n", baudio->transpose); + printf("transpose now %i\n", baudio->transpose); break; } @@ -486,7 +486,7 @@ bristolSystem(audioMain *audiomain, bristolMidiMsg *msg) printf("cont 2: %i: res %i\n", msg->params.bristol.from, result); /* - * return a message, with the controlid assumably at the head + * return a message, with the controlid assumedly at the head * of the playlist - we have just created it. msg->params.bristol.valueLSB = result; bristolMidiPrint(msg); diff --git a/bristol/bristoltrilogy.c b/bristol/bristoltrilogy.c index 1d260bc..3a9408a 100644 --- a/bristol/bristoltrilogy.c +++ b/bristol/bristoltrilogy.c @@ -186,7 +186,7 @@ u_char operator, float value) baudio->mixflags |= FILTER_PEDAL; break; case 27: - /* Velocitry tracking in emulator or envelope */ + /* Velocity tracking in emulator or envelope */ if (ivalue == 0) baudio->mixflags |= TOUCH_SENSE; else diff --git a/bristol/bristolvox.c b/bristol/bristolvox.c index a806c47..774fe75 100644 --- a/bristol/bristolvox.c +++ b/bristol/bristolvox.c @@ -241,7 +241,7 @@ bristolVoice *voice, register float *startbuf) bufmerge(vbuf, 1.0, outbuf, 1.0, audiomain->samplecount); } else { /* - * Ryn yhe bass oscillator. We should consider changing this to just + * Run the bass oscillator. We should consider changing this to just * run in the postops, picking up the first available voice below midi * note 48, that way it would be monophonic and we could apply the * bass envelope quite easily. diff --git a/bristol/click.h b/bristol/click.h index ff65117..8a1f9a1 100644 --- a/bristol/click.h +++ b/bristol/click.h @@ -20,7 +20,7 @@ */ /* - * We shoudl try and document roughly what each click is taken from: the kind + * We should try and document roughly what each click is taken from: the kind * of signal. We have clicks, shelves and samples here but none are very * specific. */ diff --git a/bristol/cs80env.c b/bristol/cs80env.c index 0ea7338..b77529f 100644 --- a/bristol/cs80env.c +++ b/bristol/cs80env.c @@ -337,7 +337,7 @@ cs80envinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; diff --git a/bristol/cs80osc.c b/bristol/cs80osc.c index 89a0db8..4a5e3e8 100644 --- a/bristol/cs80osc.c +++ b/bristol/cs80osc.c @@ -171,9 +171,9 @@ printf("cs80oscparam(%i, %f) %i\n", index, value, ival); * but the ramp is on/off from GUI (with extended option). PWM will be * generated on the fly with a small detune. * - * There will be two levels of brilliance for two consequetive octaves + * There will be two levels of brilliance for two consecutive octaves * each with configurable level then affected by brilliance which is - * inherrited from the emulation code in bristolcs80.c + * inherited from the emulation code in bristolcs80.c * * Transpose will include sweeps of 16, 8, 5 1/3, 4, 2 2/3 and 2 octave * which are multipliers 1, 2, 3, 4, 6, 8. @@ -348,7 +348,7 @@ register int count) * count. * gain. * - * This oscillator is going to have 4 continous controllers for the signal + * This oscillator is going to have 4 continuous controllers for the signal * strengths of the different harmonics, 32/16/8/4. It will have different * gain levels for the tri and ramp waves. Finally the phase shifting pulse * wave will function probably on the lowest selected harmonic at first since @@ -475,7 +475,7 @@ cs80oscinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; diff --git a/bristol/dca.c b/bristol/dca.c index 86bf047..93b3bd9 100644 --- a/bristol/dca.c +++ b/bristol/dca.c @@ -168,7 +168,7 @@ dcainit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; diff --git a/bristol/dco.c b/bristol/dco.c index 5d1c0e3..1b4eccc 100644 --- a/bristol/dco.c +++ b/bristol/dco.c @@ -330,7 +330,7 @@ dcoinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; @@ -561,7 +561,7 @@ fillWave(float *mem, int count, int type) return; case 6: /* - * Tangiential wave. We limit some of the values, since they do get + * Tangential wave. We limit some of the values, since they do get * excessive. This is only half a tan as well, to maintain the * base frequency. * diff --git a/bristol/dimensionD.c b/bristol/dimensionD.c index e25fab6..5789606 100644 --- a/bristol/dimensionD.c +++ b/bristol/dimensionD.c @@ -142,11 +142,11 @@ static float table[TABSIZE]; * make this a resampling chorus. * * Extra parameters could be used to adjust the gain of both the original and - * the vibrato signal, and we could consider different scaning waveforms. The + * the vibrato signal, and we could consider different scanning waveforms. The * only one at the moment is a triangular which is close enough to sine, but a * front or back loaded tri wave would introduce some interesting leading and * trailing pumping effects, something that could be done by a factor that - * justs affects the ramp rate, applied +ve when ramping up and -ve when down. + * just affects the ramp rate, applied +ve when ramping up and -ve when down. */ static int operate(bristolOP *operator, bristolVoice *voice, @@ -318,7 +318,7 @@ chorusinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; diff --git a/bristol/dxop.c b/bristol/dxop.c index 32d2250..2c561c2 100644 --- a/bristol/dxop.c +++ b/bristol/dxop.c @@ -349,7 +349,7 @@ static int operate(bristolOP *operator, L2 = param->param[DXOP_L2].float_val; /* - * If the first level is zero, go into compatability mode, ADSR + * If the first level is zero, go into compatibility mode, ADSR */ if (L1 == 0.0) { @@ -561,7 +561,7 @@ static int operate(bristolOP *operator, cgain = 1.0; /* * Correctly spoken, each operator should set a flag to - * say that it has finneshed, and when all 6 have then we + * say that it has finished, and when all 6 have then we * can clear the voice. */ local->cstate = STATE_DONE; @@ -1005,7 +1005,7 @@ dxopinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; @@ -1246,7 +1246,7 @@ fillWave(float *mem, int count, int type) return; case 6: /* - * Tangiential wave. We limit some of the values, since they do get + * Tangential wave. We limit some of the values, since they do get * excessive. This is only half a tan as well, to maintain the * base frequency. */ diff --git a/bristol/electroswitch.c b/bristol/electroswitch.c index 8bdf2c7..3c5ad86 100644 --- a/bristol/electroswitch.c +++ b/bristol/electroswitch.c @@ -176,7 +176,7 @@ eswitchinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; diff --git a/bristol/env5stage.c b/bristol/env5stage.c index 9350e2a..2e2898b 100644 --- a/bristol/env5stage.c +++ b/bristol/env5stage.c @@ -336,8 +336,8 @@ param->param[LEVEL_4].float_val); } /* - * This smooths over key reassigments, channel or poly pressure changes - * where the target gain can jump noticably - our operational gain will + * This smooths over key reassignments, channel or poly pressure changes + * where the target gain can jump noticeably - our operational gain will * tend towards the target. It may cause a bit of breathing however that * is far preferable to ticking. */ @@ -383,7 +383,7 @@ env5stageinit(bristolOP **operator, int index, int sr, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; diff --git a/bristol/envelope.c b/bristol/envelope.c index c86d164..379140c 100644 --- a/bristol/envelope.c +++ b/bristol/envelope.c @@ -317,10 +317,10 @@ static int operate(register bristolOP *operator, bristolVoice *voice, local->cstate = STATE_ATTACK; /* - * This is for Jack Sample Accurate support. It is a compromise as I am + * This is for JACK Sample Accurate support. It is a compromise as I am * not a great fan of the feature: the envelope will delay its attack * event by the number of frames indicated in the voice offset, that - * offset is taken from the Jack event (it is zero for all other bristol + * offset is taken from the JACK event (it is zero for all other bristol * MIDI interface drivers). * * State changes will not be sample accurate in the first version - they @@ -573,7 +573,7 @@ envinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; diff --git a/bristol/expdco.c b/bristol/expdco.c index 48899d1..d16ae11 100644 --- a/bristol/expdco.c +++ b/bristol/expdco.c @@ -316,7 +316,7 @@ static int operate(bristolOP *operator, * Go jumping through the wavetable, with each jump defined by the value * given on our input line, making sure we fill one output buffer. * - * This is quite an intentive oscillator due to the requirements for + * This is quite an intensive oscillator due to the requirements for * waveform morphs ala PWM between different waves. */ for (obp = 0; obp < count; obp++) @@ -374,7 +374,7 @@ static int operate(bristolOP *operator, * gain2; } else if (wform <= 0.66) { /* - * Crossrade ramp into square, however I want the square to be + * Crossfade ramp into square, however I want the square to be * a difference of two ramps..... */ wt1 = param->param[3].mem; /* Triangular */ @@ -471,7 +471,7 @@ expdcoinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; @@ -601,7 +601,7 @@ fillPDsine(float *mem, int count, int compress) float j = 0, i, inc1, inc2; /* - * Resample the sine wave as per casio phase distortion algorithms. + * Resample the sine wave as per Casio phase distortion algorithms. * * We have to get to M_PI/2 in compress steps, hence * @@ -749,7 +749,7 @@ fillWave(float *mem, int count, int type) return; case 6: /* - * Tangiential wave. We limit some of the values, since they do get + * Tangential wave. We limit some of the values, since they do get * excessive. This is only half a tan as well, to maintain the * base frequency. */ diff --git a/bristol/filter.c b/bristol/filter.c index 351069c..019b9d3 100644 --- a/bristol/filter.c +++ b/bristol/filter.c @@ -39,7 +39,7 @@ */ /* * This implements three filter algorithms used by the different bristol - * emulations. These are a butterworth used by the leslie, a chamberlain + * emulations. These are a butterworth used by the leslie, a chamberlin * used generally, and a rooney used for some of the filter layering and * eventually the mixing. */ @@ -97,7 +97,7 @@ btanhf(int mode, float v) { /* * This should be 4 modes as we have two bit flags. Mode 1 are the real - * lightweight chamberlain. That is more work on flag checking. + * lightweight chamberlin. That is more work on flag checking. */ switch (mode) { case 0: return(v); @@ -112,7 +112,7 @@ btanhfeed(int mode, float v) { /* * This should be 4 modes as we have two bit flags. Mode 1 are the real - * lightweight chamberlain. That is more work on flag checking. + * lightweight chamberlin. That is more work on flag checking. */ switch (mode) { default: @@ -301,7 +301,7 @@ param(bristolOP *operator, bristolOPParams *param, float floatvalue = ((float) param->param[0].int_val) / CONTROLLER_RANGE; - printf("Selected chamberlain filter\n"); + printf("Selected chamberlin filter\n"); param->param[index].int_val = 0; param->param[0].float_val = floatvalue / 3; @@ -338,7 +338,7 @@ register float gain, register int count) /* Filter loop */ /* * This looks odd being global however it is for denormal reduction, we inject - * a stupidly small amount of noise into the houvilainen filter to give is some + * a stupidly small amount of noise into the huovilainen filter to give is some * constant signal. The noise algorithm will work over multiple voices with no * detrimental effect. */ @@ -367,7 +367,7 @@ static int operate(register bristolOP *operator, bristolVoice *voice, /* * Every operator accesses these variables, the count, and a pointer to - * each buffer. We should consider passing them as readymade parameters? + * each buffer. We should consider passing them as ready-made parameters? * * The Filter now takes normalised inputs, in ranges of 12PO. */ @@ -456,7 +456,7 @@ static int operate(register bristolOP *operator, bristolVoice *voice, /* * Find out our current BLim. We have a specified limit, the - * cuttoff. We have our mod signal, and an amount of that mod + * cutoff. We have our mod signal, and an amount of that mod * signal. The ADSR produces a value between 0.0 and 1.0, so we * could add this to BLim? * @@ -567,7 +567,7 @@ static int operate(register bristolOP *operator, bristolVoice *voice, * historically they have used 1.0 per octave rather than +/-1.0). * * This one does not oversample - if the cutoff does not approach - * nyquist then we do not have to correct for its inaccuracies. + * Nyquist then we do not have to correct for its inaccuracies. */ float az1 = local->az1; float az2 = local->az2; @@ -596,16 +596,16 @@ static int operate(register bristolOP *operator, bristolVoice *voice, * the key is used for tracking purposes, it should be possible to make * it reasonably linear at somewhere under unity * - * Cutoff goes from 0 to 1.0 = nyquist. Key tracking should be reviewed, + * Cutoff goes from 0 to 1.0 = Nyquist. Key tracking should be reviewed, * the value should be quite linear for the filter, 0..Nyquist * - * If we take midi key 0 = 8Hz and 127 = 12658.22 Hz then using + * If we take MIDI key 0 = 8Hz and 127 = 12658.22 Hz then using * our samplerate we should be able to fix some tuning: * * (voice->key.key * 12650.22 + 8) / (127 * srate) * * We want to position param[3] such that it tunes at 0.5 and can then - * be notched in the GUI, hence srate/4 rathern than /2. + * be notched in the GUI, hence srate/4 rather than /2. * * Needed some changes to key tracking, it was a bit bipolar. coff = (param->param[0].float_val * param->param[0].float_val) @@ -644,7 +644,7 @@ static int operate(register bristolOP *operator, bristolVoice *voice, * as the filter is 2x oversampling? * * We should really interpret coff (the configured frequency) as - * a function up to about 20KHz whatever the resampling rate. + * a function up to about 20kHz whatever the resampling rate. */ if ((kfc = coff + *mb++ * Mod) > lim) kfc = lim; @@ -723,16 +723,16 @@ static int operate(register bristolOP *operator, bristolVoice *voice, * the key is used for tracking purposes, it should be possible to make * it reasonably linear at somewhere under unity * - * Cutoff goes from 0 to 1.0 = nyquist. Key tracking should be reviewed, + * Cutoff goes from 0 to 1.0 = Nyquist. Key tracking should be reviewed, * the value should be quite linear for the filter, 0..Nyquist * - * If we take midi key 0 = 8Hz and 127 = 12658.22 Hz then using + * If we take MIDI key 0 = 8Hz and 127 = 12658.22 Hz then using * our samplerate we should be able to fix some tuning: * * (voice->key.key * 12650.22 + 8) / (127 * srate) * * We want to position param[3] such that it tunes at 0.5 and can then - * be notched in the GUI, hence srate/4 rathern than /2. + * be notched in the GUI, hence srate/4 rather than /2. * * Needed some changes to key tracking, it was a bit bipolar. coff = (param->param[0].float_val * param->param[0].float_val) @@ -769,7 +769,7 @@ static int operate(register bristolOP *operator, bristolVoice *voice, * as the filter is 2x oversampling? * * We should really interpret coff (the configured frequency) as - * a function up to about 20KHz whatever the resampling rate. + * a function up to about 20kHz whatever the resampling rate. */ if ((kfc = coff + *mb++ * Mod) > 0.5) kfc = 0.5; @@ -837,7 +837,7 @@ static int operate(register bristolOP *operator, bristolVoice *voice, local->amf = amf; } else { - /* The chamberlain */ + /* The chamberlin */ register float freqcut, highpass, qres, delay1 = local->delay1, delay2 = local->delay2, @@ -937,7 +937,7 @@ filterinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; @@ -990,7 +990,7 @@ filterinit(bristolOP **operator, int index, int samplerate, int samplecount) specs->spec.param[3].flags = BRISTOL_BUTTON; specs->spec.param[4].pname = "filter type"; - specs->spec.param[4].description = "Chamberlain or Rooney filter"; + specs->spec.param[4].description = "Chamberlin or Rooney filter"; specs->spec.param[4].type = BRISTOL_TOGGLE; specs->spec.param[4].low = 0; specs->spec.param[4].high = 1; diff --git a/bristol/filter2.c b/bristol/filter2.c index 22c3980..bc37cec 100644 --- a/bristol/filter2.c +++ b/bristol/filter2.c @@ -10,11 +10,11 @@ * (at your option) any later version. * * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; withuot even the implied warranty of + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You shuold have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program; if not, see . * */ @@ -41,17 +41,17 @@ * will be an output buffer written to the next operator. */ /* - * This is an overhaul of filter.c with a sperated set of algorithms: + * This is an overhaul of filter.c with a separated set of algorithms: * - * 0 Chamberlain 24dB LPF/HPF - lwf support and need HPF for now + * 0 Chamberlin 24dB LPF/HPF - lwf support and need HPF for now * * 1 Huovilainen 12dB LPF oversampling * 2 Huovilainen 24dB LPF oversampling and OBx remixing * 3 Huovilainen 24dB LPF oversampling and OBx remixing 2 * - * 4 Huovilainen 24dB LPF oversampling (4 is for interfuctioning with filter.c) + * 4 Huovilainen 24dB LPF oversampling (4 is for interfunctioning with filter.c) * - * Others will implement Huovilainen withuot oversampling, the oversampling + * Others will implement Huovilainen without oversampling, the oversampling * will be integrated into the engine. */ #include @@ -72,7 +72,7 @@ #define FILTER_MOD_IND 1 #define FILTER_OUT_IND 2 -/* This is ugly, we shuold correctly pull it out of the operator template */ +/* This is ugly, we should correctly pull it out of the operator template */ static float srate; #define _f_lim_r (20000 / (sr * 2)) /* Upper limit with resampling */ @@ -82,9 +82,9 @@ static float srate; /* * This is defined for the case that we find a more efficient polynomial - * expansion. It is more likely that the tanhf() get factored out thuogh. + * expansion. It is more likely that the tanhf() get factored out though. #define TANH tanhf - * We should put the nonlinear sqrt estimation versys tanhf under compilation + * We should put the non-linear sqrt estimation versus tanhf under compilation * control */ #define TANH(v) btanhf(mode, v) @@ -99,7 +99,7 @@ btanhf(int mode, float v) { /* * This should be 4 modes as we have two bit flags. Mode 1 are the real - * lightweight chamberlain. That is more work on flag checking. + * lightweight chamberlin. That is more work on flag checking. */ switch (mode) { case 0: return(v); @@ -114,7 +114,7 @@ btanhfeed(int mode, float v) { /* * This should be 4 modes as we have two bit flags. Mode 1 are the real - * lightweight chamberlain. That is more work on flag checking. + * lightweight chamberlin. That is more work on flag checking. */ switch (mode) { default: @@ -139,7 +139,7 @@ static int destroy(bristolOP *operator) bristolfree(operator->specs); /* - * Free any local memory. We shuold also free ourselves, since we did the + * Free any local memory. We should also free ourselves, since we did the * initial allocation. */ cleanup(operator); @@ -249,7 +249,7 @@ param(bristolOP *operator, bristolOPParams *param, float floatvalue = ((float) param->param[0].int_val) / CONTROLLER_RANGE; - printf("Selected chamberlain filter\n"); + printf("Selected chamberlin filter\n"); param->param[index].int_val = 0; param->param[0].float_val = floatvalue / 3; @@ -271,16 +271,16 @@ param(bristolOP *operator, bristolOPParams *param, } /* - * This shuold perhaps be re-implemented. The HPF and BPF components really do + * This should perhaps be re-implemented. The HPF and BPF components really do * not seem to respond that well and better versions are required for some of * the emulators. */ static int -chamberlain(float *ib, float *mb, float *ob, bristolOPParams *param, bristolFILTERlocal *local, bristolVoice *voice, int count) +chamberlin(float *ib, float *mb, float *ob, bristolOPParams *param, bristolFILTERlocal *local, bristolVoice *voice, int count) { register float Mod, gain, cutoff; - /* The chamberlain */ + /* The chamberlin */ register float freqcut, highpass, qres, delay1 = local->delay1, delay2 = local->delay2, @@ -404,19 +404,19 @@ huovilainen24(float *ib, float *mb, float *ob, bristolOPParams *param, bristolFI /* * Cutoff is a power curve for better control at lower frequencies and - * the key is used for tracking purposes, it shuold be possible to make + * the key is used for tracking purposes, it should be possible to make * it reasonably linear at somewhere under unity * - * Cutoff goes from 0 to 1.0 = nyquist. Key tracking shuold be reviewed, - * the value shuold be quite linear for the filter, 0..Nyquist + * Cutoff goes from 0 to 1.0 = Nyquist. Key tracking should be reviewed, + * the value should be quite linear for the filter, 0..Nyquist * - * If we take midi key 0 = 8Hz and 127 = 12658.22 Hz then using - * our samplerate we shuold be able to fix some tuning: + * If we take MIDI key 0 = 8Hz and 127 = 12658.22 Hz then using + * our samplerate we should be able to fix some tuning: * * (voice->key.key * 12650.22 + 8) / (127 * srate) * * We want to position param[3] such that it tunes at 0.5 and can then - * be notched in the GUI, hence srate/4 rathern than /2. + * be notched in the GUI, hence srate/4 rather than /2. * * This still needs some work. if (param->param[3].float_val == 0) @@ -432,7 +432,7 @@ huovilainen24(float *ib, float *mb, float *ob, bristolOPParams *param, bristolFI { /* * We should really interpret coff (the configured frequency) as - * a function up to about 20KHz whatever the resampling rate. + * a function up to about 20kHz whatever the resampling rate. */ if ((kfc = coff + *mb++ * Mod) > _f_lim) kfc = _f_lim; @@ -521,19 +521,19 @@ huovilainen24R(float *ib, float *mb, float *ob, bristolOPParams *param, bristolF /* * Cutoff is a power curve for better control at lower frequencies and - * the key is used for tracking purposes, it shuold be possible to make + * the key is used for tracking purposes, it should be possible to make * it reasonably linear at somewhere under unity * - * Cutoff goes from 0 to 1.0 = nyquist. Key tracking shuold be reviewed, - * the value shuold be quite linear for the filter, 0..Nyquist + * Cutoff goes from 0 to 1.0 = Nyquist. Key tracking should be reviewed, + * the value should be quite linear for the filter, 0..Nyquist * - * If we take midi key 0 = 8Hz and 127 = 12658.22 Hz then using - * our samplerate we shuold be able to fix some tuning: + * If we take MIDI key 0 = 8Hz and 127 = 12658.22 Hz then using + * our samplerate we should be able to fix some tuning: * * (voice->key.key * 12650.22 + 8) / (127 * srate) * * We want to position param[3] such that it tunes at 0.5 and can then - * be notched in the GUI, hence srate/4 rathern than /2. + * be notched in the GUI, hence srate/4 rather than /2. * * This still needs some work. if (param->param[3].float_val == 0) @@ -548,8 +548,8 @@ huovilainen24R(float *ib, float *mb, float *ob, bristolOPParams *param, bristolF for (; count > 0; count--) { /* - * We shuold really interpret coff (the configured frequency) as - * a function up to about 20KHz whatever the resampling rate. + * We should really interpret coff (the configured frequency) as + * a function up to about 20kHz whatever the resampling rate. */ if ((kfc = coff + *mb++ * Mod) > _f_lim_r) kfc = _f_lim_r; @@ -630,7 +630,7 @@ huovilainen12R(float *ib, float *mb, float *ob, bristolOPParams *param, bristolF * This is actually the same code as 24R just the 12dB and 18dB taps are * mixed back into the final output. This was an Oberheim filter mod that * did not actually go into any of their products due to the added - * complexity of an analogue implementation. It shuold be generally richer + * complexity of an analogue implementation. It should be generally richer * due to more phase differences and content. */ float az1 = local->az1; @@ -660,19 +660,19 @@ huovilainen12R(float *ib, float *mb, float *ob, bristolOPParams *param, bristolF /* * Cutoff is a power curve for better control at lower frequencies and - * the key is used for tracking purposes, it shuold be possible to make + * the key is used for tracking purposes, it should be possible to make * it reasonably linear at somewhere under unity * - * Cutoff goes from 0 to 1.0 = nyquist. Key tracking shuold be reviewed, - * the value shuold be quite linear for the filter, 0..Nyquist + * Cutoff goes from 0 to 1.0 = Nyquist. Key tracking should be reviewed, + * the value should be quite linear for the filter, 0..Nyquist * - * If we take midi key 0 = 8Hz and 127 = 12658.22 Hz then using - * our samplerate we shuold be able to fix some tuning: + * If we take MIDI key 0 = 8Hz and 127 = 12658.22 Hz then using + * our samplerate we should be able to fix some tuning: * * (voice->key.key * 12650.22 + 8) / (127 * srate) * * We want to position param[3] such that it tunes at 0.5 and can then - * be notched in the GUI, hence srate/4 rathern than /2. + * be notched in the GUI, hence srate/4 rather than /2. * * This still needs some work. if (param->param[3].float_val == 0) @@ -687,8 +687,8 @@ huovilainen12R(float *ib, float *mb, float *ob, bristolOPParams *param, bristolF for (; count > 0; count--) { /* - * We shuold really interpret coff (the configured frequency) as - * a function up to about 20KHz whatever the resampling rate. + * We should really interpret coff (the configured frequency) as + * a function up to about 20kHz whatever the resampling rate. */ if ((kfc = coff + *mb++ * Mod) > _f_lim_r) kfc = _f_lim_r; @@ -754,7 +754,7 @@ huovilainen12(float *ib, float *mb, float *ob, bristolOPParams *param, bristolFI * This is actually the same code as 24R just the 12dB and 18dB taps are * mixed back into the final output. This was an Oberheim filter mod that * did not actually go into any of their products due to the added - * complexity of an analogue implementation. It shuold be generally richer + * complexity of an analogue implementation. It should be generally richer * due to more phase differences and content. */ float az1 = local->az1; @@ -784,19 +784,19 @@ huovilainen12(float *ib, float *mb, float *ob, bristolOPParams *param, bristolFI /* * Cutoff is a power curve for better control at lower frequencies and - * the key is used for tracking purposes, it shuold be possible to make + * the key is used for tracking purposes, it should be possible to make * it reasonably linear at somewhere under unity * - * Cutoff goes from 0 to 1.0 = nyquist. Key tracking shuold be reviewed, - * the value shuold be quite linear for the filter, 0..Nyquist + * Cutoff goes from 0 to 1.0 = Nyquist. Key tracking should be reviewed, + * the value should be quite linear for the filter, 0..Nyquist * - * If we take midi key 0 = 8Hz and 127 = 12658.22 Hz then using - * our samplerate we shuold be able to fix some tuning: + * If we take MIDI key 0 = 8Hz and 127 = 12658.22 Hz then using + * our samplerate we should be able to fix some tuning: * * (voice->key.key * 12650.22 + 8) / (127 * srate) * * We want to position param[3] such that it tunes at 0.5 and can then - * be notched in the GUI, hence srate/4 rathern than /2. + * be notched in the GUI, hence srate/4 rather than /2. * * This still needs some work. if (param->param[3].float_val == 0) @@ -811,8 +811,8 @@ huovilainen12(float *ib, float *mb, float *ob, bristolOPParams *param, bristolFI for (; count > 0; count--) { /* - * We shuold really interpret coff (the configured frequency) as - * a function up to about 20KHz whatever the resampling rate. + * We should really interpret coff (the configured frequency) as + * a function up to about 20kHz whatever the resampling rate. */ if ((kfc = coff + *mb++ * Mod) > _f_lim_r) kfc = _f_lim_r; @@ -864,7 +864,7 @@ huovilainen24ROB(float *ib, float *mb, float *ob, bristolOPParams *param, bristo * This is actually the same code as 24R just the 12dB and 18dB taps are * mixed back into the final output. This was an Oberheim filter mod that * did not actually go into any of their products due to the added - * complexity of an analogue implementation. It shuold be generally richer + * complexity of an analogue implementation. It should be generally richer * due to more phase differences and content. */ float dng = param->param[8].float_val * scale; @@ -894,19 +894,19 @@ huovilainen24ROB(float *ib, float *mb, float *ob, bristolOPParams *param, bristo /* * Cutoff is a power curve for better control at lower frequencies and - * the key is used for tracking purposes, it shuold be possible to make + * the key is used for tracking purposes, it should be possible to make * it reasonably linear at somewhere under unity * - * Cutoff goes from 0 to 1.0 = nyquist. Key tracking shuold be reviewed, - * the value shuold be quite linear for the filter, 0..Nyquist + * Cutoff goes from 0 to 1.0 = Nyquist. Key tracking should be reviewed, + * the value should be quite linear for the filter, 0..Nyquist * - * If we take midi key 0 = 8Hz and 127 = 12658.22 Hz then using - * our samplerate we shuold be able to fix some tuning: + * If we take MIDI key 0 = 8Hz and 127 = 12658.22 Hz then using + * our samplerate we should be able to fix some tuning: * * (voice->key.key * 12650.22 + 8) / (127 * srate) * * We want to position param[3] such that it tunes at 0.5 and can then - * be notched in the GUI, hence srate/4 rathern than /2. + * be notched in the GUI, hence srate/4 rather than /2. * * This still needs some work. if (param->param[3].float_val == 0) @@ -921,8 +921,8 @@ huovilainen24ROB(float *ib, float *mb, float *ob, bristolOPParams *param, bristo for (; count > 0; count--) { /* - * We shuold really interpret coff (the configured frequency) as - * a function up to about 20KHz whatever the resampling rate. + * We should really interpret coff (the configured frequency) as + * a function up to about 20kHz whatever the resampling rate. */ if ((kfc = coff + *mb++ * Mod) > _f_lim_r) kfc = _f_lim_r; @@ -999,7 +999,7 @@ huovilainen24OB(float *ib, float *mb, float *ob, bristolOPParams *param, bristol * This is actually the same code as 24R just the 12dB and 18dB taps are * mixed back into the final output. This was an Oberheim filter mod that * did not actually go into any of their products due to the added - * complexity of an analogue implementation. It shuold be generally richer + * complexity of an analogue implementation. It should be generally richer * due to more phase differences and content. */ float dng = param->param[8].float_val * scale; @@ -1029,19 +1029,19 @@ huovilainen24OB(float *ib, float *mb, float *ob, bristolOPParams *param, bristol /* * Cutoff is a power curve for better control at lower frequencies and - * the key is used for tracking purposes, it shuold be possible to make + * the key is used for tracking purposes, it should be possible to make * it reasonably linear at somewhere under unity * - * Cutoff goes from 0 to 1.0 = nyquist. Key tracking shuold be reviewed, - * the value shuold be quite linear for the filter, 0..Nyquist + * Cutoff goes from 0 to 1.0 = Nyquist. Key tracking should be reviewed, + * the value should be quite linear for the filter, 0..Nyquist * - * If we take midi key 0 = 8Hz and 127 = 12658.22 Hz then using - * our samplerate we shuold be able to fix some tuning: + * If we take MIDI key 0 = 8Hz and 127 = 12658.22 Hz then using + * our samplerate we should be able to fix some tuning: * * (voice->key.key * 12650.22 + 8) / (127 * srate) * * We want to position param[3] such that it tunes at 0.5 and can then - * be notched in the GUI, hence srate/4 rathern than /2. + * be notched in the GUI, hence srate/4 rather than /2. * * This still needs some work. if (param->param[3].float_val == 0) @@ -1056,8 +1056,8 @@ huovilainen24OB(float *ib, float *mb, float *ob, bristolOPParams *param, bristol for (; count > 0; count--) { /* - * We shuold really interpret coff (the configured frequency) as - * a function up to about 20KHz whatever the resampling rate. + * We should really interpret coff (the configured frequency) as + * a function up to about 20kHz whatever the resampling rate. */ if ((kfc = coff + *mb++ * Mod) > _f_lim_r) kfc = _f_lim_r; @@ -1117,7 +1117,7 @@ huovilainen24ROB2(float *ib, float *mb, float *ob, bristolOPParams *param, brist * This is actually the same code as 24R just the 12dB and 18dB taps are * mixed back into the final output. This was an Oberheim filter mod that * did not actually go into any of their products due to the added - * complexity of an analogue implementation. It shuold be generally richer + * complexity of an analogue implementation. It should be generally richer * due to more phase differences and content. */ float dng = param->param[8].float_val * scale; @@ -1147,19 +1147,19 @@ huovilainen24ROB2(float *ib, float *mb, float *ob, bristolOPParams *param, brist /* * Cutoff is a power curve for better control at lower frequencies and - * the key is used for tracking purposes, it shuold be possible to make + * the key is used for tracking purposes, it should be possible to make * it reasonably linear at somewhere under unity * - * Cutoff goes from 0 to 1.0 = nyquist. Key tracking shuold be reviewed, - * the value shuold be quite linear for the filter, 0..Nyquist + * Cutoff goes from 0 to 1.0 = Nyquist. Key tracking should be reviewed, + * the value should be quite linear for the filter, 0..Nyquist * - * If we take midi key 0 = 8Hz and 127 = 12658.22 Hz then using - * our samplerate we shuold be able to fix some tuning: + * If we take MIDI key 0 = 8Hz and 127 = 12658.22 Hz then using + * our samplerate we should be able to fix some tuning: * * (voice->key.key * 12650.22 + 8) / (127 * srate) * * We want to position param[3] such that it tunes at 0.5 and can then - * be notched in the GUI, hence srate/4 rathern than /2. + * be notched in the GUI, hence srate/4 rather than /2. * * This still needs some work. if (param->param[3].float_val == 0) @@ -1174,8 +1174,8 @@ huovilainen24ROB2(float *ib, float *mb, float *ob, bristolOPParams *param, brist for (; count > 0; count--) { /* - * We shuold really interpret coff (the configured frequency) as - * a function up to about 20KHz whatever the resampling rate. + * We should really interpret coff (the configured frequency) as + * a function up to about 20kHz whatever the resampling rate. */ if ((kfc = coff + *mb++ * Mod) > _f_lim_r) kfc = _f_lim_r; @@ -1255,7 +1255,7 @@ huovilainen24OB2(float *ib, float *mb, float *ob, bristolOPParams *param, bristo * This is actually the same code as 24R just the 12dB and 18dB taps are * mixed back into the final output. This was an Oberheim filter mod that * did not actually go into any of their products due to the added - * complexity of an analogue implementation. It shuold be generally richer + * complexity of an analogue implementation. It should be generally richer * due to more phase differences and content. */ float dng = param->param[8].float_val * scale; @@ -1284,19 +1284,19 @@ huovilainen24OB2(float *ib, float *mb, float *ob, bristolOPParams *param, bristo /* * Cutoff is a power curve for better control at lower frequencies and - * the key is used for tracking purposes, it shuold be possible to make + * the key is used for tracking purposes, it should be possible to make * it reasonably linear at somewhere under unity * - * Cutoff goes from 0 to 1.0 = nyquist. Key tracking shuold be reviewed, - * the value shuold be quite linear for the filter, 0..Nyquist + * Cutoff goes from 0 to 1.0 = Nyquist. Key tracking should be reviewed, + * the value should be quite linear for the filter, 0..Nyquist * - * If we take midi key 0 = 8Hz and 127 = 12658.22 Hz then using - * our samplerate we shuold be able to fix some tuning: + * If we take MIDI key 0 = 8Hz and 127 = 12658.22 Hz then using + * our samplerate we should be able to fix some tuning: * * (voice->key.key * 12650.22 + 8) / (127 * srate) * * We want to position param[3] such that it tunes at 0.5 and can then - * be notched in the GUI, hence srate/4 rathern than /2. + * be notched in the GUI, hence srate/4 rather than /2. * * This still needs some work. if (param->param[3].float_val == 0) @@ -1311,8 +1311,8 @@ huovilainen24OB2(float *ib, float *mb, float *ob, bristolOPParams *param, bristo for (; count > 0; count--) { /* - * We shuold really interpret coff (the configured frequency) as - * a function up to about 20KHz whatever the resampling rate. + * We should really interpret coff (the configured frequency) as + * a function up to about 20kHz whatever the resampling rate. */ if ((kfc = coff + *mb++ * Mod) > _f_lim) kfc = _f_lim; @@ -1376,7 +1376,7 @@ static int operate(register bristolOP *operator, bristolVoice *voice, /* * Every operator accesses these variables, the count, and a pointer to - * each buffer. We shuold consider passing them as readymade parameters? + * each buffer. We should consider passing them as ready-made parameters? */ specs = (bristolFILTER *) operator->specs; count = specs->spec.io[FILTER_OUT_IND].samplecount; @@ -1400,13 +1400,13 @@ static int operate(register bristolOP *operator, bristolVoice *voice, /* * We will eventually have another set here that will be called when the * samplerate is over 48kHz (88.2, 96, 192 kHz) when we can anticipate the - * filter response to be adequate withuot resampling internally here. + * filter response to be adequate without resampling internally here. */ switch(fselect) { - /* LightWeight Filters */ + /* Lightweight Filters */ case 0: case 16: - return(chamberlain(ib, mb, ob, param, local, voice, count)); + return(chamberlin(ib, mb, ob, param, local, voice, count)); /* Huovilainen resampling */ case 1: @@ -1454,7 +1454,7 @@ filter2init(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; diff --git a/bristol/follower.c b/bristol/follower.c index f1f5d67..21cb8cd 100644 --- a/bristol/follower.c +++ b/bristol/follower.c @@ -161,7 +161,7 @@ followerinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; diff --git a/bristol/granulardco.c b/bristol/granulardco.c index ba3b502..30ad113 100644 --- a/bristol/granulardco.c +++ b/bristol/granulardco.c @@ -172,7 +172,7 @@ static int reset(bristolOP *operator, bristolOPParams *param) * depth and variance: gain, frequency, duration. * These are applied to each grain as it is generated, one parameter defines * the width of the value - its maximum, and the second one defines the variance - * from that value. With no variance we only take the connfigured value, and as + * from that value. With no variance we only take the configured value, and as * variance is raised we introduce more randomness into the reproduction. */ static int param(bristolOP *operator, bristolOPParams *param, @@ -601,7 +601,7 @@ static int operate(bristolOP *operator, /* * The next two paragraphs are the sympathetic grain generation - * sections. The sympathy is a function of parameterisation, when + * sections. The sympathy is a function of parametrisation, when * the parameters are wide there is little concordance, when the * values are slight there is stereo separation. */ @@ -679,7 +679,7 @@ quantuminit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; diff --git a/bristol/granulardco.h b/bristol/granulardco.h index ff333a3..9b70006 100644 --- a/bristol/granulardco.h +++ b/bristol/granulardco.h @@ -94,11 +94,11 @@ typedef struct BristolGRANULARDCOlocal { } bristolGRANULARDCOlocal; /* - * This is the gain table. The original papers referred to having a gaussian + * This is the gain table. The original papers referred to having a Gaussian * gain, starting from zero and having even distribution. Later implementations * used bastardisations of this including csound's rather dumb 'AR' envelope. * We are going to use a normalised, inverted cosine. This is a reasonable - * approximation of the gaussian 'bellcurve' that could be improved upon in + * approximation of the Gaussian 'bellcurve' that could be improved upon in * later releases. * * This table is resampled for the different grain sizes. @@ -237,10 +237,10 @@ float quantumgain[GRANULARDCO_WAVE_SZE + 1] = { /* * This is the 'rand' table. It was generated using rand() and it is a table - * such that we can have reproducable random numbers so that generated sounds - * can be put into memories and recalled verbatim. Ok, rand can actualy be used + * such that we can have reproducible random numbers so that generated sounds + * can be put into memories and recalled verbatim. Ok, rand can actually be used * to do this, however rand is already used in other algorithms (preacher) and - * unless the quantum generator can garantee ordered randomness it will not be + * unless the quantum generator can guarantee ordered randomness it will not be * able to have memories, hence this table. The reason that we cannot use rand() * to generate this table is that rand() may already be arbitrarily seeded by * the same process. We will consider the use of rand_r() as a development. diff --git a/bristol/hammond.c b/bristol/hammond.c index a43cd78..ce3cdf8 100644 --- a/bristol/hammond.c +++ b/bristol/hammond.c @@ -293,7 +293,7 @@ static int operate(bristolOP *operator, * Make sure we fill one output buffer. * * The '-36' may look odd, but the tonewheel generator does not use MIDI - * note indeces and this puts the key.key back into the gearing numbers. + * note indexes and this puts the key.key back into the gearing numbers. */ if (param->param[7].int_val) { preach(ob, pb, voice->key.key - 36, param->param[2].mem, @@ -304,7 +304,7 @@ static int operate(bristolOP *operator, /* * Click may be in multiple stages - each click array is 2k samples, * so if our sample block size is less than this we need to hit - * multiple consequetive blocks. + * multiple consecutive blocks. * * We should consider randomising the use of several different key * clicks - this is however only done in the preacher. @@ -387,7 +387,7 @@ hammondinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; @@ -649,7 +649,7 @@ fillHammondWave(bristolOP *operator) /* * We now have a volume array - 16 levels, of which we should only use 9. - * Each represents a base requency in terms of pipe length: + * Each represents a base frequency in terms of pipe length: * 16, 8, 5 1/3, 4, 2 2/3, 2, 1 3/5, 1 1/3, 1 * These are frequencies: diff --git a/bristol/hammondchorus.c b/bristol/hammondchorus.c index 799652a..5bf92f1 100644 --- a/bristol/hammondchorus.c +++ b/bristol/hammondchorus.c @@ -75,7 +75,7 @@ int *tap4 = NULL, *tap5 = NULL, *tap6 = NULL; float tapgain[TAPS] = {1.0, 1.01, 1.02, 1.03, 1.04, 1.05, 1.06, 1.07, 1.08}; /* float tapfilt[TAPS] = {0.95, 0.9, 0.85, 0.8, 0.75, 0.7, 0.65, 0.6, 0.55}; */ -/* These get reset anyway, the are a cummulative multiplication */ +/* These get reset anyway, the are a cumulative multiplication */ float tapfilt[TAPS] = {0.99, 0.98, 0.97, 0.96, 0.95, 0.94, 0.93, 0.92, 0.91}; /* @@ -527,7 +527,7 @@ hammondchorusinit(bristolOP **operator, int index, int samplerate, int samplecou /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; diff --git a/bristol/hpf.c b/bristol/hpf.c index f58101f..078886f 100644 --- a/bristol/hpf.c +++ b/bristol/hpf.c @@ -137,7 +137,7 @@ static int operate(register bristolOP *operator, bristolVoice *voice, /* * Every operator accesses these variables, the count, and a pointer to - * each buffer. We should consider passing them as readymade parameters? + * each buffer. We should consider passing them as ready-made parameters? * * The Filter now takes normalised inputs, in ranges of 12PO. */ @@ -223,7 +223,7 @@ hpfinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; diff --git a/bristol/junodco.c b/bristol/junodco.c index 8a49877..d8fadd2 100644 --- a/bristol/junodco.c +++ b/bristol/junodco.c @@ -400,7 +400,7 @@ junodcoinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; diff --git a/bristol/lfo.c b/bristol/lfo.c index e4c488e..f83bb43 100644 --- a/bristol/lfo.c +++ b/bristol/lfo.c @@ -330,7 +330,7 @@ lfoinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; @@ -560,7 +560,7 @@ fillWave(float *mem, int count, int type) return; case 6: /* - * Tangiential wave. We limit some of the values, since they do get + * Tangential wave. We limit some of the values, since they do get * excessive. This is only half a tan as well, to maintain the * base frequency. */ diff --git a/bristol/midihandlers.c b/bristol/midihandlers.c index 868605f..4008b9f 100644 --- a/bristol/midihandlers.c +++ b/bristol/midihandlers.c @@ -216,7 +216,7 @@ obxController(Baudio *baudio, u_char operator, u_char controller, float value) /* * If this is a data entry value then send it to the emulation so that - * it can be intepreted into one of the emulated controls. We will add + * it can be interpreted into one of the emulated controls. We will add * in some method such that continuous controllers can be promoted to * NRP allowing CC to drive the emulation as well. */ @@ -299,9 +299,9 @@ midiProgram(audioMain *audiomain, bristolMidiMsg *msg) { /* * Ah, the engine receives this message, probably from rawmidi. What to do - * next is not selfevident: the engine has no memories - these are + * next is not self-evident: the engine has no memories - these are * all handled by the GUI. These (and other) messages should be passed - * through to the GUI, or the GUI should register for a midi pipe as well + * through to the GUI, or the GUI should register for a MIDI pipe as well * and do the other necessary things. I think I actually prefer the latter, * since having a passthrough here would only be one special case. * @@ -516,11 +516,11 @@ static int midiSystem(audioMain *audiomain, bristolMidiMsg *msg) return(0); /* - * Bristol Sysex messages do contain midi channel information, but + * Bristol Sysex messages do contain MIDI channel information, but * since we are doing system operation we need to make sure we take the * single bristolAudio associated with this config interface, ie, we * need to consider where the message came from, and look for its ID. - * The rest of the midi messages search for midichannel, and may get + * The rest of the MIDI messages search for midichannel, and may get * several hits when we are working with multitimbral configurations. */ baudio = findBristolAudio(audiomain->audiolist, @@ -618,7 +618,7 @@ buildCurrentTable(Baudio *baudio, float gtune) * A 220.000 57 44=110 32=55 20=27.5 8=13.75 * A# 233.082 58 * B 246.942 59 - * C 261.626 60 = Midi Key, Middle C + * C 261.626 60 = MIDI Key, Middle C * C# 277.183 61 * D 293.665 62 * D# 311.127 63 @@ -631,7 +631,7 @@ buildCurrentTable(Baudio *baudio, float gtune) * We can work on putting full calculation into here for other frequency * tables. For correct operation, each semitone is * previous frequency * (2^^(1/12)) - * Since A is constand whole numbers we can calcuate each octave from A. + * Since A is constant whole numbers we can calculate each octave from A. */ int initFrequencyTable(int samplerate) @@ -691,7 +691,7 @@ initFrequencyTable(int samplerate) /* * We now have to build in a gain table, which will be logarithmic, - * and a multipication list for attack/decay rates. + * and a multiplication list for attack/decay rates. */ gain_diff = pow((double) 13, ((double) 1)/DEF_TAB_SIZE); @@ -827,8 +827,8 @@ initMidiRoutines(audioMain *audiomain, midiHandler midiRoutines[]) } /* - * It would be better to have this burried in the baudio so it runs on a - * single emulation or midi channel, that is for later study. + * It would be better to have this buried in the baudio so it runs on a + * single emulation or MIDI channel, that is for later study. */ if (audiomain->microTonalMappingFile != NULL) { @@ -843,7 +843,7 @@ initMidiRoutines(audioMain *audiomain, midiHandler midiRoutines[]) --n; /* - * This was just for my purposesi + * This was just for my purposes for (i = 0; i <= n; i++) printf("Note: %f\n", notes[i]); if (notes[n] != 2.0) @@ -854,7 +854,7 @@ initMidiRoutines(audioMain *audiomain, midiHandler midiRoutines[]) * We need to do some mapping to the keyboard and these are not * necessarily obvious. If we have 12 notes then map them to the * keyboard sequentially basing the notes around A=440 = 69 on the - * midi keyboard. For 20 notes do similar up and down. + * MIDI keyboard. For 20 notes do similar up and down. * * For 7 and 8 notes then just use the whites? 5 Notes just the * blacks? No, leave this until we have implemented MIDI key diff --git a/bristol/midinote.c b/bristol/midinote.c index 289016b..61e0080 100644 --- a/bristol/midinote.c +++ b/bristol/midinote.c @@ -156,7 +156,7 @@ offset = 99; voice->dfreq = baudio->microtonalmap[mn].freq; } else if (bristolMidiRoutines.bmr[7].floatmap[mn] > 0.0) { /* - * This is the synth private microtonal map (eg, scala file) + * This is the synth private microtonal map (e.g., scala file) voice->dFreq = bristolMidiRoutines.freq[mn].step; voice->dfreq = bristolMidiRoutines.freq[mn].freq; */ @@ -301,8 +301,8 @@ printf("midiNoteOff %i\n", msg->params.key.key); && (~audiomain->flags & BRISTOL_JACK_DUAL)) { /* - * The message came from Jack and we have selected a single registration - * which means we are actually in the audio thread and can conginue with + * The message came from JACK and we have selected a single registration + * which means we are actually in the audio thread and can continue with * the note on event. */ if ((audiomain->debuglevel & BRISTOL_DEBUG_MASK) > BRISTOL_DEBUG2) @@ -564,7 +564,7 @@ doMidiNoteOn(audioMain *audiomain, bristolMidiMsg *msg, Baudio *baudio, int key) * a note is played within a reasonably small (configurable) range. This * will be used to emulate temperature sensitivity of the old synths. * It should be configurable per synth so perhaps we will make it a MIDI - * unassigned opererator? The engine should respond to this operator, the + * unassigned operator? The engine should respond to this operator, the * GUI will sent it, and any other arbitrary control may send it to the * engine as well. */ @@ -647,7 +647,7 @@ doMidiNoteOn(audioMain *audiomain, bristolMidiMsg *msg, Baudio *baudio, int key) * glide times but it is also arguably incorrect as it should be a * multiplier that is applied a given number of times - that way the * glide is also constant per octave, not the case with the original - * linear incrementor: + * linear incrementer: */ cFreqmult = powf(M_E, logf(dFreq/cFreq) / (baudio->glide * audiomain->samplerate)); @@ -894,18 +894,18 @@ midiNoteOn(audioMain *audiomain, bristolMidiMsg *msg) } /* - * So, if this came from a jack handle, and we are single open then don't + * So, if this came from a JACK handle, and we are single open then don't * dump this in the ringbuffer - call the handler directly * * The JDO flags is straightforward. We then need to check if 'from' is - * a jack handle. + * a JACK handle. */ if ((msg->params.key.flags & BRISTOL_KF_JACK) && (~audiomain->flags & BRISTOL_JACK_DUAL)) { /* - * The message came from Jack and we have selected a single registration - * which means we are actually in the audio thread and can conginue with + * The message came from JACK and we have selected a single registration + * which means we are actually in the audio thread and can continue with * the note on event. */ if ((audiomain->debuglevel & BRISTOL_DEBUG_MASK) > BRISTOL_DEBUG2) @@ -941,7 +941,7 @@ rbMidiNoteOn(audioMain *audiomain, bristolMidiMsg *msg) /* * Find an associated baudio structure. We have to go through the - * baudio lists, and find the correct midi channel. Link up the locals + * baudio lists, and find the correct MIDI channel. Link up the locals * list. */ while (baudio != (Baudio *) NULL) @@ -1038,7 +1038,7 @@ sustainedNotesOff(audioMain *audiomain, int channel) } if ((voice != NULL) && (voice->baudio->midiflags & BRISTOL_MIDI_DEBUG2)) - printf("midi sustained notes off\n"); + printf("MIDI sustained notes off\n"); } void @@ -1062,7 +1062,7 @@ allNotesOff(audioMain *audiomain, int channel) } if ((voice != NULL) && (voice->baudio->midiflags & BRISTOL_MIDI_DEBUG2)) - printf("midi all notes off\n"); + printf("MIDI all notes off\n"); } #ifndef BRISTOL_SEMAPHORE diff --git a/bristol/midithread.c b/bristol/midithread.c index ad3b939..837d4cc 100644 --- a/bristol/midithread.c +++ b/bristol/midithread.c @@ -150,7 +150,7 @@ int midiMsgForwarder(bristolMidiMsg *msg) { /* - * Take bristol midi messages, write them into the forwarding path ring + * Take bristol MIDI messages, write them into the forwarding path ring * buffer. */ if (jack_ringbuffer_write_space(audiomain.rbfp) >= sizeof(bristolMidiMsg)) @@ -222,7 +222,7 @@ midiThread(audioMain *audiomain) #endif #ifdef DEBUG - printf("starting midi thread\n"); + printf("starting MIDI thread\n"); #endif audiomain->mtStatus = BRISTOL_WAIT; @@ -245,9 +245,9 @@ midiThread(audioMain *audiomain) #ifdef BRISTOL_SEMAPHORE /* - * Get a couple of semaphores to separate the midi from the audio + * Get a couple of semaphores to separate the MIDI from the audio * processing. These are destroyed in the inthandler() in bristol.c as - * the midi signalling is closed down. The semaphores are shared in the + * the MIDI signalling is closed down. The semaphores are shared in the * note on/off code in midinote.c and the audioEngine.c which need to * track the same voicelists. * @@ -313,7 +313,7 @@ midiThread(audioMain *audiomain) if ((audiomain->flags & BRISTOL_MIDIMASK) == BRISTOL_MIDI_OSS) { - printf("midi oss\n"); + printf("MIDI oss\n"); flags = BRISTOL_CONN_OSSMIDI; } @@ -325,7 +325,7 @@ midiThread(audioMain *audiomain) device = "bristol"; else device = audiomain->mididev; - printf("midi interface: %s\n", device); + printf("MIDI interface: %s\n", device); } else if (audiomain->mididev != (char *) NULL) device = audiomain->mididev; @@ -334,13 +334,13 @@ midiThread(audioMain *audiomain) /* * We need to init the OSC interface here. */ - printf("midi osc not currently implemented\n"); + printf("MIDI osc not currently implemented\n"); } if ((audiomain->flags & BRISTOL_MIDIMASK) == BRISTOL_MIDI_JACK) { device = bSMD; - printf("midi jack: %s\n",device); + printf("MIDI JACK: %s\n",device); flags = BRISTOL_CONN_SEQ; } @@ -358,7 +358,7 @@ midiThread(audioMain *audiomain) BRISTOL_REQ_SYSEX:BRISTOL_REQ_ALL, midiMsgHandler, audiomain)) < 0) { - printf("Error opening control device, exiting midi thread\n"); + printf("Error opening control device, exiting MIDI thread\n"); audiomain->atReq = BRISTOL_REQSTOP; exitReq = 1; pthread_exit(&exitstatus); @@ -373,18 +373,18 @@ midiThread(audioMain *audiomain) = bristolMidiOpen(device, flags|BRISTOL_RDONLY, -1, BRISTOL_REQ_NSX, midiMsgHandler, audiomain)) < 0)) { - printf("Error opening midi device %s/%i, exiting midi thread\n", + printf("Error opening MIDI device %s/%i, exiting MIDI thread\n", device, audiomain->midiHandle); - printf("Bristol cannot operate without a midi interface. Terminating\n"); + printf("Bristol cannot operate without a MIDI interface. Terminating\n"); audiomain->atReq = BRISTOL_REQSTOP; exitReq = 1; bristolMidiClose(audiomain->controlHandle); pthread_exit(&exitstatus); } else - printf("opened midi device %s\n", device); + printf("opened MIDI device %s\n", device); #ifdef DEBUG - printf("opened midi device: %i/%i\n", + printf("opened MIDI device: %i/%i\n", audiomain->controlHandle, audiomain->midiHandle); #endif @@ -398,9 +398,9 @@ midiThread(audioMain *audiomain) #endif /* - * This will become blocking midi code, now that we are threaded. In short, + * This will become blocking MIDI code, now that we are threaded. In short, * midiCheck should not return. This can be an issue to ensure that the - * midi device is closed. + * MIDI device is closed. */ midiCheck(); diff --git a/bristol/noise.c b/bristol/noise.c index 1d2da8b..2bf05fb 100644 --- a/bristol/noise.c +++ b/bristol/noise.c @@ -181,7 +181,7 @@ noiseinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = gennoise; (*operator)->destroy = destroy; diff --git a/bristol/nro.c b/bristol/nro.c index e7c46ed..f17c37c 100644 --- a/bristol/nro.c +++ b/bristol/nro.c @@ -52,7 +52,7 @@ #define PCOUNT 16 /* As of 0.30.6 this was the max */ #define IOCOUNT 5 -/* IO indeces */ +/* IO indexes */ #define NRO_IN_IND 0 #define NRO_OUT_IND 1 #define NRO_PWM_IND 2 @@ -698,7 +698,7 @@ genTriTendency(bristolNRO *gt, bristolNROlocal *t, float *fb, float *mb, float * /* * Convert to samples per cycle for whole waveforms, ramp and saw for example, - * but also square since it take the frequency and appliesa PWM modulation. + * but also square since it take the frequency and applies a PWM modulation. */ static void convertF2S(float *src, float *dst, float trans, float sr, int c) @@ -1153,7 +1153,7 @@ nroinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; diff --git a/bristol/palette.h b/bristol/palette.h index e24638d..310bc63 100644 --- a/bristol/palette.h +++ b/bristol/palette.h @@ -207,7 +207,7 @@ struct bristolAlgos { {NULL, NULL}, {bristolProphet52Init, "prophet52"}, /* Uses Prophet algorithm with added FX. */ {bristolOBXInit, "obx"}, /* Used by OB-X and two for OB-Xa */ - {NULL, NULL}, /* THis was for the OBXA? */ + {NULL, NULL}, /* This was for the OBXA? */ {NULL, NULL}, {bristolPolyInit, "mono"}, {bristolPoly6Init, "poly"}, diff --git a/bristol/prophetdco.c b/bristol/prophetdco.c index 2f8994c..05009e1 100644 --- a/bristol/prophetdco.c +++ b/bristol/prophetdco.c @@ -639,7 +639,7 @@ prophetdcoinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; @@ -797,7 +797,7 @@ fillPDsine(float *mem, int count, int compress) float j = 0, i, inc1, inc2; /* - * Resample the sine wave as per casio phase distortion algorithms. + * Resample the sine wave as per Casio phase distortion algorithms. * * We have to get to M_PI/2 in compress steps, hence * @@ -943,7 +943,7 @@ fillWave(float *mem, int count, int type) return; case 6: /* - * Tangiential wave. We limit some of the values, since they do get + * Tangential wave. We limit some of the values, since they do get * excessive. This is only half a tan as well, to maintain the * base frequency. */ diff --git a/bristol/resonator.c b/bristol/resonator.c index bc98ba3..829fbac 100644 --- a/bristol/resonator.c +++ b/bristol/resonator.c @@ -133,7 +133,7 @@ static int operate(register bristolOP *operator, bristolVoice *voice, /* * Every operator accesses these variables, the count, and a pointer to - * each buffer. We should consider passing them as readymade parameters? + * each buffer. We should consider passing them as ready-made parameters? * * The Filter now takes normalised inputs, in ranges of 12PO. */ @@ -226,7 +226,7 @@ resinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; diff --git a/bristol/reverb.c b/bristol/reverb.c index fb3e577..7b9de3e 100644 --- a/bristol/reverb.c +++ b/bristol/reverb.c @@ -21,7 +21,7 @@ /* * For the first releases of the 2600 this was a dual tap feedback loop with - * crossover. Cheezy, but so was the original 2600 spring reverb. Second + * crossover. Cheesy, but so was the original 2600 spring reverb. Second * extension was to insert a two pairs of HPF and LPF, one for feedback and * another for crossover through the two delay lines. Improved considerably. * @@ -242,7 +242,7 @@ reverbinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; diff --git a/bristol/ringmod.c b/bristol/ringmod.c index d1b5219..8720dd7 100644 --- a/bristol/ringmod.c +++ b/bristol/ringmod.c @@ -134,7 +134,7 @@ static int operate(register bristolOP *operator, bristolVoice *voice, * See if we have a gain configured on the second input. If we do then * take that as the ringmod input. If not then take that as the input * selector - ib1 if +ve, otherwise zero. This emulates the DC capabilities - * of the original rinngmod, although it could better be another option. + * of the original ringmod, although it could better be another option. */ if (param->param[1].float_val > 0) { @@ -184,7 +184,7 @@ ringmodinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; diff --git a/bristol/roadrunner.h b/bristol/roadrunner.h index b57ca19..34b7b29 100644 --- a/bristol/roadrunner.h +++ b/bristol/roadrunner.h @@ -36,7 +36,7 @@ typedef struct roadrunnerMods { float pwm; float vibrato; - float tremelo; + float tremolo; int lowsplit; int highsplit; } roadrunnermods; diff --git a/bristol/rotary.c b/bristol/rotary.c index b924301..fd5f257 100644 --- a/bristol/rotary.c +++ b/bristol/rotary.c @@ -21,11 +21,11 @@ /* -b3 intertia control alterations do not reset as expected +b3 inertia control alterations do not reset as expected 30.3, 64bit, -no-jack-midi option observed behaviour: -Altering the intertia control from minimum to maximum gives expected +Altering the inertia control from minimum to maximum gives expected result, but when the control is returned to minimum, the interia is apparently not altered @@ -205,7 +205,7 @@ float *obr, int count, float scan, float feedback, float delay, float reverb) history[histin] = *ib; /* - * Some doppler + * Some Doppler */ if ((histout + 1) >= HISTSIZE) { @@ -220,7 +220,7 @@ float *obr, int count, float scan, float feedback, float delay, float reverb) } /* - * Some tremelo, and for now put doppler in both sides. + * Some tremolo, and for now put Doppler in both sides. */ rev = history[revout1] * 0.8 + history[revout2] * 0.36 @@ -376,7 +376,7 @@ static int operate(bristolOP *operator, Delay = param->param[DELAY].int_val; /* * Reverb was moved out of the rotary for being weak - it was only intended - * for doppler effects so now going to fix the values. + * for Doppler effects so now going to fix the values. */ /* Reverb = 0.7; */ /* Feedback = 0.4; */ @@ -627,7 +627,7 @@ leslieinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; diff --git a/bristol/sdco.c b/bristol/sdco.c index 95e34b5..d0c1bab 100644 --- a/bristol/sdco.c +++ b/bristol/sdco.c @@ -346,7 +346,7 @@ sdcoinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; @@ -437,7 +437,7 @@ fillWave(sampleData mem[], int type) * * At the moment (12/6/02) we only load a single sample. * We need to put a shim in here to link through to libsndutil or - * similar library, and allow that to do our convertion work for us. + * similar library, and allow that to do our conversion work for us. * Preferably the library should recognise some of the common * sampler formats such as AKAI, Ensoniq, etc, where a soundfile * has a compound of multiple notes and layers. diff --git a/bristol/sdcoutils.c b/bristol/sdcoutils.c index 994eaf4..c60101f 100644 --- a/bristol/sdcoutils.c +++ b/bristol/sdcoutils.c @@ -148,7 +148,7 @@ fixWavepointers(sampleData *sd, int layer) /* * Since we do not have a wave loaded on this note we need to * evaluate the rate at which the related sample should be - * played. This is 2s power twelth of the distance between the + * played. This is 2s power twelfth of the distance between the * notes. */ freqstep = ckey - target; diff --git a/bristol/solina.h b/bristol/solina.h index e823c77..879aaa8 100644 --- a/bristol/solina.h +++ b/bristol/solina.h @@ -32,7 +32,7 @@ typedef struct solinaMods { float pwm; float vibrato; - float tremelo; + float tremolo; float glide; int lowsplit; int highsplit; diff --git a/bristol/soundManager.c b/bristol/soundManager.c index b18f5fa..82f2f3a 100644 --- a/bristol/soundManager.c +++ b/bristol/soundManager.c @@ -133,8 +133,8 @@ printSoundList(Baudio *baudio, bristolSound *sound[]) /* * Initialising an algorithm requires minimally that the audio thread is - * dormant, and preferably also the midi thread. We build a voice template - * configuration. It may be the responsiblity of the MIDI handler to init any + * dormant, and preferably also the MIDI thread. We build a voice template + * configuration. It may be the responsibility of the MIDI handler to init any * voices we use. */ void @@ -180,7 +180,7 @@ freeSoundAlgo(Baudio *baudio, int algo, bristolSound *sound[]) int j; /* - * And then for each parameter, see if it has assigmed any local + * And then for each parameter, see if it has assigned any local * memory. */ for (j = 0; j < BRISTOL_PARAM_COUNT; j++) diff --git a/bristol/thesermon.c b/bristol/thesermon.c index 64acad1..53a87fa 100644 --- a/bristol/thesermon.c +++ b/bristol/thesermon.c @@ -21,7 +21,7 @@ /* * The sermon generates the waves for all the oscillators required by a hammond. - * Different sources put this at 91, 92, or 95 oscillators. By my reconning we + * Different sources put this at 91, 92, or 95 oscillators. By my reckoning we * need one for every key on the hammond (61), plus the range of the drawbars, * (5 octaves = 62). In short, the lowest drawbar goes 12 notes below the * bottom key, and the highest note goes 3 octaves (36 notes) above, or rather @@ -88,7 +88,7 @@ * Other key click * Reorganise volumes (click too loud?) * - * Finallly we need to build a set of defaults for the normal and bright tab. + * Finally we need to build a set of defaults for the normal and bright tab. */ #include @@ -125,7 +125,7 @@ static void filltriwave(float *, int, double, int); /* * We count make all these arrays into a single array or structure, something - * like the following, but we would have to rearrange all the iterpolation + * like the following, but we would have to rearrange all the interpolation * routines, so perhaps not, they are kind of nice and easy to do. * * So we keep the simple arrays. For the following I could introduce different @@ -152,7 +152,7 @@ typedef struct Tonewheels { tonewheels gearbox[92]; -/* Bright should be burried in the tonewheel structure */ +/* Bright should be buried in the tonewheel structure */ static int bright, btnote, btdelay = 0, samplerate; #ifdef TONEMATRIX @@ -196,7 +196,7 @@ printf("Wheel %i: ct %2.2f\n", wheel, tonematrix[wheel].gain); */ source = &wheeltemplates[bright][wheel][0]; - index = toneindeces[wheel]; + index = toneindexes[wheel]; if (tonematrix[wheel].percussive != 0) dest = pbuf; @@ -247,7 +247,7 @@ printf("Wheel %i: ct %2.2f\n", wheel, tonematrix[wheel].gain); if ((index += freq) > WAVE_SIZE) index -= WAVE_SIZE; } while ((count -= 8) > 0); - toneindeces[wheel] = index; + toneindexes[wheel] = index; } } @@ -256,8 +256,8 @@ printf("Wheel %i: ct %2.2f\n", wheel, tonematrix[wheel].gain); } /* - * The ctab here is a correct equally tempered index couters to generate waves. - * This does not really match the hammond as it was not actally ET. A separate + * The ctab here is a correct equally tempered index counters to generate waves. + * This does not really match the hammond as it was not actually ET. A separate * table is used by the sermon to give it the hammond generated frequencies */ void @@ -284,7 +284,7 @@ thesermon(int samplecount, int sineform) #ifndef TONEMATRIX source = &wheeltemplates[bright][wheel][0]; - index = toneindeces[wheel]; + index = toneindexes[wheel]; dest = tonewheel[wheel]; /* * For the clutching system the diverse axles are not in sync. This @@ -318,7 +318,7 @@ thesermon(int samplecount, int sineform) if ((index += freq) > WAVE_SIZE) index -= WAVE_SIZE; } while ((count -= 8) > 0); - toneindeces[wheel] = index; + toneindexes[wheel] = index; #endif /* @@ -859,7 +859,7 @@ strnext(char *source) return(NULL); /* - * So we have two valid strings. Find next occurence of whitespace and + * So we have two valid strings. Find next occurrence of whitespace and * then skip over it. */ if ((offset = strpbrk(source, " ")) == NULL) @@ -880,7 +880,7 @@ parseTaper(int comp, char *line) offset = line; /* - * We now have 9 values. If they start with 'R' it is a resitor index, + * We now have 9 values. If they start with 'R' it is a resistor index, * otherwise a literal value. */ for (; drawbar < BUS_COUNT; drawbar++) @@ -889,7 +889,7 @@ parseTaper(int comp, char *line) return; /* - * There are 3 possiblities, a literal floating value, an R followed + * There are 3 possibilities, a literal floating value, an R followed * by an array index, or R followed by the resistance if which we have * just a few recognised values. */ @@ -1145,7 +1145,7 @@ bristolHammondGetMap(char *file, char *match, float points[], int count) char param[256]; /* - * Open and read configuration. Should consider seaching + * Open and read configuration. Should consider searching * $HOME/.bristol/memory and $BRISTOL_DB/memory. */ sprintf(path, "%s/memory/profiles/%s", getBristolCache(file), file); @@ -1290,7 +1290,7 @@ bristolHammondGetMap(char *file, char *match, float points[], int count) /* * This will build a default gearbox to include compartments for crosstalk, - * frequencies, stepping rates throught the wavetables, etc. We should put in + * frequencies, stepping rates through the wavetables, etc. We should put in * the different wheel shapes, equalisation, jitter and additionally consider * doing this for two gearboxes, normal and bright. */ @@ -1370,7 +1370,7 @@ initGearbox() /* * Default stops are 8 linear levels, tapers are fixed but will be - * overriden from somewhere? + * overridden from somewhere? */ for (j = 0; j < BUS_COUNT; j++) { @@ -1382,7 +1382,7 @@ initGearbox() * We now have the default gearbox but have to have a rework of the * crosstalk map for the compartments. It is not sufficient just to put * each toothwheel into an array, the gear entry needs to know which of - * the wheels in the same compartment have the geater crosstalk..... + * the wheels in the same compartment have the greater crosstalk..... */ for (b = 0; b < 2; b++) { @@ -1630,7 +1630,7 @@ finishGearings(float rate) * the complete gearbox, it works but is quite a lot of work. */ gearbox[i].step = ((float) 1024.0) / (rate / gearbox[i].freq); - toneindeces[i] = gearbox[i].phase / 360.0 * 1024.0; + toneindexes[i] = gearbox[i].phase / 360.0 * 1024.0; for (j = 0; j < BUS_COUNT; j++) { @@ -1661,7 +1661,7 @@ initthesermon(int sc, int sr, int compress) for (i = 0; i < OSC_LIMIT; i++) { tonewheel[i] = i * sc + oscillators; - toneindeces[i] = 0; + toneindexes[i] = 0; } } @@ -1672,7 +1672,7 @@ initthesermon(int sc, int sr, int compress) * EQ profiles are not easy to interface. I want them to be a set of points * which are then interpolated to give gain levels and waveform distortions. * - * bright should perhaps not re-eq the tonewheels but the busses? + * bright should perhaps not re-EQ the tonewheels but the busses? */ for (i = 0; i < OSC_LIMIT; i++) toneEQ[NORMAL][i] = toneEQ[BRIGHT][i] = 0; diff --git a/bristol/thesermon.h b/bristol/thesermon.h index d4261d0..23a92c1 100644 --- a/bristol/thesermon.h +++ b/bristol/thesermon.h @@ -28,12 +28,12 @@ #define NEW_CLICK /* - * These are the midi note offsets for any given key harmonics. + * These are the MIDI note offsets for any given key harmonics. */ static int offsets[BUS_COUNT] = {-12, 7, 0, 12, 19, 24, 28, 31, 36}; /* - * Get a humungous chunk of memory, SAMPLE_COUNT should come from the audiomain + * Get a humongous chunk of memory, SAMPLE_COUNT should come from the audiomain * structure. This is the pointer to that chunk of 'current buffer working mem'. */ static float *oscillators = NULL; @@ -252,7 +252,7 @@ static float rtapers[OSC_LIMIT][9] = { static float wheeltemplates[2][OSC_LIMIT][WAVE_SIZE]; static float *tonewheel[OSC_LIMIT]; static int *wheelnumbers = &wi[36]; -static float toneindeces[OSC_LIMIT]; +static float toneindexes[OSC_LIMIT]; #define NORMAL 0 #define BRIGHT 1 static float toneEQ[2][OSC_LIMIT]; diff --git a/bristol/trilogyosc.c b/bristol/trilogyosc.c index 0852e90..aac02bc 100644 --- a/bristol/trilogyosc.c +++ b/bristol/trilogyosc.c @@ -307,7 +307,7 @@ register int count, register float inv) * count. * gain. * - * This oscillator is going to have 4 continous controllers for the signal + * This oscillator is going to have 4 continuous controllers for the signal * strengths of the different harmonics, 32/16/8/4. It will have different * gain levels for the tri and ramp waves. Finally the phase shifting pulse * wave will function probably on the lowest selected harmonic at first since @@ -345,7 +345,7 @@ static int operate(bristolOP *operator, * different harmonics. Quite CPU intensive. The sweeps should be factored * by detune as well however that is not available from the voice..... * - * Reparameterize the operator for + * Reparametrise the operator for * controllable detune * controllable spread * controllable distorts @@ -429,7 +429,7 @@ trilogyoscinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; @@ -767,7 +767,7 @@ fillPDcos(float *mem, int count, float compress) comp = 1; /* - * Resample the sine wave as per casio phase distortion algorithms. + * Resample the sine wave as per Casio phase distortion algorithms. * * We have to get to M_PI/2 in compress steps, hence * @@ -792,7 +792,7 @@ fillPDcos(float *mem, int count, float compress) } /* - * Resample the sine wave as per casio phase distortion algorithms. + * Resample the sine wave as per Casio phase distortion algorithms. * * We have to get to M_PI/2 in compress steps, hence * diff --git a/bristol/vibrachorus.c b/bristol/vibrachorus.c index 512761a..29e1cc3 100644 --- a/bristol/vibrachorus.c +++ b/bristol/vibrachorus.c @@ -244,7 +244,7 @@ vchorusinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; diff --git a/bristol/vox.c b/bristol/vox.c index 9abab64..84314d4 100644 --- a/bristol/vox.c +++ b/bristol/vox.c @@ -296,7 +296,7 @@ voxdcoinit(bristolOP **operator, int index, int samplerate, int samplecount) /* * Then the local parameters specific to this operator. These will be - * the same for each operator, but must be inited in the local code. + * the same for each operator, but must be init'ed in the local code. */ (*operator)->operate = operate; (*operator)->destroy = destroy; @@ -779,7 +779,7 @@ fillVoxM2Wave(bristolOP *operator, bristolOPParams *params) /* * Do Draw-II for the flute, or sine waves. This is 5-1/3 and 1-3/5 - * which are indeces 3 and 7. There is an optional percussive. + * which are indexes 3 and 7. There is an optional percussive. */ gain = ((float) (wavelevel[6] * wavelevel[4])) / 64.0; if (gain != 0) @@ -821,7 +821,7 @@ fillVoxM2Wave(bristolOP *operator, bristolOPParams *params) { oscindex = 0; /* - * Take the rempwave and the destination wave. + * Take the rampwave and the destination wave. */ source = specs->wave[7]; dest = wave1; diff --git a/config.h.in b/config.h.in index e0ba75c..dceab16 100644 --- a/config.h.in +++ b/config.h.in @@ -33,7 +33,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_X11_EXTENSIONS_XSHM_H -/* Define to enable jack session support */ +/* Define to enable JACK session support */ #undef JACK_SESSION /* Define to the sub-directory in which libtool stores uninstalled libraries. diff --git a/include/brighton/brightonevents.h b/include/brighton/brightonevents.h index e378c98..cf0b75d 100644 --- a/include/brighton/brightonevents.h +++ b/include/brighton/brightonevents.h @@ -71,7 +71,7 @@ typedef struct BrightonSize { #define BRIGHTON_MOD_CONTROL 4 /* - * This is an oversimplified conversion of the XEvent strcture for brighton use + * This is an oversimplified conversion of the XEvent structure for brighton use */ typedef struct BrightonEvent { unsigned int flags; diff --git a/include/bristol/bristol.h b/include/bristol/bristol.h index 0e230f5..a4101ce 100644 --- a/include/bristol/bristol.h +++ b/include/bristol/bristol.h @@ -128,7 +128,7 @@ #define SYSTEM_CHANNEL 0x07f /* used for initialisation requests. */ -#define BRISTOL_CHAN_OMNI 127 /* Denotes any midi channel. */ +#define BRISTOL_CHAN_OMNI 127 /* Denotes any MIDI channel. */ //#define BRISTOL_VOICECOUNT 32 /* Was 16, now increased for GM-2 24/32 */ #define BRISTOL_MAXVOICECOUNT 128 @@ -223,7 +223,7 @@ #define B_NRO 35 /* - * Audio interface types. The loest bytes is resevered. + * Audio interface types. The lowest bytes is reserved. * * These are for audiomain.flags, there are 8 drivers available of which are * defined, one is deprecated leaving six. The Pulse has two interfaces one of @@ -255,9 +255,9 @@ #define BRISTOL_MIDI_WAIT 0x00800000 -/* Audio connection to Jack ports */ +/* Audio connection to JACK ports */ #define BRISTOL_AUTO_CONN 0x00008000 -/* Separate registration for audio and midi */ +/* Separate registration for audio and MIDI */ #define BRISTOL_JACK_DUAL 0x00004000 #define BRISTOL_TERM -3 @@ -377,7 +377,7 @@ typedef struct BristolVoice { char ***locals; /* * We need an event structure for each possible poly event. These will be - * fead to the voice operators for mods, etc. This should be views as the + * fed to the voice operators for mods, etc. This should be views as the * PolyMod table, ie, there are only two polyphonic modifiers, the key id * and any polypressure generated. */ @@ -388,7 +388,7 @@ typedef struct BristolVoice { pressureMsg pressure; float press; /* - * For polyponic portamento + * For polyphonic portamento */ unsigned char lastkey; /* This should not be voice, but Audio parameter. */ /* These are for the tendency generators */ @@ -423,7 +423,7 @@ typedef struct BristolIO { float *bufmem; /* buffer memory for this IO */ int samplecnt; /* number of samples in buffer */ int samplerate; /* on this IO */ - bristolModSpec modifiers; /* Midi modifiers to streamed input */ + bristolModSpec modifiers; /* MIDI modifiers to streamed input */ } bristolIO; typedef int (*bristolAlgo)(); @@ -558,7 +558,7 @@ typedef struct BAudio { bristolVoice *firstVoice; int debuglevel; /* - * This should become a generic midi modifier table. + * This should become a generic MIDI modifier table. */ float contcontroller[MIDI_CONTROLLER_COUNT]; int GM2values[MIDI_CONTROLLER_COUNT]; @@ -570,7 +570,7 @@ typedef struct BAudio { int controlid; int midichannel; char ***locals; /* Unique locals per voice, a basic necessity. */ - void ***params; /* Unique params per voice, for midi poly support, etc. */ + void ***params; /* Unique params per voice, for MIDI poly support, etc. */ char ***FXlocals; u_int64_t mixflags; unsigned int midiflags; @@ -662,12 +662,12 @@ typedef struct AudioMain { int s440holder; /* not used? */ char *audiodev; /* both of these really need to become multiheaded? */ char *mididev; - int port; /* for tcp connecctions */ + int port; /* for tcp connections */ float ingain; float outgain; char *microTonalMappingFile; unsigned int SysID; - jack_ringbuffer_t *rb; /* MIDI thread to audio threadd */ + jack_ringbuffer_t *rb; /* MIDI thread to audio thread */ jack_ringbuffer_t *rbfp; /* MIDI/Audio thread to forwarding thread */ char jackUUID[BRISTOL_JACK_UUID_SIZE]; int iocount; diff --git a/include/bristol/bristolmessages.h b/include/bristol/bristolmessages.h index 6ff05aa..3c046b0 100644 --- a/include/bristol/bristolmessages.h +++ b/include/bristol/bristolmessages.h @@ -32,7 +32,7 @@ #define MSG_TYPE_SESSION 8 // Type-2 messages /* - * These will be wrapped in s MIDI sysex, and sent down the control link. + * These will be wrapped in MIDI SysEx, and sent down the control link. * We will either require ALL codes are 7 bits only, or will put in an * encoder. */ diff --git a/include/bristol/bristolmidi.h b/include/bristol/bristolmidi.h index ac8af2f..f90514a 100644 --- a/include/bristol/bristolmidi.h +++ b/include/bristol/bristolmidi.h @@ -21,10 +21,10 @@ /* * Some structures for device management. These are for the library internal, - * and not for anybody using the API. If you want to use the midi library, use + * and not for anybody using the API. If you want to use the MIDI library, use * bristolmdidiapi.h * - * This controls messages on any given midi channel, handles that have been + * This controls messages on any given MIDI channel, handles that have been * opened for any channel, and global control structures. */ @@ -126,7 +126,7 @@ typedef struct BristolMidiDev { int lastcommand; int lastcommstate; unsigned int sequence; - int handleCount; /* numberof handles using this dev */ + int handleCount; /* number of handles using this dev */ struct { int count; bristolMsg *bm; @@ -155,7 +155,7 @@ typedef struct BristolMidiMain { bristolMidiHandle handle[BRISTOL_MIDI_HANDLES]; int (*msgforwarder)(); /* int GM2values[128][16]; // Values all controllers by channel */ -/* int mapping[128][16]; // default midi conntroller mapping table. */ +/* int mapping[128][16]; // default MIDI controller mapping table. */ } bristolMidiMain; extern int bristolGetMidiFD(int); diff --git a/include/bristol/bristolmidiapi.h b/include/bristol/bristolmidiapi.h index ddaed85..7c19a4b 100644 --- a/include/bristol/bristolmidiapi.h +++ b/include/bristol/bristolmidiapi.h @@ -62,7 +62,7 @@ extern void bristolMidiPrintGM2(); #define BRISTOL_CONN_MIDI 0x00000040 #define BRISTOL_CONN_OSSMIDI 0x00000080 /* As opposed to ALSA */ #define BRISTOL_CONN_SEQ 0x00000100 /* ALSA Sequencer interface */ -#define BRISTOL_CONN_JACK 0x00000200 /* Jack Midi interface */ +#define BRISTOL_CONN_JACK 0x00000200 /* JACK MIDI interface */ #define BRISTOL_CONN_PASSIVE 0x00001000 /* listen socket. */ #define BRISTOL_CONN_FORCE 0x00002000 @@ -83,7 +83,7 @@ extern void bristolMidiPrintGM2(); #define _BRISTOL_MIDI_DEBUG 0x20000000 /* - * Midi command codes + * MIDI command codes */ #define BRISTOL_MIDI_CHANNELS 16 #define BRISTOL_NOTE_ON (1 << (MIDI_NOTE_ON >> 4)) @@ -158,7 +158,7 @@ extern void bristolMidiPrintGM2(); #define BRISTOL_REQ_SYSEX 0x080 #define BRISTOL_REQ_ALL 0x0ff -#define BRISTOL_REQ_NSX 0x07f /* not sysex messages....... */ +#define BRISTOL_REQ_NSX 0x07f /* not SysEx messages....... */ #define MIDI_GM_DATAENTRY 6 #define MIDI_GM_NRP 99 diff --git a/include/bristol/bristolmidieventnames.h b/include/bristol/bristolmidieventnames.h index b29743b..963eb00 100644 --- a/include/bristol/bristolmidieventnames.h +++ b/include/bristol/bristolmidieventnames.h @@ -50,7 +50,7 @@ static char eventNames[8][32] = { /* * These are the control names encoded as 7 bits in the second byte of any - * related midi message, the value is encoded as 7 bits in the 3rd byte. For + * related MIDI message, the value is encoded as 7 bits in the 3rd byte. For * some controls there are two messages for high and low order bytes for 14 * bit resolution however the sequencing of the two messages is a little * ambiguous. diff --git a/include/bristol/bristolsid.h b/include/bristol/bristolsid.h index 73b23fa..ecc9b14 100644 --- a/include/bristol/bristolsid.h +++ b/include/bristol/bristolsid.h @@ -21,7 +21,7 @@ /* * Emulator code for the C64 SID audio chip. All the register numbers and bit - * masks are defined here, the sid.c code will accept the register addressess, + * masks are defined here, the sid.c code will accept the register addresses, * parse the register bitmaps into some internal tables and then allow IO to * generate all the signals. The SID chip was partly digital (OSC/Env/noise) * and partly analogue (filter). This is emulated as integer code and floating @@ -136,21 +136,21 @@ #define B_SID_SN_RATIO 0x05 /* Filter noise */ #define B_SID_SN_LEAKAGE 0x06 /* Envelope leakage */ #define B_SID_DC_BIAS 0x07 /* Output DC signal bias */ -#define B_SID_OBERHEIM 0x08 /* Feed forword level of filter poles */ +#define B_SID_OBERHEIM 0x08 /* Feed forward level of filter poles */ #define B_SID_CLOCKRATE 0x09 /* Nominal chip clock MHz */ /* * These are frequency table multipliers to convert the phase offsets to and * from actual frequencies. The following can be used to define the Oscillator * phase accumulator for a given Frequency, hence we can define at least a - * midi key to phase accumulation mapping table. This calculation is based on + * MIDI key to phase accumulation mapping table. This calculation is based on * the nominal 1Mhz clock from the original. * * Fout = Fn * Fclk/16777216 * Fout = Fn * 0.059604645 * Fphase = Fout / 0.059604645 * - * Note: the C64 had ntsc and pal version with different CPU clock speeds. The + * Note: the C64 had NTSC and PAL version with different CPU clock speeds. The * divider function need to match the frequency tables. */ #define B_SID_FREQ_DIV_PAL 0.059604645 diff --git a/include/bristol/ringbuffer.h b/include/bristol/ringbuffer.h index f493f35..c49818b 100644 --- a/include/bristol/ringbuffer.h +++ b/include/bristol/ringbuffer.h @@ -107,7 +107,7 @@ void jack_ringbuffer_get_read_vector(const jack_ringbuffer_t *rb, jack_ringbuffer_data_t *vec); /** - * Fill a data structure with a description of the current writable + * Fill a data structure with a description of the current writeable * space in the ringbuffer. The description is returned in a two * element array of jack_ringbuffer_data_t. Two elements are needed * because the space available for writing may be split across the end @@ -144,7 +144,7 @@ size_t jack_ringbuffer_read(jack_ringbuffer_t *rb, char *dest, size_t cnt); * Read data from the ringbuffer. Opposed to jack_ringbuffer_read() * this function does not move the read pointer. Thus it's * a convenient way to inspect data in the ringbuffer in a - * continous fashion. The price is that the data is copied + * continuous fashion. The price is that the data is copied * into a user provided buffer. For "raw" non-copy inspection * of the data in the ringbuffer use jack_ringbuffer_get_read_vector(). * diff --git a/include/slab/fbDefs.h b/include/slab/fbDefs.h index 3e12167..bebb94d 100644 --- a/include/slab/fbDefs.h +++ b/include/slab/fbDefs.h @@ -21,7 +21,7 @@ /* - * This is the sementic representation of the bussed algorithms, including + * This is the semantic representation of the bussed algorithms, including * algorithm names, parameters and value. * * I would prefer for this to be parsed into the frontend, simply for ease of diff --git a/include/slab/slabEffects.h b/include/slab/slabEffects.h index 254ef9d..c92a4b3 100644 --- a/include/slab/slabEffects.h +++ b/include/slab/slabEffects.h @@ -44,7 +44,7 @@ #define SLAB_SAMPLE_RATE 2 /* - * The API only spports SLab_Potmeter as of the 1.0 release. Later + * The API only supports SLab_Potmeter as of the 1.0 release. Later * implementations will use the rest, and drop the enumerated type in * preference for #define's. */ diff --git a/include/slab/slabaudiodev.h b/include/slab/slabaudiodev.h index 77376ec..23febe7 100644 --- a/include/slab/slabaudiodev.h +++ b/include/slab/slabaudiodev.h @@ -84,7 +84,7 @@ extern int pulseDevWrite(); #define SLAB_8_BIT_IN 0x0040 /* For general convergence options */ #define SLAB_8_BIT_OUT 0x0080 /* For general convergence options */ #ifdef SUBFRAGMENT -#define SLAB_SUBFRAGMENT 0x0100 /* decouple blockSampleSize from fragemnts */ +#define SLAB_SUBFRAGMENT 0x0100 /* decouple blockSampleSize from fragments */ #define SLAB_SUBF_IOCTL 0x2000 /* Allow subfragment to use old ioctl()s */ #endif #ifdef IOCTL_DBG @@ -221,7 +221,7 @@ typedef struct DuplexDev { #endif int preLoad; #ifdef FLOAT_PROC - int masterFloatAlgoLeft[MAX_DEVICES]; /* MAXDEVS is incorrent, there is */ + int masterFloatAlgoLeft[MAX_DEVICES]; /* MAXDEVS is incorrect, there is */ int masterFloatAlgoRight[MAX_DEVICES];/* relationship, it is just a count */ #endif #ifdef DELTA_ACC /* For delta accumulation with microAdjust code */ diff --git a/include/slab/slabbus.h b/include/slab/slabbus.h index bb8c801..fb2818c 100644 --- a/include/slab/slabbus.h +++ b/include/slab/slabbus.h @@ -31,7 +31,7 @@ typedef struct effectControl { } effectcontrol; typedef struct BusParams { - int *pRead; /* the memory indeces */ + int *pRead; /* the memory indexes */ int *pWrite; int *cRead; int *cWrite; diff --git a/include/slab/slabcbuf.h b/include/slab/slabcbuf.h index a657c4b..ad2f35c 100644 --- a/include/slab/slabcbuf.h +++ b/include/slab/slabcbuf.h @@ -60,7 +60,7 @@ typedef struct cBuff { int diskBufferSize; /* disk buffer size */ int diskBufferFD; - int loadSegSize; /* size of data to fetch per reqest */ + int loadSegSize; /* size of data to fetch per request */ int preLoadSize; /* amount of buffer to maintain filled */ int preMixSize; /* amount of output buffer to initialise before start */ int EndOfFile; @@ -117,7 +117,7 @@ typedef struct cBuff { int lseeked; char * dioPRead; /* where the engine process is mixing from */ - char * dioPWrite; /* where the engine is currently reocrding to */ + char * dioPWrite; /* where the engine is currently recording to */ char * dioCRead; /* where the mixiod process is loading to = from disk */ char * dioCWrite; /* where the mixiod is currently read from = to disk */ @@ -134,7 +134,7 @@ typedef struct cBuff { #ifdef FX_CHAINS #ifdef FLOAT_PROC /* - * If we are going to use FLOATs, then we need to have indeces for each + * If we are going to use FLOATs, then we need to have indexes for each * track, rather than for each bus. */ char trackStart[MAX_TRACK_COUNT]; /* index of first busParamPtr in chain */ @@ -152,7 +152,7 @@ typedef struct cBuff { /* * Record offsets are used since we only expect to be able to record - * one or two track simultaniously. To save disk write operations + * one or two track simultaneously. To save disk write operations * we only write the data for the recording tracks, not all tracks. * These are specified as two offsets of recordSegSize, 3 and 4 are not * yet supported. @@ -213,7 +213,7 @@ typedef struct cBuff { trackparams trackParams[ALL_TRACKS]; #ifdef I_NR /* - * For input gating and NR we need seperate algo pointers (handled in + * For input gating and NR we need separate algo pointers (handled in * mixiod, rather than mixengined, and some record parameters. * This stuff should be moved to the DuplexDev structure. */ @@ -228,7 +228,7 @@ typedef struct cBuff { int XTalk; int wowFlutter; - int scratchLevel; /* The volume of the scratchs */ + int scratchLevel; /* The volume of the scratches */ int scratchDensity; /* Number of scratches applied per sampleBlockSize */ int scratchAlgo; /* Stereo, mono or hybrid scratch */ int scratchInited; diff --git a/include/slab/slabdefinitions.h b/include/slab/slabdefinitions.h index f3e0881..2297d0f 100644 --- a/include/slab/slabdefinitions.h +++ b/include/slab/slabdefinitions.h @@ -184,7 +184,7 @@ typedef struct CAlgo { #define MIX_C_GO_INPUT 3 /* start pre-load from current location */ #define MIX_C_GO_OUTPUT 4 /* start pre-load from current location */ #define MIX_C_GO_DUPLEX 5 /* start pre-load from current location */ -#define MIX_C_GOTO 6 /* start-preload from current startOffest */ +#define MIX_C_GOTO 6 /* start-preload from current startOffset */ #define MIX_C_STOP 7 /* stop current operations */ #define MIX_C_CLOSE 8 /* close the current data file */ #define MIX_C_OPEN 9 /* open new file as specified in trackName[] */ @@ -216,7 +216,7 @@ enum mixIOstatus { }; /* - * Compression definitions, should be in seperate file? + * Compression definitions, should be in separate file? * 8 classes available, at the moment, only 2 are implemented */ #define COMP_CLASS_SIZE 3 diff --git a/include/slab/slabrevisions.h b/include/slab/slabrevisions.h index 1ffbfd8..a43448d 100644 --- a/include/slab/slabrevisions.h +++ b/include/slab/slabrevisions.h @@ -34,7 +34,7 @@ * into the buffer to keep ahead of the MIXD. * - MIXD using this for new writen data - PWrite + MIXD using this for new written data - PWrite | MIXD currently mixing this data - PRead | | V V @@ -86,7 +86,7 @@ * Reved to 1.1.3 for pre and post dyn/EQ VU meterage. * Reved to 1.1.4 for ADSR dynamics envelope * Reved to 1.1.5 for decompressionMethod - * Reved to 1.1.7 for initial Midi Stuff + * Reved to 1.1.7 for initial MIDI Stuff * Reved to 1.2.0 for 2.0 beta1 * Reved to 1.2.1 for removal of CSI file stuff * Reved to 1.3.0 for 2.0 release @@ -344,7 +344,7 @@ #if BUILD_LEVEL >= 310 #define ADIOD_MULTI 0x4000 /* Single audio IO daemon */ -#define SESSION_TIMERS /* milli second timers for session recording */ +#define SESSION_TIMERS /* millisecond timers for session recording */ #define SESSION_POINTERS /* Offsets for session list from TapeSLab */ #define SMOOTH_MEMORY /* Check for alterations from baseline to current mix */ /* diff --git a/include/slab/slabtrack.h b/include/slab/slabtrack.h index cdd250d..46da6e1 100644 --- a/include/slab/slabtrack.h +++ b/include/slab/slabtrack.h @@ -26,7 +26,7 @@ * * The next set of definitions are for a track array. This is assigned * dynamically in shmem in the main init code. This is used to control the - * relative volumes of each track, filter definitions, algorithm indeces. + * relative volumes of each track, filter definitions, algorithm indexes. * * Its big, and we need MAX_TRACK_COUNT of them in the controlBuffer, * but it governs all of the internal digital sound processing algorithms. @@ -88,7 +88,7 @@ typedef struct TrackParams { int nrCurGain; /* For PIPO operations */ #endif /* - * Bussing parameters, with algos as indeces into the mixAlgo arrays. + * Bussing parameters, with algos as indexes into the mixAlgo arrays. * Send algos - implement 2. * Filter Algo. * Pan algo. diff --git a/libbrighton/brightonButton.c b/libbrighton/brightonButton.c index 874a616..fd08c82 100644 --- a/libbrighton/brightonButton.c +++ b/libbrighton/brightonButton.c @@ -369,7 +369,7 @@ configure(brightonDevice *dev, brightonEvent *event) /* * If this was not a space bar which we use to activate and de-activate * any arbitrary button then it could be that we pressed some key that - * can otherwise be interpretted. + * can otherwise be interpreted. * This is awkward since here we are in a single button and I would * like to use keypress to emulate a piano keyboard from the computer. * These events would have to be delivered to the parent, not to the diff --git a/libbrighton/brightonColorMgt.c b/libbrighton/brightonColorMgt.c index 860aec3..bb471ca 100644 --- a/libbrighton/brightonColorMgt.c +++ b/libbrighton/brightonColorMgt.c @@ -662,7 +662,7 @@ brightonFreeGC(brightonWindow *bwin, int index) /* * The primary use of GCs is for color selection, and then also primarily in the - * forgreound. We are going to request colors as R/G/B tuples, as yet not with + * foreground. We are going to request colors as R/G/B tuples, as yet not with * any structure management although this may happen. We will consider the use * of hash table lookup with best fit, limiting the total number of colours * that brighton can reserve, and keep stats on lookup performance for different diff --git a/libbrighton/brightonEventHandlers.c b/libbrighton/brightonEventHandlers.c index 5b9ae45..daab5c6 100644 --- a/libbrighton/brightonEventHandlers.c +++ b/libbrighton/brightonEventHandlers.c @@ -113,7 +113,7 @@ brightonKeyPress(brightonWindow *bwin, brightonEvent *event) /* * Finally, as this is a key press event I want to pass it through to the - * midi library. This is a rather ugly hack to have a more useful keyboard + * MIDI library. This is a rather ugly hack to have a more useful keyboard * mapping. We should only really do this from the keyboard panel, but that * if for later study. */ @@ -169,7 +169,7 @@ brightonButtonPress(brightonWindow *bwin, brightonEvent *event) /* * We need to determine which device is under the selection, and force - * statefull delivery of events to that device for further motion. + * stateful delivery of events to that device for further motion. */ bwin->activepanel = 0; @@ -264,7 +264,7 @@ brightonEnterNotify(brightonWindow *bwin, brightonEvent *event) if (bwin->flags & BRIGHTON_DEBUG) printf("AutoZoom\n"); - // Make sure we are initted + // Make sure we are init'ed if ((bwin->minh == 0) || (bwin->maxh == 0)) brightonFillRatios(bwin); @@ -338,7 +338,7 @@ brightonLeaveNotify(brightonWindow *bwin, brightonEvent *event) if (bwin->flags & BRIGHTON_DEBUG) printf("AutoZoom\n"); - // Make sure we are initted + // Make sure we are init'ed if ((bwin->minh == 0) || (bwin->maxh == 0)) brightonFillRatios(bwin); diff --git a/libbrighton/brightonHButton.c b/libbrighton/brightonHButton.c index db33587..45ef0d0 100644 --- a/libbrighton/brightonHButton.c +++ b/libbrighton/brightonHButton.c @@ -282,7 +282,7 @@ configure(brightonDevice *dev, brightonEvent *event) /* * If this was not a space bar which we use to activate and de-activate * any arbitrary hbutton then it could be that we pressed some key that - * can otherwise be interpretted. + * can otherwise be interpreted. * This is awkward since here we are in a single hbutton and I would * like to use keypress to emulate a piano keyboard from the computer. * These events would have to be delivered to the parent, not to the diff --git a/libbrighton/brightonInterface.c b/libbrighton/brightonInterface.c index 8ed7477..3d375ea 100644 --- a/libbrighton/brightonInterface.c +++ b/libbrighton/brightonInterface.c @@ -68,7 +68,7 @@ int gs, int x, int y) if (aa & BRIGHTON_LIB_DEBUG) { - printf("libbrighton debuging enabled\n"); + printf("libbrighton debugging enabled\n"); display->flags |= BRIGHTON_LIB_DEBUG; } aa &= ~BRIGHTON_LIB_DEBUG; diff --git a/libbrighton/brightonLedBlock.c b/libbrighton/brightonLedBlock.c index 1b466d1..44bacd4 100644 --- a/libbrighton/brightonLedBlock.c +++ b/libbrighton/brightonLedBlock.c @@ -274,7 +274,7 @@ configure(brightonDevice *dev, brightonEvent *event) /* * If this was not a space bar which we use to activate and de-activate * any arbitrary ledblock then it could be that we pressed some key that - * can otherwise be interpretted. + * can otherwise be interpreted. * This is awkward since here we are in a single ledblock and I would * like to use keypress to emulate a piano keyboard from the computer. * These events would have to be delivered to the parent, not to the diff --git a/libbrighton/brightonPanelMgt.c b/libbrighton/brightonPanelMgt.c index 803f336..4d8415e 100644 --- a/libbrighton/brightonPanelMgt.c +++ b/libbrighton/brightonPanelMgt.c @@ -119,7 +119,7 @@ configurePanel(brightonWindow *bwin, brightonIResource *panel, //printf(" REQ UNEXPOSE %x %x\n", (size_t) event, (size_t) panel); panel->flags |= BRIGHTON_WITHDRAWN; /* - * On unexpose events we dont do any redraws? Conceptually we + * On unexpose events we don't do any redraws? Conceptually we * only have overlapping panels, and EXPOSE/UNEXPOSE go in * pairs - the next event on another panel will draw over the * top of me. @@ -216,7 +216,7 @@ configurePanel(brightonWindow *bwin, brightonIResource *panel, bvgRenderInt(bwin, rindex(panel->image->name, '/'), panel->canvas); /* - * And then render it onto the window cavas area + * And then render it onto the window canvas area */ brightonStretch(bwin, panel->canvas, bwin->canvas, panel->sx, panel->sy, panel->sw, panel->sh, BRIGHTON_ANTIALIAS); @@ -542,7 +542,7 @@ brightonCreateInterface(brightonWindow *bwin, brightonApp *app) bwin->app->resources[i].surface = brightonReadImage(bwin, res->surface); /* - * We need to calculate our size, and then create a backgorund canvas + * We need to calculate our size, and then create a background canvas * for panel rendering. This will only happen when the first configure * notify arrives. */ diff --git a/libbrighton/brightonRender.c b/libbrighton/brightonRender.c index 9a05e5c..bffc9fa 100644 --- a/libbrighton/brightonRender.c +++ b/libbrighton/brightonRender.c @@ -87,7 +87,7 @@ brightonWorldChanged(brightonWindow *bwin, int width, int height) * them. * * 110908 - FR 2243291 - Add an option to override the checks for aspect - * ratio. Required by some window managers to prevent permanant redrawing + * ratio. Required by some window managers to prevent permanent redrawing * of the window however it results in some pretty gruesome images if the * ratio is not a reasonable approximation of the original. * @@ -742,7 +742,7 @@ register int x, register int y, register int width, register int height) * * Adding another layer initially for patch cabling. We should * consider adding the top layer last and allow it to act as a - * transparancy, but that is non trivial since we are not dealing + * transparency, but that is non trivial since we are not dealing * with colors, but with pixel identifiers. FFS. Done. * * FS: We should paint in the pixel as if the transparency were @@ -754,7 +754,7 @@ register int x, register int y, register int width, register int height) * implemented a trivial LR/TB antialiasing. Will extend it to use * a sandwiched bitmap since otherwise there are issues with how * devices are rendered - they are not antialiased as they appear - * in a separate layer. The results are actualy quite nice, the + * in a separate layer. The results are actually quite nice, the * textures and blueprints get smoothed and the devices stand out * as more than real. Optional total smoothing is also possible. */ @@ -851,7 +851,7 @@ register int x, register int y, register int width, register int height) } /* - * A tesselation algorithm, takes a bitmap and tiles it onto the specified area. + * A tessellation algorithm, takes a bitmap and tiles it onto the specified area. */ int brightonTesselate(register brightonWindow *bwin, register brightonBitmap *src, @@ -956,7 +956,7 @@ brightonround(float x) } /* - * This is a scaling render algorithm. Takes a bitmap and speads it across + * This is a scaling render algorithm. Takes a bitmap and spreads it across * the brightonWindow canvas area with interpolative antialiasing. It is only * really intended for blueprints as they are the only ones that are not easily * interpolated. @@ -991,7 +991,7 @@ src->width, src->height, primary); return; /* - * Scratch should be allocated and only reallocated if it inceases in size + * Scratch should be allocated and only reallocated if it increases in size * which is a fairly easy enhancement. */ scratch = (int *) brightonmalloc(sizeof(int) * dest->width * dest->height); @@ -1169,7 +1169,7 @@ printf("%f %f: %f %i, %f %i\n", px, py, fx, ix, fy, iy); } /* - * This is a scaling render algorithm. Takes a bitmap and speads it across + * This is a scaling render algorithm. Takes a bitmap and spreads it across * the brightonWindow canvas area. We should do some bounds checking first. */ void diff --git a/libbrighton/brightonXpmRead.c b/libbrighton/brightonXpmRead.c index 93bef70..a143fab 100644 --- a/libbrighton/brightonXpmRead.c +++ b/libbrighton/brightonXpmRead.c @@ -40,7 +40,7 @@ extern void brightonSprintColor(brightonWindow *, char *, int); #define CTAB_SIZE 2048 /* - * In the next peice of code we are calling brightonfopen(), brightonfgets() + * In the next piece of code we are calling brightonfopen(), brightonfgets() * and brightonfclose(), these are empty stubs that would get removed at * -O3 or so however I have used them at times for debugging heap corruption * and the overhead is minimal and only affects startup, not runtime. @@ -225,7 +225,7 @@ xpmread(brightonWindow *bwin, char *filename) /* * We now have some reasonable w, h, c and p. Need to parse c color lines. - * We have to build a table of the character indeces from the XPM file. To + * We have to build a table of the character indexes from the XPM file. To * do this we need a character table and index. Rather than define them in * this file I am going to re-use some parts of the bitmap structure. */ @@ -495,7 +495,7 @@ brightonXpmWrite(brightonWindow *bwin, char *file) for (cindex = 0; cindex < ccnt; cindex++) { /* - * We have to be reasonably intelligent with the color indeces. The + * We have to be reasonably intelligent with the color indexes. The * first attempt failed when we went over about 80 colors. The index * needs to become a string. We could go for two digits immediately? */ diff --git a/libbrightonX11/bColor.c b/libbrightonX11/bColor.c index 3894ff9..7c90912 100644 --- a/libbrightonX11/bColor.c +++ b/libbrightonX11/bColor.c @@ -221,7 +221,7 @@ BInitColorMap(brightonDisplay *display) bd->depth, DirectColor, &bd->dvi)) { /* - * No Psuedos or Directs. We could consider greyscale.... + * No Pseudos or Directs. We could consider greyscale.... * This is probably superfluous these days. */ printf("Prefer not to have greyscale graphics.\n"); diff --git a/libbrightonX11/bEvent.c b/libbrightonX11/bEvent.c index 3ac0a01..3a1addc 100644 --- a/libbrightonX11/bEvent.c +++ b/libbrightonX11/bEvent.c @@ -167,7 +167,7 @@ BNextEvent(brightonDisplay *display, brightonEvent *event) /* * This is a bit of overkill, I want to just use NextEvent however I need - * to also get some notifications from the midi control channel into this + * to also get some notifications from the MIDI control channel into this * thread since they may update the screen. Only have a callback active * means this is not easy. It would probably have been better to reconsider * the thread separation but anyway, we check for masked and typed events, diff --git a/libbrightonX11/bRender.c b/libbrightonX11/bRender.c index 6627076..4e25320 100644 --- a/libbrightonX11/bRender.c +++ b/libbrightonX11/bRender.c @@ -150,7 +150,7 @@ int destx, int desty) if(bd->shminfo.shmid < 0) return(0); - /* attach, and check for errrors */ + /* attach, and check for errors */ bd->shminfo.shmaddr = image->data = (char *) shmat(bd->shminfo.shmid, 0, 0); if (bd->shminfo.shmaddr == (char *) -1) @@ -162,7 +162,7 @@ int destx, int desty) /* * This looks odd but now that we have attached it, mark it for * deletion. This will clear up the mess after all the detaches - * have occured. + * have occurred. */ shmctl(bd->shminfo.shmid, IPC_STAT, &myshmid); shmctl(bd->shminfo.shmid, IPC_RMID, &myshmid); @@ -204,7 +204,7 @@ int destx, int desty) IPC_CREAT | 0777 ); if(bd->shminfo.shmid < 0) return(0); - /* attach, and check for errrors */ + /* attach, and check for errors */ bd->shminfo.shmaddr = image->data = (char *) shmat(bd->shminfo.shmid, 0, 0); if (bd->shminfo.shmaddr == (char *) -1) @@ -216,7 +216,7 @@ int destx, int desty) /* * This looks odd but now that we have attached it, mark it for * deletion. This will clear up the mess after all the detaches - * have occured. + * have occurred. */ shmctl(bd->shminfo.shmid, IPC_STAT, &myshmid); shmctl(bd->shminfo.shmid, IPC_RMID, &myshmid); diff --git a/libbristol/audioRoutines.c b/libbristol/audioRoutines.c index 3ddf991..b0fae85 100644 --- a/libbristol/audioRoutines.c +++ b/libbristol/audioRoutines.c @@ -26,7 +26,7 @@ * then call our audio open library, also from SLab. The benefits of this are * the need to only maintain one audio library for any new driver release * across all the audio applications. It requires a bit of work here, but the - * benefits far outway the extra work. It does require that I import a lot of + * benefits far outweigh the extra work. It does require that I import a lot of * structures (ie, headers) from SLab. */ @@ -189,7 +189,7 @@ bristolAudioWrite(register float *buf, register int count) printf("Write Failed: %i\n", result); /* * We could get into a panic here. The device originally opened - * correctly (otherwise we would assumably not be writing here. Lets + * correctly (otherwise we would assumedly not be writing here. Lets * just close and reopen the device, and see how things go. * * We should actually return a bad value, and continue, letting the diff --git a/libbristol/debugging.c b/libbristol/debugging.c index 2d98adc..aa43f88 100644 --- a/libbristol/debugging.c +++ b/libbristol/debugging.c @@ -21,7 +21,7 @@ /* * Library routines for operator management. Initialisation, creation and - * destruction of operator.s + * destruction of operators */ #include "bristol.h" diff --git a/libbristol/mixroutines.c b/libbristol/mixroutines.c index 5e941cd..e5398d1 100644 --- a/libbristol/mixroutines.c +++ b/libbristol/mixroutines.c @@ -20,7 +20,7 @@ */ /* - * This code should open the midi device (working with ALSA raw midi only for + * This code should open the MIDI device (working with ALSA raw MIDI only for * the moment (9/11/01)), and read data from it. Not sure how it will be read, * either buffers, events, or perhaps just raw data. At some point in the * development this will become a separate thread in the synth code. diff --git a/libbristol/opmgt.c b/libbristol/opmgt.c index 2046e59..2c2dccf 100644 --- a/libbristol/opmgt.c +++ b/libbristol/opmgt.c @@ -21,7 +21,7 @@ /* * Library routines for operator management. Initialisation, creation and - * destruction of operator.s + * destruction of operators */ #include "bristol.h" diff --git a/libbristolaudio/audioEngine.c b/libbristolaudio/audioEngine.c index e0367fc..f581434 100644 --- a/libbristolaudio/audioEngine.c +++ b/libbristolaudio/audioEngine.c @@ -26,7 +26,7 @@ * applications. * * The operations for audio control are rather ugly. The application sets up - * a number of values in the controlBuffer, and the engine intermittanly looks + * a number of values in the controlBuffer, and the engine intermittently looks * to see if these values are initialised. If so, it acts on the values, and * then clears them. The reason we have to use this indirection is that the * front end applications do not own the audio device, this is under control diff --git a/libbristolaudio/audioEngineALSA.c b/libbristolaudio/audioEngineALSA.c index 274c0e0..97a17a2 100644 --- a/libbristolaudio/audioEngineALSA.c +++ b/libbristolaudio/audioEngineALSA.c @@ -109,7 +109,7 @@ printf(" alsaDevClose(%08x): %08x, %08x\n", if (alsaDev[audioDev->devID].chandle != (snd_pcm_t *) NULL) { if (audioDev->cflags & SLAB_AUDIODBG) - printf("closing alsa capture channel\n"); + printf("closing ALSA capture channel\n"); /* snd_pcm_unlink((void *) alsaDev[audioDev->devID].chandle); */ snd_pcm_drop((void *) alsaDev[audioDev->devID].chandle); @@ -123,7 +123,7 @@ printf(" alsaDevClose(%08x): %08x, %08x\n", if (alsaDev[audioDev->devID].phandle != (snd_pcm_t *) NULL) { if (audioDev->cflags & SLAB_AUDIODBG) - printf("closing alsa playback channel\n"); + printf("closing ALSA playback channel\n"); snd_pcm_drain((void *) alsaDev[audioDev->devID].phandle); snd_pcm_hw_free((void *) alsaDev[audioDev->devID].phandle); snd_pcm_close((void *) alsaDev[audioDev->devID].phandle); @@ -220,7 +220,7 @@ alsaChannelConfigure(duplexDev *audioDev, snd_pcm_t **handle, * * The following only works for 16bit stereo samples. * - * Can this warning, we are going to use Jack for multichannel stuff + * Can this warning, we are going to use JACK for multichannel stuff #warning Not compatible with alternative sample sizes or channel counts */ count = audioDev->fragSize >> 2; diff --git a/libbristolaudio/audioEngineJack.c b/libbristolaudio/audioEngineJack.c index efb5f96..9701453 100644 --- a/libbristolaudio/audioEngineJack.c +++ b/libbristolaudio/audioEngineJack.c @@ -95,7 +95,7 @@ jack_shutdown(void *jackdev) #ifdef _BRISTOL_JACK_SESSION /* * This is polled by the GUI to see if any session events need handling. It is - * called fromm the idle loop of the engine parent thread. + * called from the idle loop of the engine parent thread. */ int bristolJackSessionCheck(audioMain *audiomain) @@ -120,11 +120,11 @@ bristolJackSessionCheck(audioMain *audiomain) if (audiomain->debuglevel > 1) { if (jackdev.audiomain->jackUUID[0] != '\0') - printf("jack session callback: %s %s\n", + printf("JACK session callback: %s %s\n", jackdev.sEvent->client_uuid, jackdev.audiomain->jackUUID); else - printf("jack session callback: %s\n", jackdev.sEvent->client_uuid); + printf("JACK session callback: %s\n", jackdev.sEvent->client_uuid); printf("session file is %s\n", audiomain->sessionfile); @@ -135,7 +135,7 @@ bristolJackSessionCheck(audioMain *audiomain) jack_session_reply(jackdev.handle, jackdev.sEvent); - /* This was not malloc'ed do does not belong to jack session manager */ + /* This was not malloc'ed do does not belong to JACK session manager */ jack_session_event_free(jackdev.sEvent); jackdev.sEvent = NULL; @@ -151,7 +151,7 @@ jack_session_callback(jack_session_event_t *event, void *arg) if (jackdev.sEvent != NULL) jack_session_event_free(jackdev.sEvent); - /* This is not a very good signaling method, it has race conditions */ + /* This is not a very good signalling method, it has race conditions */ jackdev.sEvent = event; } #endif @@ -191,7 +191,7 @@ audioShim(jack_nframes_t nframes, void *jd) #endif /* - * We may need to consider jack changing its nframes on the fly. Whilst + * We may need to consider JACK changing its nframes on the fly. Whilst * decreasing frames is not an issue, increasing them could be painful. * * I think I would prefer to reap all synths rather than code such an @@ -265,12 +265,12 @@ audioShim(jack_nframes_t nframes, void *jd) * * This doAudioOps is the same one used for the last few years by bristol * as its own dispatch routine. However, there are additional features - * possible with Jack such that each synth could requisition its own + * possible with JACK such that each synth could requisition its own * ports dynamically, one or two depending on the synth stereo status. * * That should be an option, probably, but either way, if it were done * then we would need to rework this dispatcher. That is not a bad thing - * since we could have the audioEngine write directly to the jack buffer + * since we could have the audioEngine write directly to the JACK buffer * rather than use the stereo interleaved outbuf. * * The reworked dispatcher should be placed in here, it is currently in @@ -299,7 +299,7 @@ audioShim(jack_nframes_t nframes, void *jd) jack_port_get_buffer(jackdev->jack_out[BRISTOL_JACK_STDOUTR], nframes); /* - * Deinterleave our output through to the jack buffers. + * Deinterleave our output through to the JACK buffers. */ toutbuf = outbuf; for (i = nframes; i > 0; i--) @@ -396,7 +396,7 @@ bristolJackClose(jackDev *jackdev) #else if (--closedown == 0) #endif - printf("unregistering jack interface: %p->%p\n", + printf("unregistering JACK interface: %p->%p\n", jackdev, jackdev->handle); else { printf("interface unregistered\n"); @@ -476,16 +476,16 @@ JackProcessCallback shim) #ifdef _BRISTOL_JACK_SESSION if (audiomain->jackUUID[0] == '\0') { - printf("registering jack interface: %s\n", regname); + printf("registering JACK interface: %s\n", regname); jackdev->handle = jack_client_open(regname, JackNullOption, NULL); } else { - printf("reregistering jack interface: %s, UUDI %s\n", + printf("reregistering JACK interface: %s, UUDI %s\n", regname, &audiomain->jackUUID[0]); jackdev->handle = jack_client_open(regname, JackSessionID, NULL, &audiomain->jackUUID[0]); } #else - printf("registering jack interface: %s\n", regname); + printf("registering JACK interface: %s\n", regname); jackdev->handle = jack_client_open(regname, JackNullOption, NULL); #endif @@ -535,7 +535,7 @@ JackProcessCallback shim) /* Samplerate mismatches should be reported however they are not critical */ if (audiomain->samplerate != (sr = jack_get_sample_rate(jackdev->handle))) - printf("\nJack SAMPLERATE MISMATCH: startBristol -jack -rate %i\n", sr); + printf("\nJACK SAMPLERATE MISMATCH: startBristol -jack -rate %i\n", sr); /* * This value can change, and we should register a callback for such an @@ -545,7 +545,7 @@ JackProcessCallback shim) */ if (audiomain->samplecount != (sr = jack_get_buffer_size(jackdev->handle))) { - printf("\nJack PERIOD COUNT MISMATCH: `startBristol -jack -count %i`\n", + printf("\nJACK PERIOD COUNT MISMATCH: `startBristol -jack -count %i`\n", sr); printf("\nYou need to ensure that bristol uses the same period size\n"); @@ -590,14 +590,14 @@ JackProcessCallback shim) if ((jackdev->jack_out[BRISTOL_JACK_STDOUTL] = jack_port_register(jackdev->handle, "out_left", JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0)) == NULL) { - printf("Cannot register jack port\n"); + printf("Cannot register JACK port\n"); audiomain->atStatus = BRISTOL_REQSTOP; return(-1); } if ((jackdev->jack_out[BRISTOL_JACK_STDOUTR] = jack_port_register(jackdev->handle, "out_right", JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0)) == NULL) { - printf("Cannot register jack port\n"); + printf("Cannot register JACK port\n"); audiomain->atStatus = BRISTOL_REQSTOP; return(-1); } @@ -611,14 +611,14 @@ JackProcessCallback shim) if ((jackdev->jack_in[BRISTOL_JACK_STDINL] = jack_port_register(jackdev->handle, "in_left", JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0)) == NULL) { - printf("Cannot register jack port\n"); + printf("Cannot register JACK port\n"); audiomain->atStatus = BRISTOL_REQSTOP; return(-1); } if ((jackdev->jack_in[BRISTOL_JACK_STDINR] = jack_port_register(jackdev->handle, "in_right", JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0)) == NULL) { - printf("Cannot register jack port\n"); + printf("Cannot register JACK port\n"); audiomain->atStatus = BRISTOL_REQSTOP; return(-1); } @@ -628,7 +628,7 @@ JackProcessCallback shim) * we are going to be running. It is wiser not to request callbacks until * at least the first synth is active. If the priorities are correct this * should not be an issue, but 'dropping' a synth costs a few cycles in - * the midi thread. + * the MIDI thread. */ while (audiomain->flags & BRISTOL_AUDIOWAIT) { @@ -645,7 +645,7 @@ JackProcessCallback shim) if (jack_activate(jackdev->handle) != 0) { - printf("Cannot activate jack\n"); + printf("Cannot activate JACK\n"); audiomain->atStatus = BRISTOL_REQSTOP; return(-1); } @@ -697,7 +697,7 @@ JackProcessCallback shim) } } else for (jport = 0; jackdev->ports[jport] != NULL; jport++) { /* - * I don't like this code but I cannot find a way to ask jack if + * I don't like this code but I cannot find a way to ask JACK if * this port is audio or midi. Without this scan then it is possible * that the engine will default a connection from audio to midi. * @@ -708,7 +708,7 @@ JackProcessCallback shim) */ if (strstr(jackdev->ports[jport], "midi") != 0) { - printf("Skipping Jack Conn: %s\n", jackdev->ports[jport]); + printf("Skipping JACK Conn: %s\n", jackdev->ports[jport]); continue; } @@ -729,7 +729,7 @@ JackProcessCallback shim) { if (strstr(jackdev->ports[jport], "midi") != 0) { - printf("Skipping Jack Conn: %s\n", jackdev->ports[jport]); + printf("Skipping JACK Conn: %s\n", jackdev->ports[jport]); continue; } @@ -795,7 +795,7 @@ JackProcessCallback shim) { if (strstr(jackdev->ports[jport], "midi") != 0) { - printf("Skipping Jack Conn: %s\n", jackdev->ports[jport]); + printf("Skipping JACK Conn: %s\n", jackdev->ports[jport]); continue; } @@ -831,7 +831,7 @@ JackProcessCallback shim) if ((jackdev->jack_out[i] = jack_port_register(jackdev->handle, pn, JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0)) == NULL) { - printf("Cannot register jack port\n"); + printf("Cannot register JACK port\n"); audiomain->atStatus = BRISTOL_REQSTOP; return(-1); } @@ -839,7 +839,7 @@ JackProcessCallback shim) if ((jackdev->jack_in[i] = jack_port_register(jackdev->handle, pn, JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0)) == NULL) { - printf("Cannot register jack port\n"); + printf("Cannot register JACK port\n"); audiomain->atStatus = BRISTOL_REQSTOP; return(-1); } @@ -895,7 +895,7 @@ bristolJackInterface(audioMain *audiomain) { /* * This was added into 0.40.3 to prevent subgraph timeouts on exit. The - * call is made from the midi thread once the audio thread has done the + * call is made from the MIDI thread once the audio thread has done the * necessary cleanup work. */ if ((audiomain == NULL) || (audiomain->audiolist == 0)) diff --git a/libbristolaudio/audioEngineOSS.c b/libbristolaudio/audioEngineOSS.c index 984b30e..09a895c 100644 --- a/libbristolaudio/audioEngineOSS.c +++ b/libbristolaudio/audioEngineOSS.c @@ -247,7 +247,7 @@ int fragSize; } /* - * Needs to be ALSAfied - ie, binned if we have alsa - this is GUI stuff. + * Needs to be ALSAfied - ie, binned if we have ALSA - this is GUI stuff. */ static void checkAudioCaps2(audioDev, devID, fd) diff --git a/libbristolaudio/audioGUI.c b/libbristolaudio/audioGUI.c index bbdf5c6..192b9dd 100644 --- a/libbristolaudio/audioGUI.c +++ b/libbristolaudio/audioGUI.c @@ -26,7 +26,7 @@ * applications. * * The operations for audio control are rather ugly. The application sets up - * a number of values in the controlBuffer, and the engine intermittanly looks + * a number of values in the controlBuffer, and the engine intermittently looks * to see if these values are initialised. If so, it acts on the values, and * then clears them. The reason we have to use this indirection is that the * front end applications do not own the audio device, this is under control diff --git a/libbristolaudio/audioGUIOSS.c b/libbristolaudio/audioGUIOSS.c index a4f4f6d..fd9f979 100644 --- a/libbristolaudio/audioGUIOSS.c +++ b/libbristolaudio/audioGUIOSS.c @@ -26,7 +26,7 @@ * applications. * * The operations for audio control are rather ugly. The application sets up - * a number of values in the controlBuffer, and the engine intermittanly looks + * a number of values in the controlBuffer, and the engine intermittently looks * to see if these values are initialised. If so, it acts on the values, and * then clears them. The reason we have to use this indirection is that the * front end applications do not own the audio device, this is under control @@ -80,7 +80,7 @@ short left, right; } /* - * Binned since alsa support was implemented. + * Binned since ALSA support was implemented. * * This is a device specific routine. We take the fd, parameter, and left * right values, and configure the device. These routines should be used by the diff --git a/libbristolaudio/audioMastering.c b/libbristolaudio/audioMastering.c index e5a736d..b6e58ae 100644 --- a/libbristolaudio/audioMastering.c +++ b/libbristolaudio/audioMastering.c @@ -25,7 +25,7 @@ * mastering file, one to write the header, and one to close the file. * * openMaster() - * The calling rouine will pass the file type. Expects an answer of: + * The calling routine will pass the file type. Expects an answer of: * -1: failure - forget mastering. * Anything else - do mastering with output to that FD number. * @@ -34,7 +34,7 @@ * must format data as necessary. * * closeMaster() - * The calling rouine will pass the file type, and the number of bytes written. + * The calling routine will pass the file type, and the number of bytes written. */ #include #include @@ -209,7 +209,7 @@ writeMaster(duplexDev *audioDev, int type, int fd, void *buffer, int size) #ifdef MASTER_CDR case MASTER_CDR: /* - * We need to byteswap first. Oops, this should cater for differnt + * We need to byteswap first. Oops, this should cater for different * output data types. */ cdrFormat(buffer, size >> 2); @@ -248,7 +248,7 @@ closeMaster(duplexDev *audioDev, int fd, int type, int count) #ifdef MASTER_CDR case MASTER_CDR: /* - * We need to pad the file to frag boundry. + * We need to pad the file to frag boundary. */ cdrPad(fd, count); break; @@ -257,7 +257,7 @@ closeMaster(duplexDev *audioDev, int fd, int type, int count) #ifdef MASTER_MP3ONLINE case MASTER_MP3ONLINE: /* - * We cannot kick the child yet, since it may not be finnished. + * We cannot kick the child yet, since it may not be finished. */ break; #endif diff --git a/libbristolic/sid.c b/libbristolic/sid.c index b1db698..fcf42ff 100644 --- a/libbristolic/sid.c +++ b/libbristolic/sid.c @@ -21,7 +21,7 @@ /* * Emulator code for the C64 SID audio chip. All the register numbers and bit - * masks are defined in bristolsid.h, code will accept the register addressess, + * masks are defined in bristolsid.h, code will accept the register addresses, * parse the register bit values into some internal tables and then allow IO to * generate all the signals. The SID chip was partly digital (Osc/Env/Noise) * and partly analogue (Filter). This is emulated as integer code and floating @@ -76,8 +76,8 @@ * has been lowered. This is as per the original, and whilst it would have * been easy to change here it was emulated as per the SID design. * - * The filter is a chamberlain 12dB multimode and is probably a bit colder - * than the original. As an option the LPF can be selected as a houvilainen + * The filter is a chamberlin 12dB multimode and is probably a bit colder + * than the original. As an option the LPF can be selected as a huovilainen * 24dB/octave, warmer but more CPU intensive. The 24dB version can also give * different levels of feedforward mixing of the other poles to also alter the * roll-off characteristics. The different dB/octave versions can also be mixed @@ -108,7 +108,7 @@ * mono (with detune then between voices in emulator) * three voice poly-1: all play same sound * three voice poly-2: all have their own sound - * two voice poly, voice 3 arpeggio - argeggiate all other held notes + * two voice poly, voice 3 arpeggio - arpeggiate all other held notes * two voice poly, voice 3 mod only * * Arpeggiator to have rate, retrig and wavescanning, rates down to X samples. @@ -387,8 +387,8 @@ typedef struct SidVoice { /* * Two different filter algorithms will be available. Both are floating point - * as the original was analogue. One is the chamberlain, it is 12dB multimode - * as per the original. The other is a houvilainen LPF as a option, a lot + * as the original was analogue. One is the chamberlin, it is 12dB multimode + * as per the original. The other is a huovilainen LPF as a option, a lot * warmer. Only one can be selected at any given time. */ typedef struct SidFilter { @@ -396,12 +396,12 @@ typedef struct SidFilter { float cutoff; float resonance; float fmix; - /* For the Chamberlain code */ + /* For the Chamberlin code */ float delay1; float delay2; float delay3; float delay4; - /* For the houvilainen code */ + /* For the huovilainen code */ float az1; float az2; float az3; @@ -530,7 +530,7 @@ bSidFilter(int id, unsigned char comm, unsigned char param) SID[id]->reg[comm] = param; /* - * The filter cutoff will go from 0 to nyquist and this parameter is only + * The filter cutoff will go from 0 to Nyquist and this parameter is only * supposed to have a range up to 12kHz. */ switch (comm) { @@ -540,7 +540,7 @@ bSidFilter(int id, unsigned char comm, unsigned char param) ((float) ((SID[id]->reg[B_SID_FILT_HI] << 3) + (SID[id]->reg[B_SID_FILT_LO] & 0x07))) / 2048.0; - /* We use 24K here since cutoff only goes up to nyquist */ + /* We use 24K here since cutoff only goes up to Nyquist */ SID[id]->filter.cutoff = SID[id]->filter.cutoff * 24000.0 / SID[id]->samplerate; @@ -1071,7 +1071,7 @@ unsigned int psample) * Attack was always linear. * * In the first iteration this was a linear decay and release, then an - * accumulator was added in that fead more delay into the decays to extende + * accumulator was added in that fed more delay into the decays to extend * them. */ static void @@ -1156,9 +1156,9 @@ bSidDoEnv(sidVoice *voice, unsigned char vflags) * * We are going to look at two filter algorithms, both floating point. * - * The default will be a chamberlain 12dB/Octave multimode HP/BP/LP. + * The default will be a chamberlin 12dB/Octave multimode HP/BP/LP. * - * An optional Houvilainen 24dB/Octave LP will be integrated, and since the + * An optional Huovilainen 24dB/Octave LP will be integrated, and since the * cutoff is tied at 12kHz or lower then we will not bother with oversampling. * * If no filter poles are selected then we pass input to output, this is not @@ -1178,7 +1178,7 @@ bSidDoFilter(bSid *s) return; } - /* chamberlain */ + /* chamberlin */ kfc = s->filter.cutoff; // * 12000 / s->samplerate; if (kfc <= 0.000001) @@ -1198,7 +1198,7 @@ bSidDoFilter(bSid *s) highpass = s->filter.delay2 - s->filter.delay4 - qres * s->filter.delay3; s->filter.delay3 = kfc * highpass + s->filter.delay3; - /* Houvilainen LPF-24 */ + /* Huovilainen LPF-24 */ if (s->reg[B_SID_CONTROL] & B_SID_C_LPF) { float kfcr; @@ -1570,7 +1570,7 @@ bSidIOInit(int id, float samplerate) } /* - * Demultiplexor for address being given, parse the value into the registers and + * Demultiplexer for address being given, parse the value into the registers and * interpret them into our local structure, finally return the current content. */ int diff --git a/libbristolmidi/inetClient.c b/libbristolmidi/inetClient.c index f8029fc..bb8034f 100644 --- a/libbristolmidi/inetClient.c +++ b/libbristolmidi/inetClient.c @@ -1,6 +1,6 @@ /* - * Diverse Bristol midi routines. + * Diverse Bristol MIDI routines. * Copyright (c) by Nick Copeland 1996,2012 * * diff --git a/libbristolmidi/inetServer.c b/libbristolmidi/inetServer.c index d380792..bcafa7f 100644 --- a/libbristolmidi/inetServer.c +++ b/libbristolmidi/inetServer.c @@ -1,6 +1,6 @@ /* - * Diverse Bristol midi routines. + * Diverse Bristol MIDI routines. * Copyright (c) by Nick Copeland 1996,2012 * * @@ -80,7 +80,7 @@ int (*callback)(), void *param, int dev, int handle) printf("Opened listening control socket: %i\n", chan); } else { /* - * Open a unix domain control socket. + * Open a Unix domain control socket. */ unlink(devname); @@ -124,7 +124,7 @@ int (*callback)(), void *param, int dev, int handle) /* * Configure this device as used, with decoding using the ALSA interface. - * We use ALSA basically since it workd. + * We use ALSA basically since it works. */ bmidi.dev[dev].flags = BRISTOL_ACCEPT_SOCKET|BRISTOL_CONN_TCP; @@ -190,8 +190,8 @@ acceptConnection(int acceptdev) return(-1); } - bmidi.handle[handle].handle = handle; /* That looks kind of wierd! */ - bmidi.handle[handle].handle = handle; /* That looks kind of wierd! */ + bmidi.handle[handle].handle = handle; /* That looks kind of weird! */ + bmidi.handle[handle].handle = handle; /* That looks kind of weird! */ bmidi.handle[handle].state = BRISTOL_MIDI_OK; bmidi.handle[handle].channel = bmidi.handle[chandle].channel; bmidi.handle[handle].dev = dev; diff --git a/libbristolmidi/interface.c b/libbristolmidi/interface.c index 084b6dd..e548a3d 100644 --- a/libbristolmidi/interface.c +++ b/libbristolmidi/interface.c @@ -1,6 +1,6 @@ /* - * Diverse Bristol midi routines. + * Diverse Bristol MIDI routines. * Copyright (c) by Nick Copeland 1996,2012 * * @@ -20,14 +20,14 @@ */ /* - * This code should open the midi device and read data from it. + * This code should open the MIDI device and read data from it. * * All requests will be dispatched to the relevant handlers, with support for * OSS (/dev/midi*), ALSA (hw:0,0) and as of release 0.8 also the ALSA sequencer * (with client.port config). * * All events will be converted into a bristol native message format for - * independency from the driver. + * independence from the driver. */ #include #include @@ -115,7 +115,7 @@ void *param) return(handle); //bmidi.msgforwarder = NULL; - bmidi.handle[handle].handle = handle; /* That looks kind of wierd! */ + bmidi.handle[handle].handle = handle; /* That looks kind of weird! */ bmidi.handle[handle].state = BRISTOL_MIDI_OK; bmidi.handle[handle].channel = chan; bmidi.handle[handle].dev = -1; @@ -125,7 +125,7 @@ void *param) /* * We should then check to see if this dev is open, and if so link * another handle to it. We should support multiple destinations of the - * same midi information. + * same MIDI information. */ if (((flags & BRISTOL_CONN_FORCE) == 0) && ((devnum = bristolMidiFindDev(dev)) >= 0)) @@ -624,7 +624,7 @@ bristolMidiControl(int handle, int channel, int operator, int controller, { unsigned char comm = 0xb0, ctr, val; -/* printf("Midi Control %i %i %i %i\n", channel, operator, controller, value); */ +/* printf("MIDI Control %i %i %i %i\n", channel, operator, controller, value); */ comm |= channel; ctr = controller; diff --git a/libbristolmidi/midiALSADevMan.c b/libbristolmidi/midiALSADevMan.c index f1e3d8a..1342ad3 100644 --- a/libbristolmidi/midiALSADevMan.c +++ b/libbristolmidi/midiALSADevMan.c @@ -1,6 +1,6 @@ /* - * Diverse Bristol midi routines. + * Diverse Bristol MIDI routines. * Copyright (c) by Nick Copeland 1996,2012 * * @@ -20,7 +20,7 @@ */ /* - * This code should open the midi device (working with ALSA raw midi only for + * This code should open the MIDI device (working with ALSA raw MIDI only for * the moment (9/11/01)), and read data from it. Not sure how it will be read, * either buffers, events, or perhaps just raw data. At some point in the * development this will become a separate thread in the synth code. @@ -74,9 +74,9 @@ int (*callback)(), void *param, int dev, int handle) /*|SND_SEQ_PORT_TYPE_SPECIFIC); */ if (snd_seq_create_port (bmidi.dev[dev].driver.seq.handle, port_info)) - printf ("error creating alsa port\n"); + printf ("error creating ALSA port\n"); else if (bmidi.flags & BRISTOL_BMIDI_DEBUG) - printf ("created alsa port\n"); + printf ("created ALSA port\n"); /* * We need to get a file descriptor for this interface, since we are going @@ -141,7 +141,7 @@ bristolMidiALSAClose(int handle) * handles it will decide if the message also needs redistributing. * * The decision to redistribute should only be taken if the message came from - * a midi device that is not a TCP connection. The destination will be selected + * a MIDI device that is not a TCP connection. The destination will be selected * if it the device is a TCP connection. */ void @@ -234,7 +234,7 @@ checkcallbacks(bristolMidiMsg *msg) unsigned char hold = msg->params.bristol.from; if (bmidi.flags & BRISTOL_BMIDI_DEBUG) - printf("callback non sysex: %i %x\n", + printf("callback non SysEx: %i %x\n", i, bmidi.handle[i].flags); if (((~bmidi.flags & BRISTOL_MIDI_GO) @@ -262,10 +262,10 @@ bristolMidiALSARead(int dev, bristolMidiMsg *msg) printf("bristolMidiALSARead(%i)\n", dev); /* - * See if we can read more data from the midi device. We need to make sure + * See if we can read more data from the MIDI device. We need to make sure * we have buffer capacity, and if so attempt to read as many bytes as we * have space for. We need to treat the buffer as endless, ie, rotary. It - * does make it pretty ugly if we come to large sysex messages. + * does make it pretty ugly if we come to large SysEx messages. */ if ((space = BRISTOL_MIDI_BUFSIZE - bmidi.dev[dev].bufcount) > 0) { @@ -344,7 +344,7 @@ bristolMidiALSARead(int dev, bristolMidiMsg *msg) return(BRISTOL_MIDI_DEV); - printf("Midi read retry (%i)\n", getpid()); + printf("MIDI read retry (%i)\n", getpid()); } #else count = read(bmidi.dev[dev].fd, @@ -366,7 +366,7 @@ bristolMidiALSARead(int dev, bristolMidiMsg *msg) /* * MARK */ - printf("no data in alsa buffer for %i (close)\n", dev); + printf("no data in ALSA buffer for %i (close)\n", dev); msg->command = -1; /* * We should consider closing whatever synth was listening diff --git a/libbristolmidi/midiDevMan.c b/libbristolmidi/midiDevMan.c index 6ae9869..c85404a 100644 --- a/libbristolmidi/midiDevMan.c +++ b/libbristolmidi/midiDevMan.c @@ -1,6 +1,6 @@ /* - * Diverse Bristol midi routines. + * Diverse Bristol MIDI routines. * Copyright (c) by Nick Copeland 1996,2012 * * @@ -29,8 +29,8 @@ bristolPhysWrite(int fd, unsigned char *message, int size) if (write(fd, message, size) != size) { - //perror("midi write error"); - printf("midi write error, fd %i, size %i\n", fd, size); + //perror("MIDI write error"); + printf("MIDI write error, fd %i, size %i\n", fd, size); return(1); } diff --git a/libbristolmidi/midiFileMgt.c b/libbristolmidi/midiFileMgt.c index c1841cd..006b532 100644 --- a/libbristolmidi/midiFileMgt.c +++ b/libbristolmidi/midiFileMgt.c @@ -1,6 +1,6 @@ /* - * Diverse Bristol midi routines. + * Diverse Bristol MIDI routines. * Copyright (c) by Nick Copeland 1996,2012 * * @@ -21,10 +21,10 @@ /* * This started out primarily to load arrays of values, they being used for - * whatever purposes required by the caller. The midi interface uses them to + * whatever purposes required by the caller. The MIDI interface uses them to * define the gain parameters for velocity and any other control settings. * The Hammond preacher algorithm uses them to load the the tonewheel settings, - * not really a midi function however the code is reasonably general. + * not really a MIDI function however the code is reasonably general. */ #include @@ -221,7 +221,7 @@ bristolGetMap(char *file, char *match, float *points, int count, int flags) float from, delta; /* - * Open and read configuration. Should consider seaching + * Open and read configuration. Should consider searching * $HOME/.bristol/memory and $BRISTOL_DB/memory. */ sprintf(tmppath, "%s/memory/profiles/%s", getBristolCache("profiles"), file); @@ -412,7 +412,7 @@ int sr) /* * This could also go into the library so the engine could use the same code? * - * We want to go through the midi controller mapping file for this synth and + * We want to go through the MIDI controller mapping file for this synth and * search for directives for value maps. The names are taken from the midi * header file and we want to add a few others for preconfigured value tables. */ @@ -814,7 +814,7 @@ bristolOpenStdio(int mode) close(std_out); std_out = f_out; /* - * We need this to log into the file rather than stdtio + * We need this to log into the file rather than stdout */ printf("\nstarting file logging [@%i.%i]\n", (int) tv.tv_sec, (int) tv.tv_usec); diff --git a/libbristolmidi/midiJACKDevMan.c b/libbristolmidi/midiJACKDevMan.c index ee7938f..73e35ff 100644 --- a/libbristolmidi/midiJACKDevMan.c +++ b/libbristolmidi/midiJACKDevMan.c @@ -1,6 +1,6 @@ /* - * Diverse Bristol midi routines. + * Diverse Bristol MIDI routines. * Copyright (c) by Nick Copeland 1996,2012 * * @@ -92,8 +92,8 @@ jackMidiRoutine(jack_nframes_t nframes, void *arg) * dispatched. We could probably call a quite early routine since we * appear to have reasonably raw midi. * - * Jack always gives me a status byte. We need to parse this then parse - * the actual midi message. + * JACK always gives me a status byte. We need to parse this then parse + * the actual MIDI message. */ bristolMidiRawToMsg(in_event.buffer, in_event.size, 0, deviceIndex, &msg); @@ -106,7 +106,7 @@ jackMidiRoutine(jack_nframes_t nframes, void *arg) checkcallbacks(&msg); } else if (bmidi.flags & BRISTOL_BMIDI_DEBUG) - printf("unknown jack midi event\n"); + printf("unknown JACK MIDI event\n"); } /* @@ -155,10 +155,10 @@ int (*callback)(), void *param, int dev, int handle) { if ((client = jack_client_open(devname, 0, NULL)) == 0) { - fprintf(stderr, "jack server not running?\n"); + fprintf(stderr, "JACK server not running?\n"); return 1; } - printf("registered jack midi name %s\n", devname); + printf("registered JACK MIDI name %s\n", devname); jack_set_process_callback(client, jackMidiRoutine, (void *) dev); @@ -175,7 +175,7 @@ int (*callback)(), void *param, int dev, int handle) } else { input_port = jack_port_register(client, "midi_in", JACK_DEFAULT_MIDI_TYPE, JackPortIsInput, 0); - printf("reused jack registration\n"); + printf("reused JACK registration\n"); } return(handle); @@ -195,20 +195,20 @@ bristolMidiJackClose(int handle) } #else /* _BRISTOL_JACK */ /* - * No jack so if we got here we need a couple of error messages to say so. + * No JACK so if we got here we need a couple of error messages to say so. */ int bristolMidiJackOpen(char *devname, int flags, int chan, int messages, int (*callback)(), void *param, int dev, int handle) { - printf("Jack MIDI requested but not linked into the library\n"); + printf("JACK MIDI requested but not linked into the library\n"); return(BRISTOL_MIDI_DRIVER); } int bristolMidiJackClose(int handle) { - printf("Jack MIDI close not linked into the library\n"); + printf("JACK MIDI close not linked into the library\n"); return(BRISTOL_MIDI_DRIVER); } #endif diff --git a/libbristolmidi/midiMsgMan.c b/libbristolmidi/midiMsgMan.c index 1441efc..cf00a67 100644 --- a/libbristolmidi/midiMsgMan.c +++ b/libbristolmidi/midiMsgMan.c @@ -1,6 +1,6 @@ /* - * Diverse Bristol midi routines. + * Diverse Bristol MIDI routines. * Copyright (c) by Nick Copeland 1996,2012 * * @@ -44,7 +44,7 @@ static struct timeval waittime; extern bristolMidiMain bmidi; /* - * This needs to go into a separate midi management interface. + * This needs to go into a separate MIDI management interface. */ int midiCheck() @@ -119,7 +119,7 @@ midiCheck() * synth active on this link it will hang around. * Unfortunately we can't really do this since * there could be multiple registrations for the - * given channel. Definately for future study. If + * given channel. Definitely for future study. If * in doubt, use the '-T' flag to bristol to have * it terminate on last close. bmidi.dev[i].msg.command = MIDI_SYSTEM; diff --git a/libbristolmidi/midiOSSDevMan.c b/libbristolmidi/midiOSSDevMan.c index a66849d..2136be2 100644 --- a/libbristolmidi/midiOSSDevMan.c +++ b/libbristolmidi/midiOSSDevMan.c @@ -1,6 +1,6 @@ /* - * Diverse Bristol midi routines. + * Diverse Bristol MIDI routines. * Copyright (c) by Nick Copeland 1996,2012 * * @@ -20,7 +20,7 @@ */ /* - * This code should open the midi device (working with ALSA raw midi only for + * This code should open the MIDI device (working with ALSA raw MIDI only for * the moment (9/11/01)), and read data from it. Not sure how it will be read, * either buffers, events, or perhaps just raw data. At some point in the * development this will become a separate thread in the synth code. @@ -49,7 +49,7 @@ int (*callback)(), void *param, int dev, int handle) if ((bmidi.dev[dev].fd = open(devname, O_RDWR)) < 0) { - printf("Could not open OSS midi interface\n"); + printf("Could not open OSS MIDI interface\n"); return(BRISTOL_MIDI_DRIVER); } diff --git a/libbristolmidi/midiParse.c b/libbristolmidi/midiParse.c index aa903e3..bdd00fa 100644 --- a/libbristolmidi/midiParse.c +++ b/libbristolmidi/midiParse.c @@ -1,6 +1,6 @@ /* - * Diverse Bristol midi routines. + * Diverse Bristol MIDI routines. * Copyright (c) by Nick Copeland 1996,2012 * * @@ -135,10 +135,10 @@ bristolMidiPrint(bristolMidiMsg *msg) * and fine, others denote semitone and cents, etc, some are integer rather * than floats. It might be better to call this later if parsing is required. * - * We also need to have a midi controller mapping system. If a controller is + * We also need to have a MIDI controller mapping system. If a controller is * remapped then we should consider it to be coarse only? * - * The engine has a version of this code with different parameterisation. It + * The engine has a version of this code with different parametrisation. It * is in midihandlers and we should pull it out into the library. */ void @@ -361,7 +361,7 @@ parseCommand(unsigned char comm, int dev) #endif /* - * We have a new command, save any interesting device state infomation. + * We have a new command, save any interesting device state information. */ bmidi.dev[dev].lastchan = comm & MIDI_CHAN_MASK; bmidi.dev[dev].lastcommand = comm & MIDI_COMMAND_MASK; @@ -375,7 +375,7 @@ parseCommand(unsigned char comm, int dev) { /* if (bmidi.dev[dev].sysex.count != sizeof(bristolMsg)) - printf("Was bad sysex message (wrong length)\n"); + printf("Was bad SysEx message (wrong length)\n"); else printf("Was right length message: %x\n", bmidi.dev[dev].sysex.count); @@ -433,7 +433,7 @@ bristolMidiRawToMsg(unsigned char *buff, int count, int index, int dev, /* * Although we know that we have buffered data, we do not know if we are * being given complete messages by the raw interface - it could be byte by - * byte, or chunks of a large sysex. Parse the data byte by byte, and see + * byte, or chunks of a large SysEx. Parse the data byte by byte, and see * if we can put together complete messages. * * Check out our current command in operation on this device: @@ -442,7 +442,7 @@ bristolMidiRawToMsg(unsigned char *buff, int count, int index, int dev, while (parsed < count) { /* - * If this is a status byte, find out what we cn do with it. Otherwise + * If this is a status byte, find out what we can do with it. Otherwise * look for data commands. if ((bmidi.dev[dev].lastcommand != MIDI_SYSTEM) && (buff[index] & MIDI_STATUS_MASK)) @@ -478,7 +478,7 @@ bristolMidiRawToMsg(unsigned char *buff, int count, int index, int dev, * Otherwise, go get the command, checking for buffer wrap. * We also need to make sure that the next spare byte is not * a status byte - ie, that we have not binned a byte in the - * midi cable. + * MIDI cable. */ if ((index + 1) == BRISTOL_MIDI_BUFSIZE) { diff --git a/libbristolmidi/midiRoutines.c b/libbristolmidi/midiRoutines.c index e4458a3..4ecfd51 100644 --- a/libbristolmidi/midiRoutines.c +++ b/libbristolmidi/midiRoutines.c @@ -1,6 +1,6 @@ /* - * Diverse Bristol midi routines. + * Diverse Bristol MIDI routines. * Copyright (c) by Nick Copeland 1996,2012 * * @@ -197,7 +197,7 @@ bristolFreeDevice(int dev) } /* - * A routine to initalise any of our internal structures. + * A routine to initialise any of our internal structures. */ void initMidiLib(int flags) diff --git a/libbristolmidi/midiSeqDevMan.c b/libbristolmidi/midiSeqDevMan.c index 3dbc11f..7ba6d79 100644 --- a/libbristolmidi/midiSeqDevMan.c +++ b/libbristolmidi/midiSeqDevMan.c @@ -1,6 +1,6 @@ /* - * Diverse Bristol midi routines. + * Diverse Bristol MIDI routines. * Copyright (c) by Nick Copeland 1996,2012 * * @@ -20,7 +20,7 @@ */ /* - * This code should open the midi device (working with ALSA raw midi only for + * This code should open the MIDI device (working with ALSA raw MIDI only for * the moment (9/11/01)), and read data from it. Not sure how it will be read, * either buffers, events, or perhaps just raw data. At some point in the * development this will become a separate thread in the synth code. @@ -406,7 +406,7 @@ translate_event(snd_seq_event_t *ev, bristolMidiMsg *msg, int dev) /* * Go look at the event. We are only concerned for now (ns-18/06/02) with - * midi realtime messages - note on/off, controllers, pressures, pitch. + * MIDI realtime messages - note on/off, controllers, pressures, pitch. */ switch (ev->type) { case SND_SEQ_EVENT_NOTE: @@ -487,7 +487,7 @@ translate_event(snd_seq_event_t *ev, bristolMidiMsg *msg, int dev) #endif /* - * Hm, we may need to recode these to 7 bit midi values? + * Hm, we may need to recode these to 7 bit MIDI values? */ msg->command = MIDI_CONTROL| ev->data.note.channel; msg->channel = ev->data.control.channel; @@ -548,7 +548,7 @@ translate_event(snd_seq_event_t *ev, bristolMidiMsg *msg, int dev) #endif /* - * Hm, we may need to recode these to 7 bit midi values? + * Hm, we may need to recode these to 7 bit MIDI values? */ msg->command = MIDI_PITCHWHEEL| ev->data.note.channel; msg->channel = ev->data.control.channel; diff --git a/libbristolmidi/midiTCPDevMan.c b/libbristolmidi/midiTCPDevMan.c index fdaaaa5..3f85216 100644 --- a/libbristolmidi/midiTCPDevMan.c +++ b/libbristolmidi/midiTCPDevMan.c @@ -1,6 +1,6 @@ /* - * Diverse Bristol midi routines. + * Diverse Bristol MIDI routines. * Copyright (c) by Nick Copeland 1996,2012 * * @@ -140,7 +140,7 @@ int (*callback)(), void *param, int dev, int handle) } else { /* * We need to open a control socket to the bristol engine. For the time - * being we will only be concerned with a unix domain socket. + * being we will only be concerned with a Unix domain socket. */ if ((bmidi.dev[dev].fd = socket(AF_LOCAL, SOCK_STREAM, 0)) < 0) { @@ -199,7 +199,7 @@ bristolMidiTCPRead(bristolMidiMsg *msg) FD_ZERO(read_set); /* - * Find ports of type TCP, see if they have buffer spaace then schedule them + * Find ports of type TCP, see if they have buffer space then schedule them * to be read. */ for (dev = 0; dev < BRISTOL_MIDI_DEVCOUNT; dev++) diff --git a/libbristolmidi/scalaParse.c b/libbristolmidi/scalaParse.c index 3d5a909..0e428f6 100644 --- a/libbristolmidi/scalaParse.c +++ b/libbristolmidi/scalaParse.c @@ -1,6 +1,6 @@ /* - * Diverse Bristol midi routines. + * Diverse Bristol MIDI routines. * Copyright (c) by Nick Copeland 1996,2012 * * @@ -23,7 +23,7 @@ * This will take a character filename and a float mapping, attempt to find the * specified file with a few different names/locations and then parse the * contents into the float array. The end result is a set of frequency tables - * that can be converted separately into the midi frequency map. + * that can be converted separately into the MIDI frequency map. * * Bounds checking is done to limit the float map to 128 entries. * diff --git a/libbristolmidi/socketToolKit.c b/libbristolmidi/socketToolKit.c index 1036afa..ea0fb1a 100644 --- a/libbristolmidi/socketToolKit.c +++ b/libbristolmidi/socketToolKit.c @@ -1,6 +1,6 @@ /* - * Diverse Bristol midi routines. + * Diverse Bristol MIDI routines. * Copyright (c) by Nick Copeland 1996,2012 * *