Cleanup: Fix formatting and typos (mostly in comments)

Author: nomadbyte

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.

README

@@ -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 */
 

bin/bristoljackstats.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

brighton/brighton.c

@@ -876,20 +876,20 @@ 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,
 				synth->location, synth->mem.active, 0, 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;
 	}
@@ -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.
 	 *

brighton/brightonArp2600.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);

brighton/brightonAxxe.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);

brighton/brightonBME700.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 <fcntl.h>
@@ -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;