Merge branch 'master' of https://github.com/johnnesky/beepbox, and fix bugs with Midi export for custom chip and drumset instruments.

Author: jummbus

editor/BeatsPerBarPrompt.ts

@@ -97,7 +97,7 @@ namespace beepbox {
 		private _saveChanges = (): void => {
 			window.localStorage.setItem("beatCountStrategy", this._conversionStrategySelect.value);
 			this._doc.prompt = null;
-			this._doc.record(new ChangeBeatsPerBar(this._doc, BeatsPerBarPrompt._validate(this._beatsStepper), this._conversionStrategySelect.value), "replace");
+			this._doc.record(new ChangeBeatsPerBar(this._doc, BeatsPerBarPrompt._validate(this._beatsStepper), this._conversionStrategySelect.value), StateChangeType.replace);
 		}
 	}
 }

editor/ChannelSettingsPrompt.ts

@@ -123,11 +123,11 @@ namespace beepbox {
 
 		private static _validateNumber(event: Event): void {
 			const input: HTMLInputElement = <HTMLInputElement>event.target;
-			input.value = Math.floor(Math.max(Number(input.min), Math.min(Number(input.max), Number(input.value)))) + "";
+			input.value = String(ChannelSettingsPrompt._validate(input));
 		}
 
 		private static _validate(input: HTMLInputElement): number {
-			return Math.floor(Number(input.value));
+			return Math.floor(Math.max(Number(input.min), Math.min(Number(input.max), Number(input.value))));
 		}
 
 		private _saveChanges = (): void => {
@@ -136,7 +136,7 @@ namespace beepbox {
 			group.append(new ChangeInstrumentsPerChannel(this._doc, ChannelSettingsPrompt._validate(this._instrumentsStepper)));
 			group.append(new ChangeChannelCount(this._doc, ChannelSettingsPrompt._validate(this._pitchChannelStepper), ChannelSettingsPrompt._validate(this._drumChannelStepper), ChannelSettingsPrompt._validate(this._modChannelStepper)));
 			this._doc.prompt = null;
-			this._doc.record(group, "replace");
+			this._doc.record(group, StateChangeType.replace);
 		}
 	}
 }

editor/ExportPrompt.ts

@@ -226,8 +226,7 @@ namespace beepbox {
 		}
 
 		private _exportToWav(): void {
-
-			const synth: Synth = new Synth(this._doc.song)
+			const synth: Synth = new Synth(this._doc.song);
 			synth.loopRepeatCount = Number(this._loopDropDown.value) - 1;
 			if (!this._enableIntro.checked) {
 				for (let introIter: number = 0; introIter < this._doc.song.loopStart; introIter++) {
@@ -380,7 +379,7 @@ namespace beepbox {
 					writeEventTime(0);
 					writer.writeUint8(MidiEventType.meta);
 					writer.writeMidi7Bits(MidiMetaEventMessage.text);
-					writer.writeMidiAscii("Composed with beepbox.co");
+					writer.writeMidiAscii("Composed with jummbus.bitbucket.io");
 
 					writeEventTime(0);
 					writer.writeUint8(MidiEventType.meta);
@@ -487,6 +486,8 @@ namespace beepbox {
 										instrumentProgram = instrumentDecays ? 0x19 : 81; // steel guitar : sawtooth
 									} else if (instrument.type == InstrumentType.fm || instrument.type == InstrumentType.harmonics) {
 										instrumentProgram = instrumentDecays ? 2 : 81; // electric grand : sawtooth
+									} else if (instrument.type == InstrumentType.customChipWave) {
+										instrumentProgram = instrumentDecays ? 0x19 : 81; // steel guitar : sawtooth
 									} else {
 										throw new Error("Unrecognized instrument type.");
 									}
@@ -561,7 +562,7 @@ namespace beepbox {
 								const prevPitches: number[] = [-1, -1, -1, -1];
 								const nextPitches: number[] = [-1, -1, -1, -1];
 								const toneCount: number = Math.min(polyphony, note.pitches.length);
-								const velocity: number = isDrumset ? Math.max(1, Math.round(defaultNoteVelocity * note.pins[0].volume / 3)) : defaultNoteVelocity;
+								const velocity: number = isDrumset ? Math.max(1, Math.round(defaultNoteVelocity * note.pins[0].volume / 6)) : defaultNoteVelocity;
 
 								// The maximum midi pitch bend range is +/- 24 semitones from the base pitch. 
 								// To make the most of this, choose a base pitch that is within 24 semitones from as much of the note as possible.

editor/ImportPrompt.ts

@@ -55,7 +55,7 @@ namespace beepbox {
 				reader.addEventListener("load", (event: Event): void => {
 					this._doc.prompt = null;
 					this._doc.goBackToStart();
-					this._doc.record(new ChangeSong(this._doc, <string>reader.result), "replace");
+					this._doc.record(new ChangeSong(this._doc, <string>reader.result), StateChangeType.replace, true);
 				});
 				reader.readAsText(file);
 			} else if (extension == "midi" || extension == "mid") {
@@ -367,9 +367,8 @@ namespace beepbox {
 			}
 
 			// Now the MIDI file is fully parsed. Next, constuct BeepBox channels out of the data.
-
 			const microsecondsPerMinute: number = 60 * 1000 * 1000;
-			const beatsPerMinute: number = microsecondsPerMinute / microsecondsPerBeat;
+			const beatsPerMinute: number = Math.max(Config.tempoMin, Math.min(Config.tempoMax, Math.round(microsecondsPerMinute / microsecondsPerBeat)));
 			const midiTicksPerPart: number = midiTicksPerBeat / Config.partsPerBeat;
 			const partsPerBar: number = Config.partsPerBeat * beatsPerBar;
 			const songTotalBars: number = Math.ceil(currentMidiTick / midiTicksPerPart / partsPerBar);
@@ -844,7 +843,7 @@ namespace beepbox {
 				constructor(doc: SongDocument) {
 					super();
 					const song: Song = doc.song;
-					song.tempo = Math.max(Config.tempoMin, Math.min(Config.tempoMax, beatsPerMinute));
+					song.tempo = beatsPerMinute;
 					song.beatsPerBar = beatsPerBar;
 					song.key = key;
 					song.scale = 11;
@@ -865,7 +864,7 @@ namespace beepbox {
 			this._doc.goBackToStart();
 			for (const channel of this._doc.song.channels) channel.muted = false;
 			this._doc.prompt = null;
-			this._doc.record(new ChangeImportMidi(this._doc), "replace");
+			this._doc.record(new ChangeImportMidi(this._doc), StateChangeType.replace, true);
 		}
 	}
 }

editor/MoveNotesSidewaysPrompt.ts

@@ -83,7 +83,7 @@ namespace beepbox {
 		private _saveChanges = (): void => {
 			window.localStorage.setItem("moveNotesSidewaysStrategy", this._conversionStrategySelect.value);
 			this._doc.prompt = null;
-			this._doc.record(new ChangeMoveNotesSideways(this._doc, +this._beatsStepper.value, this._conversionStrategySelect.value), "replace");
+			this._doc.record(new ChangeMoveNotesSideways(this._doc, +this._beatsStepper.value, this._conversionStrategySelect.value), StateChangeType.replace);
 		}
 	}
 }

editor/OctaveScrollBar.ts

@@ -174,12 +174,12 @@ namespace beepbox {
 					if (this._mouseY < this._barBottom - this._barHeight * 0.5) {
 						if (currentOctave < this._doc.scrollableOctaves) {
 							this._change = new ChangeOctave(this._doc, oldValue, currentOctave + 1);
-							this._doc.record(this._change, canReplaceLastChange ? "replace" : "push");
+							this._doc.record(this._change, canReplaceLastChange ? StateChangeType.replace : StateChangeType.push);
 						}
 					} else {
 						if (currentOctave > 0) {
 							this._change = new ChangeOctave(this._doc, oldValue, currentOctave - 1);
-							this._doc.record(this._change, canReplaceLastChange ? "replace" : "push");
+							this._doc.record(this._change, canReplaceLastChange ? StateChangeType.replace : StateChangeType.push);
 						}
 					}
 				}