diff --git a/src/fakePsr/index.js b/src/fakePsr/index.js index 055385a..65f3279 100644 --- a/src/fakePsr/index.js +++ b/src/fakePsr/index.js @@ -407,11 +407,50 @@ self.performance = currentPerformance; { // KANDI8 let perf = new TimedEvents(); - perf.push(new PointEvent(4, generateSwitch(15))); - perf.push(new PointEvent(5.7, generateSwitch(12))); - perf.push(new PointEvent(20, generateSwitch(1))); - perf.push(new PointEvent(89, generateSwitch(0))); - perf.push(new PointEvent(117, generateSwitch(12))); + perf.push(new PointEvent(1, genNewSwitch(15))); + perf.push(new PointEvent(5.72, genNewSwitch(12))); + perf.push(new PointEvent(15.37, genNewSwitch(11))); + perf.push(new PointEvent(15.8, genNewSwitch(10))); + perf.push(new PointEvent(16.24, genNewSwitch(9))); + perf.push(new PointEvent(16.67, genNewSwitch(8))); + perf.push(new PointEvent(17.11, genNewSwitch(7))); + perf.push(new PointEvent(17.54, genNewSwitch(6))); + perf.push(new PointEvent(17.98, genNewSwitch(5))); + perf.push(new PointEvent(18.41, genNewSwitch(4))); + perf.push(new PointEvent(18.85, genNewSwitch(3))); + perf.push(new PointEvent(19.28, genNewSwitch(2))); + perf.push(new PointEvent(19.72, genNewSwitch(1))); + perf.push(new PointEvent(26.64, genNewSwitch(3))); + perf.push(new PointEvent(33.62, genNewSwitch(5))); + perf.push(new PointEvent(40.54, genNewSwitch(7))); + perf.push(new PointEvent(47.52, genNewSwitch(8))); + perf.push(new PointEvent(54.48, genNewSwitch(11))); + perf.push(new PointEvent(59.62, genNewSwitch(10))); + perf.push(new PointEvent(61.36, genNewSwitch(9))); + perf.push(new PointEvent(68.38, genNewSwitch(13))); + perf.push(new PointEvent(71.86, genNewSwitch(12))); + perf.push(new PointEvent(75.34, genNewSwitch(4))); + perf.push(new PointEvent(87.72, genNewSwitch(1))); + perf.push(new PointEvent(88.18, genNewSwitch(2))); + perf.push(new PointEvent(88.39, genNewSwitch(3))); + perf.push(new PointEvent(88.61, genNewSwitch(4))); + perf.push(new PointEvent(88.82, genNewSwitch(5))); + perf.push(new PointEvent(89.04, genNewSwitch(6))); + perf.push(new PointEvent(89.25, genNewSwitch(0))); + perf.push(new PointEvent(110.16, genNewSwitch(15))); + perf.push(new PointEvent(117.02, genNewSwitch(12))); + perf.push(new PointEvent(124.04, genNewSwitch(6))); + perf.push(new PointEvent(127.52, genNewSwitch(5))); + perf.push(new PointEvent(129.26, genNewSwitch(7))); + perf.push(new PointEvent(131, genNewSwitch(0))); + perf.push(new PointEvent(137.96, generateString(" JayB - Kandi8 For XG Synthesis"))); + perf.push(new PointEvent(139.7, generateString("Performed on "))); + perf.push(new PointEvent(140.57, generateString("Performed on YAMAHA QY100"))); + perf.push(new PointEvent(141.44, generateString("Composed by "))); + perf.push(new PointEvent(142.31, generateString('Johannes "JayB" Berthold'))); + perf.push(new PointEvent(143.18, generateString("Inspired by "))); + perf.push(new PointEvent(144.05, generateString("Inspired by Anjunabeats"))); + //perf.push(new PointEvent(144.92, generateString("Screen FX by Lumiere Eleve"))); perf.fresh(); demoPerfs["KANDI8"] = perf; }; @@ -526,7 +565,7 @@ self.performance = currentPerformance; let perf = new TimedEvents(); perf.push(new PointEvent(0, generateString(` YAMAHA TONE GENERATOR `))); perf.push(new PointEvent(0.5, {type: 15, data: [67, 16, 73, 0, 0, 18, 1]})); - perf.push(new PointEvent(0.8, generateSwitch(0))); + perf.push(new PointEvent(0.8, generateSwitch(0, 0, 0))); perf.push(new PointEvent(2.52, generateString(` YAMAHA TONE GENERATOR `))); perf.push(new PointEvent(5.04, generateString(` YAMAHA TONE GENERATOR`))); perf.push(new PointEvent(5.21, generateString(` YAMAHA TONE GENERATO`))); @@ -548,18 +587,18 @@ self.performance = currentPerformance; perf.push(new PointEvent(8.76, generateString(` MU1000 `))); perf.push(new PointEvent(9.38, generateString(` `))); perf.push(new PointEvent(10.08, generateString(` MU1000 `))); - perf.push(new PointEvent(10.49, generateString(` DU1000 `))); - perf.push(new PointEvent(10.92, generateString(` Db1000 0 `))); - perf.push(new PointEvent(11.33, generateString(` Dbl000 06 `))); - perf.push(new PointEvent(11.75, generateString(` DblC00 066 `))); - perf.push(new PointEvent(12.17, generateString(` DblCo0 066 `))); - perf.push(new PointEvent(12.59, generateString(` DblCon 066 0 `))); - perf.push(new PointEvent(13.01, generateString(` DblConG 066 00 `))); + perf.push(new PointEvent(10.49, generateString(` DMU1000 `))); + perf.push(new PointEvent(10.92, generateString(` DbMU1000 0 `))); + perf.push(new PointEvent(11.33, generateString(` DblMU100 06 `))); + perf.push(new PointEvent(11.75, generateString(` DblCMU10 066 `))); + perf.push(new PointEvent(12.17, generateString(` DblCoMU1 066 `))); + perf.push(new PointEvent(12.59, generateString(` DblConMU 066 0 `))); + perf.push(new PointEvent(13.01, generateString(` DblConGM 066 00 `))); perf.push(new PointEvent(13.42, generateString(` DblConGr 066 001`))); perf.push(new PointEvent(27.98, generateSwitch(4))); perf.push(new PointEvent(43.85, generateSwitch(10))); - perf.push(new PointEvent(63.33, generateSwitch(19))); - perf.push(new PointEvent(103.31, generateSwitch(34))); + perf.push(new PointEvent(63.33, generateSwitch(19, 1, 1))); + perf.push(new PointEvent(103.31, generateSwitch(34, 2, 2))); perf.push(new PointEvent(109.52, generateSwitch(35))); perf.push(new PointEvent(114.32, generateSwitch(32))); perf.push(new PointEvent(119.36, generateSwitch(33))); @@ -567,7 +606,7 @@ self.performance = currentPerformance; perf.push(new PointEvent(128.91, generateSwitch(41))); perf.push(new PointEvent(140.83, generateSwitch(45))); perf.push(new PointEvent(153.29, generateSwitch(42))); - perf.push(new PointEvent(176.74, generateSwitch(2))); + perf.push(new PointEvent(176.74, generateSwitch(2, 0, 0))); perf.push(new PointEvent(178.27, generateString(` WindChim. SFX 070`))); perf.push(new PointEvent(178.92, generateString(` WindChim . SFX 070`))); perf.push(new PointEvent(179.56, generateString(` WindChim . SFX 070`))); @@ -592,51 +631,51 @@ self.performance = currentPerformance; // PhoenixB let perf = new TimedEvents(); perf.push(new PointEvent(0, generateString(` BrtFrHrn 066 061`))); - perf.push(new PointEvent(0, generateSwitch(2))); + perf.push(new PointEvent(0, generateSwitch(2, 0, 0))); perf.push(new PointEvent(0.5, {type: 15, data: [67, 16, 73, 0, 0, 18, 1]})); - perf.push(new PointEvent(1, generateSwitch(11))); + perf.push(new PointEvent(1, generateSwitch(11, 0, 0))); perf.push(new PointEvent(2.02, {type: 15, track: 0, data: [67, 16, 76, 6, 0, 64]})); perf.push(new PointEvent(38.19, generateSwitch(9))); - perf.push(new PointEvent(40.05, generateSwitch(16))); - perf.push(new PointEvent(40.67, generateSwitch(34))); - perf.push(new PointEvent(44.61, generateSwitch(17))); - perf.push(new PointEvent(47.59, generateSwitch(32))); + perf.push(new PointEvent(40.05, generateSwitch(16, 0, 1))); + perf.push(new PointEvent(40.67, generateSwitch(34, 0, 3))); + perf.push(new PointEvent(44.61, generateSwitch(17, 0, 1))); + perf.push(new PointEvent(47.59, generateSwitch(32, 0, 3))); perf.push(new PointEvent(53.64, generateSwitch(18))); perf.push(new PointEvent(54.89, generateSwitch(32))); perf.push(new PointEvent(56.01, generateSwitch(49))); - perf.push(new PointEvent(58.47, generateSwitch(9))); + perf.push(new PointEvent(58.47, generateSwitch(9, 0, 0))); perf.push(new PointEvent(61.79, generateSwitch(0))); perf.push(new PointEvent(71.54, generateSwitch(1))); - perf.push(new PointEvent(78.46, generateSwitch(16))); - perf.push(new PointEvent(80.33, generateSwitch(0))); - perf.push(new PointEvent(83.43, generateSwitch(0))); - perf.push(new PointEvent(84.86, generateSwitch(0))); - perf.push(new PointEvent(87.83, generateSwitch(0))); - perf.push(new PointEvent(89.29, generateSwitch(1))); - perf.push(new PointEvent(93.61, generateSwitch(1))); - perf.push(new PointEvent(98.21, generateSwitch(16))); - perf.push(new PointEvent(102.93, generateSwitch(17))); - perf.push(new PointEvent(107.45, generateSwitch(16))); - perf.push(new PointEvent(107.78, generateSwitch(17))); - perf.push(new PointEvent(110.97, generateSwitch(32))); - perf.push(new PointEvent(111.98, generateSwitch(16))); - perf.push(new PointEvent(113.27, generateSwitch(34))); - perf.push(new PointEvent(114.18, generateSwitch(16))); - perf.push(new PointEvent(115.75, generateSwitch(17))); - perf.push(new PointEvent(123.01, generateSwitch(5))); - perf.push(new PointEvent(124.53, generateSwitch(7))); - perf.push(new PointEvent(126.06, generateSwitch(20))); - perf.push(new PointEvent(126.78, generateSwitch(32))); + perf.push(new PointEvent(78.46, generateSwitch(16, 0, 3))); + perf.push(new PointEvent(80.33, generateSwitch(0, 0, 0))); + perf.push(new PointEvent(83.43, generateSwitch(0, 0, 3))); + perf.push(new PointEvent(84.86, generateSwitch(0, 0, 0))); + perf.push(new PointEvent(87.83, generateSwitch(0, 0, 1))); + perf.push(new PointEvent(89.29, generateSwitch(1, 0, 3))); + perf.push(new PointEvent(93.61, generateSwitch(1, 0, 0))); + perf.push(new PointEvent(98.21, generateSwitch(16, 0, 3))); + perf.push(new PointEvent(102.93, generateSwitch(17, 0, 1))); + perf.push(new PointEvent(107.45, generateSwitch(16, 0, 3))); + perf.push(new PointEvent(107.78, generateSwitch(17, 0, 1))); + perf.push(new PointEvent(110.97, generateSwitch(32, 0, 3))); + perf.push(new PointEvent(111.98, generateSwitch(16, 0, 1))); + perf.push(new PointEvent(113.27, generateSwitch(34, 0, 3))); + perf.push(new PointEvent(114.18, generateSwitch(16, 0, 1))); + perf.push(new PointEvent(115.75, generateSwitch(17, 0, 3))); + perf.push(new PointEvent(123.01, generateSwitch(5, 0, 0))); + perf.push(new PointEvent(124.53, generateSwitch(7, 0, 0))); + perf.push(new PointEvent(126.06, generateSwitch(20, 1, 1))); + perf.push(new PointEvent(126.78, generateSwitch(32, 0, 3))); perf.fresh(); demoPerfs["PhoenixB"] = perf; }; { // Ninety Hipty let perf = new TimedEvents(); - perf.push(new PointEvent(0.5, generateSwitch(1))); + perf.push(new PointEvent(0.5, generateSwitch(1, 0, 0))); perf.push(new PointEvent(19.7, generateSwitch(11))); perf.push(new PointEvent(28.5, generateSwitch(12))); - perf.push(new PointEvent(37.4, generateSwitch(4))); + perf.push(new PointEvent(37.4, generateSwitch(4, 0, 1))); perf.push(new PointEvent(45.8, generateSwitch(2))); perf.push(new PointEvent(50.6, generateSwitch(3))); perf.push(new PointEvent(54.9, generateSwitch(4))); @@ -664,49 +703,53 @@ self.performance = currentPerformance; { // Is it realy love? let perf = new TimedEvents(); - perf.push(new PointEvent(1.8, generateSwitch(24))); + perf.push(new PointEvent(1.8, generateSwitch(24, 1, 2))); perf.push(new PointEvent(7.6, generateSwitch(29))); - perf.push(new PointEvent(10.53, generateSwitch(0))); + perf.push(new PointEvent(10.53, generateSwitch(0, 0, 1))); perf.push(new PointEvent(20.9, generateSwitch(22))); perf.push(new PointEvent(28.47, generateSwitch(23))); - perf.push(new PointEvent(31.1, generateSwitch(3))); - perf.push(new PointEvent(38.88, generateSwitch(17))); - perf.push(new PointEvent(41.02, generateSwitch(5))); + perf.push(new PointEvent(31.1, generateSwitch(3, 0, 0))); + perf.push(new PointEvent(38.48, generateSwitch(17, 1, 1))); + perf.push(new PointEvent(41.02, generateSwitch(5, 0, 1))); perf.push(new PointEvent(48.59, generateSwitch(17))); - perf.push(new PointEvent(50.9, generateSwitch(0))); - perf.push(new PointEvent(70.7, generateSwitch(1))); + perf.push(new PointEvent(50.9, generateSwitch(0, 0, 0))); + perf.push(new PointEvent(70.7, generateSwitch(1, 0, 1))); perf.push(new PointEvent(78.2, generateSwitch(17))); perf.push(new PointEvent(80.79, generateSwitch(2))); perf.push(new PointEvent(88.65, generateSwitch(1))); perf.push(new PointEvent(90.02, generateSwitch(2))); perf.push(new PointEvent(91.11, generateSwitch(1))); perf.push(new PointEvent(92.43, generateSwitch(2))); - perf.push(new PointEvent(93.18, generateSwitch(0))); - perf.push(new PointEvent(112.9, generateSwitch(1))); + perf.push(new PointEvent(93.18, generateSwitch(0, 0, 0))); + perf.push(new PointEvent(112.9, generateSwitch(1, 0, 1))); perf.push(new PointEvent(119, generateSwitch(17))); perf.push(new PointEvent(122.64, generateSwitch(2))); perf.push(new PointEvent(130.12, generateSwitch(15))); - perf.push(new PointEvent(132.73, generateSwitch(0))); - perf.push(new PointEvent(152.54, generateSwitch(1))); + perf.push(new PointEvent(132.73, generateSwitch(0, 0, 0))); + perf.push(new PointEvent(152.54, generateSwitch(1, 0, 1))); perf.push(new PointEvent(158.66, generateSwitch(17))); perf.push(new PointEvent(162.39, generateSwitch(2))); - perf.push(new PointEvent(166.24, generateSwitch(14))); - perf.push(new PointEvent(172.26, generateSwitch(8))); - perf.push(new PointEvent(182.23, generateSwitch(8))); - perf.push(new PointEvent(191.81, generateSwitch(23))); - perf.push(new PointEvent(193, generateSwitch(0))); + perf.push(new PointEvent(166.02, generateSwitch(14))); + perf.push(new PointEvent(169.9, generateSwitch(21))); + perf.push(new PointEvent(170.49, generateSwitch(20))); + perf.push(new PointEvent(171.08, generateSwitch(19))); + perf.push(new PointEvent(171.67, generateSwitch(18))); + perf.push(new PointEvent(172.26, generateSwitch(8, 0, 0))); + perf.push(new PointEvent(182.23, generateSwitch(8, 0, 1))); + perf.push(new PointEvent(191.81, generateSwitch(23, 1, 1))); + perf.push(new PointEvent(193, generateSwitch(0, 0, 0))); perf.fresh(); demoPerfs["R-love"] = perf; }; { // MU80 demo, Out of the Muse let perf = new TimedEvents(); - perf.push(new PointEvent(1.6, generateSwitch(19))); - perf.push(new PointEvent(18.92, generateSwitch(3))); + perf.push(new PointEvent(1.6, generateSwitch(19, 0, 1))); + perf.push(new PointEvent(18.92, generateSwitch(3, 0, 0))); perf.push(new PointEvent(27.29, generateSwitch(2))); perf.push(new PointEvent(31.47, generateSwitch(9))); perf.push(new PointEvent(33.49, generateSwitch(10))); - perf.push(new PointEvent(35.52, generateSwitch(19))); + perf.push(new PointEvent(35.52, generateSwitch(19, 0, 1))); perf.push(new PointEvent(37.62, generateSwitch(1))); perf.push(new PointEvent(39.73, generateSwitch(3))); perf.push(new PointEvent(41.83, generateSwitch(6))); @@ -714,12 +757,12 @@ self.performance = currentPerformance; perf.push(new PointEvent(46.03, generateSwitch(19))); perf.push(new PointEvent(48.13, generateSwitch(21))); perf.push(new PointEvent(50.23, generateSwitch(24))); - perf.push(new PointEvent(52.34, generateSwitch(3))); + perf.push(new PointEvent(52.34, generateSwitch(3, 0, 0))); perf.push(new PointEvent(57.76, generateSwitch(4))); perf.push(new PointEvent(61.12, generateSwitch(3))); perf.push(new PointEvent(64.11, generateSwitch(4))); perf.push(new PointEvent(69.84, generateSwitch(6))); - perf.push(new PointEvent(87.48, generateSwitch(4))); + perf.push(new PointEvent(87.48, generateSwitch(4, 0, 1))); perf.push(new PointEvent(117.12, generateSwitch(23))); perf.push(new PointEvent(125, generateSwitch(0))); perf.fresh(); @@ -814,10 +857,10 @@ self.performance = currentPerformance; let perf = new TimedEvents(); // Disable native RS perf.push(new PointEvent(0, {type: 15, track: 0, data: [67, 16, 73, 0, 0, 68, 0]})); - perf.push(new PointEvent(0, generateSwitch(0))); + perf.push(new PointEvent(0, generateSwitch(0, 0, 0))); perf.push(new PointEvent(0.5, {type: 15, data: [67, 16, 73, 0, 0, 18, 1]})); - perf.push(new PointEvent(1.6, generateSwitch(0))); - perf.push(new PointEvent(40.02, generateSwitch(48))); + perf.push(new PointEvent(1.6, generateSwitch(0, 0, 3))); + perf.push(new PointEvent(40.02, generateSwitch(48, 3, 3))); perf.push(new PointEvent(41.68, generateSwitch(49))); perf.push(new PointEvent(43.07, generateSwitch(50))); perf.push(new PointEvent(44.65, generateSwitch(51))); @@ -829,7 +872,7 @@ self.performance = currentPerformance; perf.push(new PointEvent(53.92, generateSwitch(58))); perf.push(new PointEvent(55.47, generateSwitch(59))); perf.push(new PointEvent(57.02, generateSwitch(48))); - perf.push(new PointEvent(69.56, generateSwitch(8))); + perf.push(new PointEvent(69.56, generateSwitch(8, 0, 0))); perf.push(new PointEvent(70.54, generateSwitch(9))); perf.push(new PointEvent(71.52, generateSwitch(10))); perf.push(new PointEvent(72.5, generateSwitch(11))); @@ -847,7 +890,7 @@ self.performance = currentPerformance; perf.push(new PointEvent(87.0, generateSwitch(6))); perf.push(new PointEvent(87.97, generateSwitch(7))); perf.push(new PointEvent(88.94, generateSwitch(0))); - perf.push(new PointEvent(96.66, generateSwitch(16))); + perf.push(new PointEvent(96.66, generateSwitch(16, 1, 1))); perf.push(new PointEvent(98.15, generateSwitch(17))); perf.push(new PointEvent(99.63, generateSwitch(18))); perf.push(new PointEvent(101.12, generateSwitch(19))); @@ -864,7 +907,7 @@ self.performance = currentPerformance; perf.push(new PointEvent(117.45, generateSwitch(30))); perf.push(new PointEvent(118.94, generateSwitch(31))); perf.push(new PointEvent(120.42, generateSwitch(16))); - perf.push(new PointEvent(122.34, generateSwitch(5))); + perf.push(new PointEvent(122.34, generateSwitch(5, 0, 1))); perf.push(new PointEvent(158.26, generateSwitch(0))); perf.fresh(); demoPerfs["MU128DEMO"] = perf;