comparison scripts/hvresources/heavy_render.cpp @ 496:eb237b131ec7 prerelease

Tested and fixed midi glitches heavy

 	//|   |
 	//|   [print pgmin_channel]
 	//[print pgmin_number]
 	hvMidiHashes[kmmProgramChange] = hv_stringToHash("__hv_pgmin");
 	hvMidiHashes[kmmPolyphonicKeyPressure] = hv_stringToHash("__hv_polytouchin");
-	hvMidiHashes[kmmChannelPressure] = hv_stringToHash("__hv_touch");
+	hvMidiHashes[kmmChannelPressure] = hv_stringToHash("__hv_touchin");
 	hvMidiHashes[kmmPitchBend] = hv_stringToHash("__hv_bendin");
 
 	gHeavyContext = hv_bela_new(context->audioSampleRate);
 
 	gHvInputChannels = hv_getNumInputChannels(gHeavyContext);

 				int noteNumber = message.getDataByte(0);
 				int velocity = message.getDataByte(1);
 				int channel = message.getChannel();
 				// rt_printf("message: noteNumber: %f, velocity: %f, channel: %f\n", noteNumber, velocity, channel);
 				hv_vscheduleMessageForReceiver(gHeavyContext, hvMidiHashes[kmmNoteOn], 0, "fff",
-						(float)noteNumber, (float)velocity, (float)channel);
+						(float)noteNumber, (float)velocity, (float)channel+1);
 				break;
 			}
 			case kmmNoteOff: {
 				/* PureData does not seem to handle noteoff messages as per the MIDI specs,
 				 * so that the noteoff velocity is ignored. Here we convert them to noteon

 				int noteNumber = message.getDataByte(0);
 				// int velocity = message.getDataByte(1); // would be ignored by Pd
 				int channel = message.getChannel();
 				// note we are sending the below to hvHashes[kmmNoteOn] !!
 				hv_vscheduleMessageForReceiver(gHeavyContext, hvMidiHashes[kmmNoteOn], 0, "fff",
-						(float)noteNumber, (float)0, (float)channel);
+						(float)noteNumber, (float)0, (float)channel+1);
 				break;
 			}
 			case kmmControlChange: {
 				int channel = message.getChannel();
 				int controller = message.getDataByte(0);
 				int value = message.getDataByte(1);
 				hv_vscheduleMessageForReceiver(gHeavyContext, hvMidiHashes[kmmControlChange], 0, "fff",
-						(float)value, (float)controller, (float)channel);
+						(float)value, (float)controller, (float)channel+1);
 				break;
 			}
 			case kmmProgramChange: {
+				message.prettyPrint();
 				int channel = message.getChannel();
 				int program = message.getDataByte(0);
 				hv_vscheduleMessageForReceiver(gHeavyContext, hvMidiHashes[kmmProgramChange], 0, "ff",
-						(float)program, (float)channel);
+						(float)program, (float)channel+1);
 				break;
 			}
 			case kmmPolyphonicKeyPressure: {
+				message.prettyPrint();
+
 				//TODO: untested, I do not have anything with polyTouch... who does, anyhow?
 				int channel = message.getChannel();
 				int pitch = message.getDataByte(0);
 				int value = message.getDataByte(1);
 				hv_vscheduleMessageForReceiver(gHeavyContext, hvMidiHashes[kmmPolyphonicKeyPressure], 0, "fff",
-						(float)channel, (float)pitch, (float)value);
+						(float)channel+1, (float)pitch, (float)value);
 				break;
 			}
 			case kmmChannelPressure:
 			{
-				//TODO: untested, I do not have anything with aftertouch...
 				int channel = message.getChannel();
 				int value = message.getDataByte(0);
-				//TODO: maybe the order of the arguments is wrong here?
 				hv_vscheduleMessageForReceiver(gHeavyContext, hvMidiHashes[kmmChannelPressure], 0, "ff",
-						(float)channel, (float)value);
+						(float)value, (float)channel+1);
 				break;
 			}
 			case kmmPitchBend:
 			{
 				int channel = message.getChannel();
 				int value = ((message.getDataByte(1) << 7) | message.getDataByte(0)) - 8192;
 				hv_vscheduleMessageForReceiver(gHeavyContext, hvMidiHashes[kmmPitchBend], 0, "ff",
-						(float)channel, (float)value);
+						(float)channel+1, (float)value);
 				break;
 			}
 			case kmmNone:
 			case kmmAny:
 				break;