Skip to content
This repository has been archived by the owner on May 29, 2023. It is now read-only.

Repeat #5

Merged
merged 2 commits into from May 10, 2020
Merged

Repeat #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20a4c4a
fix(MIDI_MESSAGES): resubscribe if a new input has been connected
waterplea May 10, 2020
142e366
proper resubscribe
waterplea May 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 15 additions & 6 deletions projects/midi/src/tokens/midi-messages.ts
View file
Open in desktop
@@ -1,10 +1,11 @@
import {inject, InjectionToken} from '@angular/core';
import {from, fromEvent, merge, Observable, throwError} from 'rxjs';
import {FromEventTarget} from 'rxjs/internal/observable/fromEvent';
import {share, switchMap} from 'rxjs/operators';
import {share, startWith, switchMap} from 'rxjs/operators';
import {MIDI_ACCESS} from './midi-access';

import MIDIMessageEvent = WebMidi.MIDIMessageEvent;
import MIDIConnectionEvent = WebMidi.MIDIConnectionEvent;

export const MIDI_MESSAGES = new InjectionToken<Observable<MIDIMessageEvent>>(
'All incoming MIDI messages stream',
Expand All @@ -15,11 +16,19 @@ export const MIDI_MESSAGES = new InjectionToken<Observable<MIDIMessageEvent>>(
switchMap(access =>
access instanceof Error
? throwError(access)
: merge(
...Array.from(access.inputs).map(([_, input]) =>
fromEvent(
input as FromEventTarget<MIDIMessageEvent>,
'midimessage',
: fromEvent(
access as FromEventTarget<MIDIConnectionEvent>,
'statechange',
).pipe(
startWith(null),
switchMap(() =>
merge(
...Array.from(access.inputs).map(([_, input]) =>
fromEvent(
input as FromEventTarget<MIDIMessageEvent>,
'midimessage',
),
),
),
),
),
Expand Down