Merge remote-tracking branch 'upstream/main' into midi-input

zOadT · zOadT · commit 059de5ddff68 · 2022-04-10T08:13:12.000+02:00
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 John Nesky
+Copyright (c) 2012-2022 John Nesky and contributing authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/editor/ArrayBufferReader.ts b/editor/ArrayBufferReader.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 // Note: All methods are big endian.
 export class ArrayBufferReader {
diff --git a/editor/ArrayBufferWriter.ts b/editor/ArrayBufferWriter.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 function transfer(source: ArrayBuffer, length: number): ArrayBuffer {
 	const dest: ArrayBuffer = new ArrayBuffer(length);
diff --git a/editor/BarScrollBar.ts b/editor/BarScrollBar.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {SongDocument} from "./SongDocument";
 import {HTML, SVG} from "imperative-html/dist/esm/elements-strict";
diff --git a/editor/BeatsPerBarPrompt.ts b/editor/BeatsPerBarPrompt.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {Config} from "../synth/SynthConfig";
 import {HTML} from "imperative-html/dist/esm/elements-strict";
diff --git a/editor/Change.ts b/editor/Change.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 export class Change {
 	private _noop: boolean = true;
diff --git a/editor/ChangeNotifier.ts b/editor/ChangeNotifier.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 export class ChangeNotifier {
 	private _watchers: (()=>void)[] = [];
diff --git a/editor/ChannelSettingsPrompt.ts b/editor/ChannelSettingsPrompt.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {Config} from "../synth/SynthConfig";
 import {HTML} from "imperative-html/dist/esm/elements-strict";
diff --git a/editor/ColorConfig.ts b/editor/ColorConfig.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {BeepBoxOption, DictionaryArray, toNameMap} from "../synth/SynthConfig";
 import {Song} from "../synth/synth";
diff --git a/editor/EditorConfig.ts b/editor/EditorConfig.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {DictionaryArray, BeepBoxOption, InstrumentType, toNameMap} from "../synth/SynthConfig";
 
diff --git a/editor/EnvelopeEditor.ts b/editor/EnvelopeEditor.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {InstrumentType, Config} from "../synth/SynthConfig";
 import {Instrument} from "../synth/synth";
diff --git a/editor/ExportPrompt.ts b/editor/ExportPrompt.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {InstrumentType, /*EnvelopeType,*/ Config, getArpeggioPitchIndex} from "../synth/SynthConfig";
 import {Instrument, Pattern, Note, Song, Synth} from "../synth/synth";
diff --git a/editor/FadeInOutEditor.ts b/editor/FadeInOutEditor.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {Config} from "../synth/SynthConfig";
 import {clamp, Instrument, Synth} from "../synth/synth";
diff --git a/editor/FilterEditor.ts b/editor/FilterEditor.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {FilterCoefficients, FrequencyResponse} from "../synth/filtering";
 import {FilterType, Config} from "../synth/SynthConfig";
diff --git a/editor/HarmonicsEditor.ts b/editor/HarmonicsEditor.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {Config} from "../synth/SynthConfig";
 import {HarmonicsWave, Instrument} from "../synth/synth";
diff --git a/editor/ImportPrompt.ts b/editor/ImportPrompt.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {InstrumentType, Config} from "../synth/SynthConfig";
 import {NotePin, Note, makeNotePin, Pattern, Instrument, Channel, Song, Synth} from "../synth/synth";
diff --git a/editor/Layout.ts b/editor/Layout.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {HTML} from "imperative-html/dist/esm/elements-strict";
 import {ColorConfig} from "./ColorConfig";
diff --git a/editor/LayoutPrompt.ts b/editor/LayoutPrompt.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {SongDocument} from "./SongDocument";
 import {Layout} from "./Layout";
diff --git a/editor/LoopEditor.ts b/editor/LoopEditor.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {SongDocument} from "./SongDocument";
 import {HTML, SVG} from "imperative-html/dist/esm/elements-strict";
diff --git a/editor/Midi.ts b/editor/Midi.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 export const defaultMidiExpression: number = 0x7F;
 export const defaultMidiPitchBend: number = 0x2000;
diff --git a/editor/MoveNotesSidewaysPrompt.ts b/editor/MoveNotesSidewaysPrompt.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {Config} from "../synth/SynthConfig";
 import {HTML} from "imperative-html/dist/esm/elements-strict";
diff --git a/editor/MuteEditor.ts b/editor/MuteEditor.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {SongDocument} from "./SongDocument";
 import {HTML} from "imperative-html/dist/esm/elements-strict";
diff --git a/editor/OctaveScrollBar.ts b/editor/OctaveScrollBar.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {Config} from "../synth/SynthConfig";
 import {SongDocument} from "./SongDocument";
diff --git a/editor/PatternEditor.ts b/editor/PatternEditor.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {Chord, Transition, Config} from "../synth/SynthConfig";
 import {NotePin, Note, makeNotePin, Pattern, Instrument} from "../synth/synth";
diff --git a/editor/Piano.ts b/editor/Piano.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {Config} from "../synth/SynthConfig";
 import {SongDocument} from "./SongDocument";
diff --git a/editor/Prompt.ts b/editor/Prompt.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 export interface Prompt {
 	container: HTMLElement;
diff --git a/editor/Selection.ts b/editor/Selection.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {Dictionary, Config} from "../synth/SynthConfig";
 import {Note, Pattern, Channel} from "../synth/synth";
diff --git a/editor/SongDocument.ts b/editor/SongDocument.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {Scale, Config} from "../synth/SynthConfig";
 import {Pattern, Channel, Song, Synth} from "../synth/synth";
@@ -315,7 +315,7 @@ export class SongDocument {
 					this.viewedInstrument[i] = pattern.instruments[0];
 				}
 			}
-			this.viewedInstrument[i] = Math.min(this.viewedInstrument[i], this.song.channels[i].instruments.length - 1);
+			this.viewedInstrument[i] = Math.min(this.viewedInstrument[i] | 0, this.song.channels[i].instruments.length - 1);
 		}
 		
 		const highlightedPattern: Pattern | null = this.getCurrentPattern();
diff --git a/editor/SongDurationPrompt.ts b/editor/SongDurationPrompt.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {Config} from "../synth/SynthConfig";
 import {HTML} from "imperative-html/dist/esm/elements-strict";
diff --git a/editor/SongEditor.ts b/editor/SongEditor.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {InstrumentType, EffectType, Config, getPulseWidthRatio, effectsIncludeTransition, effectsIncludeChord, effectsIncludePitchShift, effectsIncludeDetune, effectsIncludeVibrato, effectsIncludeNoteFilter, effectsIncludeDistortion, effectsIncludeBitcrusher, effectsIncludePanning, effectsIncludeChorus, effectsIncludeEcho, effectsIncludeReverb} from "../synth/SynthConfig";
 import {Preset, PresetCategory, EditorConfig, isMobile, prettyNumber} from "./EditorConfig";
diff --git a/editor/SongRecovery.ts b/editor/SongRecovery.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {Dictionary} from "../synth/SynthConfig";
 import {Song} from "../synth/synth";
diff --git a/editor/SongRecoveryPrompt.ts b/editor/SongRecoveryPrompt.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {SongDocument} from "./SongDocument";
 import {RecoveredSong, RecoveredVersion, SongRecovery, versionToKey} from "./SongRecovery";
diff --git a/editor/SpectrumEditor.ts b/editor/SpectrumEditor.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {Config} from "../synth/SynthConfig";
 import {SpectrumWave, Instrument} from "../synth/synth";
diff --git a/editor/TipPrompt.ts b/editor/TipPrompt.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {HTML} from "imperative-html/dist/esm/elements-strict";
 import {Prompt} from "./Prompt";
diff --git a/editor/TrackEditor.ts b/editor/TrackEditor.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {Pattern} from "../synth/synth";
 import {ColorConfig, ChannelColors} from "./ColorConfig";
diff --git a/editor/changes.ts b/editor/changes.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {Algorithm, Dictionary, FilterType, InstrumentType, EffectType, AutomationTarget, Config, effectsIncludePanning, effectsIncludeDistortion} from "../synth/SynthConfig";
 import {NotePin, Note, makeNotePin, Pattern, FilterSettings, FilterControlPoint, SpectrumWave, HarmonicsWave, Instrument, Channel, Song, Synth} from "../synth/synth";
@@ -2344,7 +2344,7 @@ export class ChangeValidateTrackSelection extends Change {
 		const channelScrollPos: number = Math.min(doc.channel, Math.max(doc.channel - (doc.trackVisibleChannels - 1), Math.max(0, Math.min(doc.song.getChannelCount() - doc.trackVisibleChannels, doc.channelScrollPos))));
 		if (doc.channel != channelIndex || doc.bar != bar || doc.channelScrollPos != channelScrollPos || doc.barScrollPos != barScrollPos) {
 			doc.channel = channelIndex;
-			doc.channel = channelScrollPos;
+			doc.channelScrollPos = channelScrollPos;
 			doc.bar = bar;
 			doc.barScrollPos = barScrollPos;
 			doc.notifier.changed();
diff --git a/editor/main.ts b/editor/main.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {Dictionary, DictionaryArray, EnvelopeType, InstrumentType, Transition, Chord, Envelope, Config} from "../synth/SynthConfig";
 import {isMobile, EditorConfig} from "./EditorConfig";
diff --git a/editor/style.ts b/editor/style.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {ColorConfig} from "./ColorConfig";
 import {HTML} from "imperative-html/dist/esm/elements-strict";
diff --git a/player/main.ts b/player/main.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 John Nesky, distributed under the MIT license.
+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.
 
 import {Dictionary, DictionaryArray, EnvelopeType, InstrumentType, Transition, Chord, Envelope, Config} from "../synth/SynthConfig";
 import {ColorConfig} from "../editor/ColorConfig";
diff --git a/synth/Deque.ts b/synth/Deque.ts
diff --git a/synth/FFT.ts b/synth/FFT.ts
diff --git a/synth/SynthConfig.ts b/synth/SynthConfig.ts
diff --git a/synth/synth.ts b/synth/synth.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (C) 2021 John Nesky, distributed under the MIT license.`
	`1`	`+// Copyright (c) 2012-2022 John Nesky and contributing authors, distributed under the MIT license, see accompanying the LICENSE.md file.`
`2`	`2`
`3`	`3`	`// Note: All methods are big endian.`
`4`	`4`	`export class ArrayBufferReader {`