bjornm
commented
10 years ago The patch above was buggy. Here's a better one. Note that it is not possible to maintain a synchronous shim where the underlying behavior is async. It just "happens" to work as long as you do not expect the Midinput / MidiOutput to work until after a few ms. Here goes:
--- a/dartclient/web/js/WebMIDIAPI.js +++ b/dartclient/web/js/WebMIDIAPI.js @@ -16,7 +16,7 @@ // Initialize the MIDI library. (function (global) { 'use strict';
- var midiIO, _requestMIDIAccess, MIDIAccess, _onReady, MIDIPort, MIDIInput, MIDIOutput, _midiProc;
-
var midiIO, _requestMIDIAccess, _delayedInit, MIDIAccess, _onReady, _onNotReady, MIDIPort, MIDIInput, MIDIOutput, _midiProc;
function Promise() {
@@ -78,18 +78,29 @@ document.body.appendChild(insertionPoint); } insertionPoint.appendChild(o1);
- }
-
if (this.objRef.isJazz) - _JazzInstance.prototype._init = function() {
- if (this.objRef.isJazz) { this._Jazz = this.objRef;
- else if (this.activeX.isJazz)
- } else if (this.activeX.isJazz) { this._Jazz = this.activeX;
- else
- } else { this._Jazz = null;
- } if (this._Jazz) { this._Jazz._jazzTimeZero = this._Jazz.Time(); this._Jazz._perfTimeZero = window.performance.now(); }
- }
- }; +
- _JazzInstance.prototype._delayedInit = function(then) {
- var that = this;
- setTimeout(function() {
- that._init();
- then();
- }, 100);
-
};
_requestMIDIAccess = function _requestMIDIAccess() { var access = new MIDIAccess(); @@ -100,23 +111,25 @@
function MIDIAccess() { this._jazzInstances = new Array();
- this._jazzInstances.push( new _JazzInstance() );
- var instance = new _JazzInstance();
-
this._jazzInstances.push( instance ); this._promise = new Promise;
- if (this._jazzInstances[0]._Jazz) {
- this._Jazz = this._jazzInstances[0]._Jazz;
- window.setTimeout( _onReady.bind(this), 3 );
- } else {
- window.setTimeout( _onNotReady.bind(this), 3 );
- }
- instance._delayedInit(function() {
- if (instance._Jazz) {
- this._Jazz = instance._Jazz;
- window.setTimeout( _onReady.bind(this), 3 );
- } else {
- window.setTimeout( _onNotReady.bind(this), 3 );
- }
-
}.bind(this));};
- _onReady = function _onReady() {
- _onReady = function() { if (this._promise) this._promise.succeed(this); };
- function _onNotReady() {
-
_onNotReady = function() { if (this._promise) this._promise.fail( { code: 1 } ); }; @@ -159,6 +172,10 @@ this.onmidimessage = null;
var inputInstance = null; - var then = function() {
- this._jazzInstance = inputInstance._Jazz;
- this._input = this._jazzInstance.MidiInOpen( this._index, _midiProc.bind(this) );
- }; for (var i=0; (i<midiAccess._jazzInstances.length)&&(!inputInstance); i++) { if (!midiAccess._jazzInstances[i].inputInUse) inputInstance=midiAccess._jazzInstances[i]; @@ -166,11 +183,12 @@ if (!inputInstance) { inputInstance = new _JazzInstance(); midiAccess._jazzInstances.push( inputInstance );
- inputInstance.inputInUse = true;
- inputInstance._delayedInit(then.bind(this));
- } else {
- inputInstance.inputInUse = true;
- then.bind(this).apply(); }
- inputInstance.inputInUse = true;
- this._jazzInstance = inputInstance._Jazz;
-
this._input = this._jazzInstance.MidiInOpen( this._index, _midiProc.bind(this) );};
// Introduced in DOM Level 2: @@ -322,6 +340,10 @@ this.version = "";
var outputInstance = null; - var then = function() {
- this._jazzInstance = outputInstance._Jazz;
- this._jazzInstance.MidiOutOpen(this.name);
- }; for (var i=0; (i<midiAccess._jazzInstances.length)&&(!outputInstance); i++) { if (!midiAccess._jazzInstances[i].outputInUse) outputInstance=midiAccess._jazzInstances[i]; @@ -329,11 +351,12 @@ if (!outputInstance) { outputInstance = new _JazzInstance(); midiAccess._jazzInstances.push( outputInstance );
- outputInstance.outputInUse = true;
- outputInstance._delayedInit(then.bind(this));
- } else {
- outputInstance.outputInUse = true;
- then.bind(this).apply(); }
- outputInstance.outputInUse = true;
- this._jazzInstance = outputInstance._Jazz;
-
this._jazzInstance.MidiOutOpen(this.name);};
function _sendLater() {
The demo index.html works in Safari but not in 33.0.1750.70 beta.
Got it to work again by introducing window.setTimeout between creating the plugin object elements and checking for .isJazz. Maybe Chrome changed plugin initialization to a more async nature? Here's a quick-n-dirty patch, you probably want to clean it up a little bit:
diff --git a/WebMIDIAPI.js b/WebMIDIAPI.js index d06b09a..eb4ceb6 100755 --- a/WebMIDIAPI.js +++ b/WebMIDIAPI.js @@ -16,7 +16,7 @@ // Initialize the MIDI library. (function (global) { 'use strict';
var midiIO, _requestMIDIAccess, _delayedInit, MIDIAccess, _onReady, MIDIPort, MIDIInput, MIDIOutput, _midiProc;
function Promise() {
@@ -78,18 +78,20 @@ document.body.appendChild(insertionPoint); } insertionPoint.appendChild(o1);
};
_requestMIDIAccess = function _requestMIDIAccess() { var access = new MIDIAccess(); @@ -100,15 +102,19 @@
function MIDIAccess() { this._jazzInstances = new Array();
this._jazzInstances.push( instance ); this._promise = new Promise;
};
_onReady = function _onReady() {