M2M1 fix

README.md

@@ -68,15 +68,15 @@ by running `npm remove midi-test --save-dev`.
 
 ```html
 <script src="https://cdn.jsdelivr.net/npm/jzz"></script>       // the latest version, or
-<script src="https://cdn.jsdelivr.net/npm/jzz@1.7.3"></script> // any particular version
+<script src="https://cdn.jsdelivr.net/npm/jzz@1.7.4"></script> // any particular version
 //...
 ```
 
 ##### CDN (unpkg)
 
 ```html
 <script src="https://unpkg.com/jzz"></script>       // the latest version, or
-<script src="https://unpkg.com/jzz@1.7.3"></script> // any particular version
+<script src="https://unpkg.com/jzz@1.7.4"></script> // any particular version
 //...
 ```
 

javascript/JZZ.js

@@ -14,7 +14,7 @@
 })(this, function() {
 
   var _scope = typeof window === 'undefined' ? global : window;
-  var _version = '1.7.3';
+  var _version = '1.7.4';
   var i, j, k, m, n;
 
   /* istanbul ignore next */
@@ -538,8 +538,9 @@
   _M2.prototype = new _R();
   _M2.prototype._sxid = _M.prototype._sxid;
   _M2.prototype._receive = function(msg) { this._sink._receive(msg); };
+  function _midi2(msg) { return msg.isMidi && !msg.isMidi2 ? new MIDI(msg) : UMP.apply(null, arguments); }
   _M2.prototype.send = function() {
-    this._push(_receive, [UMP.apply(null, arguments)]);
+    this._push(_receive, [_midi2.apply(null, arguments)]);
     return this._thenable();
   };
   _M2.prototype._image = _M.prototype._image;
@@ -1636,6 +1637,7 @@
   }
   MIDI.prototype = [];
   MIDI.prototype.constructor = MIDI;
+  MIDI.prototype.isMidi = function() { return 1; };
   var _noteNum = {};
   MIDI.noteValue = function(x) { return typeof x == 'undefined' ? undefined : _noteNum[x.toString().toLowerCase()]; };
   MIDI.programValue = function(x) { return x; };
@@ -2948,6 +2950,7 @@
   }
   UMP.prototype = [];
   UMP.prototype.constructor = UMP;
+  UMP.prototype.isMidi = function() { return 2; };
   UMP.prototype.isMidi2 = true;
   UMP.prototype.dump = function() {
     var i;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jzz",
-  "version": "1.7.3",
+  "version": "1.7.4",
   "description": "MIDI library for Node.js and web-browsers",
   "main": "javascript/JZZ.js",
   "scripts": {

test/common.js

@@ -38,6 +38,7 @@ describe('MIDI messages', function() {
   });
   it('noteOn', function() {
     var msg = JZZ.MIDI.noteOn(1, 'C5', 20);
+    assert.equal(msg.isMidi(), 1);
     assert.equal(msg.getChannel(), 1);
     assert.equal(msg.getNote(), 60);
     assert.equal(msg.getVelocity(), 20);
@@ -773,6 +774,7 @@ describe('UMP messages', function() {
   it('noop', function() {
     var s = '00000000 -- NOOP';
     var msg =JZZ.UMP.noop();
+    assert.equal(msg.isMidi(), 2);
     assert.equal(msg.isNoteOn(), false);
     assert.equal(msg.isNoteOff(), false);
     assert.equal(typeof msg.getGroup(), 'undefined');
@@ -1546,13 +1548,15 @@ describe('JZZ.M1M2', function() {
 describe('JZZ.M2M1', function() {
   it('noteO/Off', function(done) {
     var sample = new test.Sample(done, [
+      [0x91, 0x3c, 0x7f], [0x91, 0x3c, 0x7f],
       [0x91, 0x3c, 0x7f], [0x81, 0x3c, 0],
       [0x91, 0x3c, 0x01], [0x81, 0x3c, 0],
       [0x90, 0x00, 0x7f]
     ]);
     var port = new JZZ.M2M1();
     port.connect(function(msg) { sample.compare(msg); });
-    port.noteOn(0, 1, 'C5').noteOff(0, 1, 'C5', 0).noop().umpNoteOn(0, 1, 'C5', 1).umpNoteOff(0, 1, 'C5').MIDI1().noteOn(0, 0);
+    port.send(JZZ.MIDI.noteOn(1, 'C5')).send(JZZ.UMP.noteOn(0, 1, 'C5'))
+      .noteOn(0, 1, 'C5').noteOff(0, 1, 'C5', 0).noop().umpNoteOn(0, 1, 'C5', 1).umpNoteOff(0, 1, 'C5').MIDI1().noteOn(0, 0);
   });
   it('program', function(done) {
     var sample = new test.Sample(done, [

web-midi-api/package.json

@@ -13,7 +13,7 @@
     "web-midi-api"
   ],
   "dependencies": {
-    "jzz": "^1.7.3"
+    "jzz": "^1.7.4"
   },
   "contributors": [
     {