From abccebae636ad1b2fd5edfdb7b38cfd9cafb19f0 Mon Sep 17 00:00:00 2001 From: kevin Date: Fri, 17 Jan 2014 16:53:01 -0500 Subject: [PATCH] data/live_test0.csv : Updated to allow multiple recd/play markers on the same line. --- src/kc/data/live_test0.csv | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/kc/data/live_test0.csv b/src/kc/data/live_test0.csv index d299393..1e97f70 100755 --- a/src/kc/data/live_test0.csv +++ b/src/kc/data/live_test0.csv @@ -378,9 +378,9 @@ id,trk,evt,opcode,dticks,micros,status,meta,ch,d0,d1,arg0,arg1,bar,skip,even,gra 2671,2,2597,non,0.2448,394.78416,0x90,0,0,30,103,F#1,,,,,,,,,,, 2672,2,2598,non,0.2448,394.78416,0x90,0,0,36,103,C2,,,,,,,,,,,"f 121" 2675,2,2601,non,0.0306,395.24316,0x90,0,0,52,110,E3,,,s,,,,,,,"e 121","not articulated" -2677,2,2603,non,2.448,396.62016,0x90,0,0,45,90,A2,,,,,,,,,,,"c 122" -,,,bar,,,,,,,,,,122,,,,,,,,,"e 122" -2679,2,2605,non,5.8752,397.72176,0x90,0,0,81,97,A5,,,,,,,,,,"c 123", +2677,2,2603,non,2.448,396.62016,0x90,0,0,45,90,A2,,,,,,,,,,"c 122", +,,,bar,,,,,,,,,,122,,,,,,,,, +2679,2,2605,non,5.8752,397.72176,0x90,0,0,81,97,A5,,,,,,,,,,"e 122 c 123", 2680,2,2606,non,0.4896,397.72176,0x90,0,0,97,106,C#7,,,,,,,,,,, 2682,2,2608,non,0.4896,398.21136,0x90,0,0,50,89,D3,,,,,,,,,,"e 123", ,,,bar,,,,,,,,,,123,,,,,,,,, @@ -399,8 +399,8 @@ id,trk,evt,opcode,dticks,micros,status,meta,ch,d0,d1,arg0,arg1,bar,skip,even,gra 2706,2,2632,non,0.1224,401.76096,0x90,0,0,71,91,B4,,,,,,,,,,, 2710,2,2636,non,0.1224,401.88336,0x90,0,0,64,76,E4,,,,,,,,,,,"f 124" 2712,2,2638,non,0.08976,402.00576,0x90,0,0,54,82,F#3,,,,,,,,,,, -2714,2,2640,non,0.03264,402.09552,0x90,0,0,58,41,A#3,,,,,,,,ff,,"e 124", -2715,2,2641,non,1.9584,402.12816,0x90,0,0,45,41,A2,,,,,,,,pppp,,, +2714,2,2640,non,0.03264,402.09552,0x90,0,0,58,41,A#3,,,,,,,,ff,,, +2715,2,2641,non,1.9584,402.12816,0x90,0,0,45,41,A2,,,,,,,,pppp,,"e 124", ,,,bar,,,,,,,,,,125,,,,,,,,, 2717,2,2643,non,0.49929,403.10736,0x90,0,0,71,35,B4,,,,,,t,1,ppp,,, 2719,2,2645,non,0.49929,403.59696,0x90,0,0,86,104,D6,,,,,,t,1,,,, @@ -411,12 +411,12 @@ id,trk,evt,opcode,dticks,micros,status,meta,ch,d0,d1,arg0,arg1,bar,skip,even,gra 2729,2,2655,non,0.05763,404.14776,0x90,0,0,92,54,G#6,,,,,,,,"pppp 48",,, 2732,2,2658,ctl,0,404.33136,0xb0,0,0,64,127,,,,,,,,,,,, ,,,bar,,,,,,,,,,126,,,,,,,47a,, -2733,2,2659,non,3.5496,404.57616,0x90,0,0,77,127,F5,,,,,,,,fff,,, -2734,2,2660,non,3.5496,404.57616,0x90,0,0,84,127,C6,,,,,,,,fff,,, +2733,2,2659,non,3.5496,404.57616,0x90,0,0,77,127,F5,,,,,,,,fff,,"e 126", +2734,2,2660,non,3.5496,404.57616,0x90,0,0,84,127,C6,,,,,,,,fff,,"c 127", 2735,2,2661,non,3.3048,404.82096,0x90,0,0,42,44,F#2,,,,,,,,pp,,, 2736,2,2662,non,3.3048,404.82096,0x90,0,0,56,44,G#3,,,,,,,,pp,,, 2739,2,2665,non,3.06,405.06576,0x90,0,0,31,72,G1,,,,,,,,"mf 49",,,"f 126" -2740,2,2666,non,2.5704,405.55536,0x90,0,0,64,35,E4,,,,,,,,,,"e 126", +2740,2,2666,non,2.5704,405.55536,0x90,0,0,64,35,E4,,,,,,,,,,"e 127", 2741,2,2667,non,2.5704,405.55536,0x90,0,0,80,35,G#5,,,,,,,,,,, 2742,2,2668,non,2.5704,405.55536,0x90,0,0,83,35,B5,,,,,,,,,,, 2743,2,2669,non,2.0808,406.04496,0x90,0,0,98,52,D7,,,,,,,,,,, @@ -427,9 +427,9 @@ id,trk,evt,opcode,dticks,micros,status,meta,ch,d0,d1,arg0,arg1,bar,skip,even,gra 2756,2,2682,non,0.13362,407.99214,0x90,0,0,100,33,E7,,,,,,,,,,, 2757,2,2683,non,0.1224,408.00336,0x90,0,0,65,33,F4,,,,,,,,,,, 2760,2,2686,ctl,0,408.12576,0xb0,0,0,64,0,,,,,,,,,,,, -2761,2,2687,non,0.0612,408.37056,0x90,0,0,48,37,C3,,,,,,,,,,, +2761,2,2687,non,0.0612,408.37056,0x90,0,0,48,37,C3,,,,,,,,,,"c 128", ,,,bar,,,,,,,,,,128,,,,,,,,, -2763,2,2689,non,0.1224,408.49296,0x90,0,0,58,42,A#3,,,,,,,,,,"c 128", +2763,2,2689,non,0.1224,408.49296,0x90,0,0,58,42,A#3,,,,,,,,,,, 2765,2,2691,non,0.2448,408.61536,0x90,0,0,68,56,G#4,,,,,,,,,,, 2768,2,2694,non,1.24899,408.98256,0x90,0,0,92,89,G#6,,,,,,,,,,"e 128", 2769,2,2695,ctl,0,408.98256,0xb0,0,0,64,127,,,,,,,,,,,, @@ -445,7 +445,7 @@ id,trk,evt,opcode,dticks,micros,status,meta,ch,d0,d1,arg0,arg1,bar,skip,even,gra 2784,2,2710,non,1.05978,410.94096,0x90,0,0,36,67,C2,,,,,,,,,,"c 129", 2785,2,2711,non,0.69258,411.30816,0x90,0,0,49,86,C#3,,,,,,,,,,, 2787,2,2713,non,0.14178,411.85896,0x90,0,0,80,77,G#5,,,,,,,,,,, -2791,2,2717,non,0.08058,411.92016,0x90,0,0,33,57,A1,,,,e,,,0.1666,,,"e 129","c 130 e 129" +2791,2,2717,non,0.08058,411.92016,0x90,0,0,33,57,A1,,,,e,,,0.1666,,,"e 129 c 130", 2793,2,2719,non,0.08211,412.00074,0x90,0,0,74,78,D5,,,,e,,,0.1666,,,, 2794,2,2720,ctl,0,412.00074,0xb0,0,0,64,0,,,,,,,,,,,, 2796,2,2722,non,0.08211,412.00074,0x90,0,0,25,58,C#1,,,,,,,,,,, @@ -453,7 +453,7 @@ id,trk,evt,opcode,dticks,micros,status,meta,ch,d0,d1,arg0,arg1,bar,skip,even,gra 2800,2,2726,non,0.16269,412.08285,0x90,0,0,84,45,C6,,,,,,,,,,, 2802,2,2728,non,0.08058,412.16496,0x90,0,0,61,37,C#4,,,,e,,,0.1666,,,,"f 130" 2804,2,2730,non,0.08211,412.24554,0x90,0,0,57,37,A3,,,,"e 52",,,,ppp,,, -2806,2,2732,non,0.16422,412.24554,0x90,0,0,47,40,B2,,,,,,,,ppp,,,"e 130" +2806,2,2732,non,0.16422,412.24554,0x90,0,0,47,40,B2,,,,,,,,ppp,,"e 130", 2808,2,2734,non,0.02091,412.38885,0x90,0,0,85,62,C#6,,,,,,,,ppp,,"c 131","should be C#5" ,,,non,,412.4,,,,,,A5,,,,,,,,ppp,,, ,,,non,,412.4,,,,,,D6,,,,,,,,ppp,,, @@ -462,7 +462,7 @@ id,trk,evt,opcode,dticks,micros,status,meta,ch,d0,d1,arg0,arg1,bar,skip,even,gra 2810,2,2736,non,0.4896,412.40976,0x90,0,0,96,62,C7,,,,,,,,ppp,,, 2811,2,2737,non,0.4896,412.40976,0x90,0,0,105,62,A7,,,,,,,,ppp,,, 2814,2,2740,non,2.28378,412.40976,0x90,0,0,63,54,D#4,,,,,,,,ppp,,, -2818,2,2744,non,0.65229,412.89936,0x90,0,0,68,38,G#4,,,,,,,,"ppp 50",,"e 131","e 131 c 132" +2818,2,2744,non,0.65229,412.89936,0x90,0,0,68,38,G#4,,,,,,,,"ppp 50",,"e 131 c 132", 2820,2,2746,non,0.32691,413.55165,0x90,0,0,100,61,E7,,,,,,,,ppp,,, 2821,2,2747,non,0.0612,413.75616,0x90,0,0,74,39,D5,,,,,,,,ppp,,, 2823,2,2749,non,0.0612,413.81736,0x90,0,0,61,33,C#4,,,,,,,,ppp,,, @@ -483,9 +483,9 @@ id,trk,evt,opcode,dticks,micros,status,meta,ch,d0,d1,arg0,arg1,bar,skip,even,gra ,,,non,,415.89,,,,,,D#1,,,,,,,,,,,missing ,,,non,,415.94,,,,,,B3,,,,,,,,,,,missing ,,,non,,415.99,,,,,,F#1,,,,,,,,,,,missing -,,,bar,,,,,,,,,,132,,,,,,,,,"e 132" +,,,bar,,,,,,,,,,132,,,,,,,,, ,,,bar,,,,,,,,,,133,,,,,,,,, -2851,2,2777,non,3.4272,418.77456,0x90,0,0,85,127,C#6,,,,,,,,,49,, +2851,2,2777,non,3.4272,418.77456,0x90,0,0,85,127,C#6,,,,,,,,,49,"e 132", 2852,2,2778,non,0.9792,419.26416,0x90,0,0,28,41,E1,,,,,,,,,,, 2853,2,2779,non,0.32691,419.42685,0x90,0,0,95,38,B6,,,,,,,,,,, ,,,non,,420.19,,,,,,C4,,,,,,,,,,,missing