Navigation

Changeset 547

Timestamp:

10/07/08 12:45:18 (2 months ago)

Author:

smoors

Message:

added basic CC-message support

Files:

r127	r547
94	94	void handleMidiMessage( const MidiMessage& msg );
95	95	void handleSysexMessage( const MidiMessage& msg );
	96	void handleControlChangeMessage( const MidiMessage& msg);
96	97
97	98	protected:

r174	r547
37	37	void registerMMCEvent( QString,action * );
38	38	void registerNoteEvent( int , action * );
	39	void registerCCEvent( int , action * );
39	40
40	41	map <QString , action *> getMMCMap();
…	…
42	43	action * getMMCAction( QString );
43	44	action * getNoteAction( int note );
	45	action * getCCAction( int parameter );
44	46
45	47	void setupNoteArray();
…	…
50	52
51	53	action * noteArray[128];
	54	action * ccArray[128];
	55
52	56	map <QString , action *> mmcMap;
53	57	};

r426	r547
74	74
75	75	case MidiMessage::CONTROL_CHANGE:
76		~~INFOLOG( QString( "[handleMidiMessage] CONTROL_CHANGE Parameter: %1, Value: %2" ).arg( msg.m_nData1 ).arg( msg.m_nData2 )~~ );
	76	handleControlChangeMessage( msg );
77	77	break;
78	78
…	…
129	129	}
130	130
131
	131	void MidiInput::handleControlChangeMessage( const MidiMessage& msg )
	132	{
	133	INFOLOG( QString( "[handleMidiMessage] CONTROL_CHANGE Parameter: %1, Value: %2" ).arg( msg.m_nData1 ).arg( msg.m_nData2 ) );
	134
	135	Hydrogen *pEngine = Hydrogen::get_instance();
	136	actionManager * aH = actionManager::getInstance();
	137	midiMap * mM = midiMap::getInstance();
	138
	139	bool action = aH->handleAction( mM->getCCAction( msg.m_nData1 ) );
	140
	141
	142	}
132	143
133	144	void MidiInput::handleNoteOnMessage( const MidiMessage& msg )

r174	r547
30	30	{
31	31	//constructor
32		for(int note = 0; note < 128; note++ ){
33		noteArray[ note ] = new action("NOTHING");
	32	for(int i = 0; i < 128; i++ ){
	33	noteArray[ i ] = new action("NOTHING");
	34	ccArray[ i ] = new action("NOTHING");
34	35	}
35	36	}
…	…
74	75	}
75	76
	77
	78	void midiMap::registerCCEvent( int parameter , action * pAction ){
	79	if( parameter >= 0 and parameter < 128 )
	80	{
	81	delete ccArray[ parameter ];
	82	ccArray[ parameter ] = pAction;
	83	}
	84	}
	85
76	86	action * midiMap::getMMCAction( QString eventString ){
77	87
…	…
89	99	}
90	100
	101	action * midiMap::getCCAction( int parameter ){
	102	return ccArray[ parameter ];
	103	}
	104