Changeset 548

Timestamp:

10/07/08 19:20:34 (2 months ago)

Author:

smoors

Message:

improved CC-message support. CC-messages are recognized by autosense.yay!

Files:

• branches/midiAutosense/gui/src/widgets/midiTable.cpp (modified) (2 diffs)
• branches/midiAutosense/libs/hydrogen/src/IO/midi_input.cpp (modified) (1 diff)
• branches/midiAutosense/libs/hydrogen/src/action.cpp (modified) (1 diff)
• branches/midiAutosense/libs/hydrogen/src/midiMap.cpp (modified) (1 diff)
• branches/midiAutosense/libs/hydrogen/src/preferences.cpp (modified) (4 diffs)

branches/midiAutosense/gui/src/widgets/midiTable.cpp

@@ -227 +227 @@
-                insertNewRow(pAction->getType() , "NOTE" , note , actionParameterInteger );
-        }
+
+        for( int parameter = 0; parameter < 128; parameter++ )
+        {
+                action * pAction = mM->getCCAction( parameter );
+                QString actionParameter;
+                int actionParameterInteger = 0;
+
+                if( pAction->getParameterList().size() != 0 ){
+                        actionParameter = pAction->getParameterList().at(0);
+                        actionParameterInteger = actionParameter.toInt(&ok,10);
+                }
+
+                if ( pAction->getType() == "NOTHING" ) continue;
+
+                insertNewRow(pAction->getType() , "CC" , parameter , actionParameterInteger );
+        }
+
-        
-        insertNewRow("","",0,0);
@@ -276 +293 @@
-                                mM->registerNoteEvent( eventSpinner->cleanText().toInt() , pAction );
-                        }
-
-
-
+
+
+
+
+
+
+

branches/midiAutosense/libs/hydrogen/src/IO/midi_input.cpp

@@ -139 +139 @@
-        bool action = aH->handleAction( mM->getCCAction( msg.m_nData1 ) );
-
+        pEngine->lastMidiEvent = "CC";
+        pEngine->lastMidiEventParameter = msg.m_nData1;
+        
-
-}

branches/midiAutosense/libs/hydrogen/src/action.cpp

@@ -82 +82 @@
-        << "MMC_RECORD_EXIT"
-        << "MMC_PAUSE"
-
+
+
-}
-

branches/midiAutosense/libs/hydrogen/src/midiMap.cpp

@@ -46 +46 @@
-
-        for(int i = 0; i < 128; i++){
-
+
+
-        }
-

branches/midiAutosense/libs/hydrogen/src/preferences.cpp

@@ -471 +471 @@
-                                for ( pMidiEventNode = pMidiEventMapNode->FirstChild( "midiEvent" ); pMidiEventNode; pMidiEventNode = pMidiEventNode->NextSibling( "midiEvent" ) ) {
-                                        
-
+ 
-                                                QString event = pMidiEventNode->FirstChild("mmcEvent")->FirstChild()->Value();
-        
@@ -482 +482 @@
-                                                pAction->addParameter( s_param );
-                                
-event, pAction
+ event, pAction 
-                                                
-                                        }
-
-                                        
-
+ 
-                                                QString event = pMidiEventNode->FirstChild("noteEvent")->FirstChild()->Value();
-        
@@ -500 +500 @@
-                                                pAction->addParameter( s_param );
-                                
-s_eventParameter.toInt(), pAction
+ s_eventParameter.toInt(), pAction 
-                                        }
+                                        
+                                        if( pMidiEventNode->FirstChild()->Value() == QString("ccEvent") ){
+                                                QString event = pMidiEventNode->FirstChild("ccEvent")->FirstChild()->Value();
+        
+                                                QString s_action = pMidiEventNode->FirstChild("action")->FirstChild()->Value();
+
+                                                QString s_param = pMidiEventNode->FirstChild("parameter")->FirstChild()->Value();
+
+                                                QString s_eventParameter = pMidiEventNode->FirstChild("eventParameter")->FirstChild()->Value();
+        
+                                                action * pAction = new action( s_action );
+
+                                                pAction->addParameter( s_param );
+                                
+                                                mM->registerCCEvent( s_eventParameter.toInt(), pAction );
+                                        }
+
+
+
-                                }
-                        } else {
@@ -830 +849 @@
-                                LocalFileMng::writeXmlString( &midiEventNode, "noteEvent" , QString("NOTE") );
-                                LocalFileMng::writeXmlString( &midiEventNode, "eventParameter" , QString::number( note ) );
+                                
+
+                                LocalFileMng::writeXmlString( &midiEventNode, "action" , pAction->getType() );
+
+                                if ( pAction->getParameterList().size() != 0 ){
+                                        LocalFileMng::writeXmlString( &midiEventNode, "parameter" , pAction->getParameterList().at(0) );
+                                }
+
+                                midiEventMapNode.InsertEndChild(midiEventNode);
+                        }
+                }
+
+                for( int parameter=0; parameter < 128; parameter++ ){
+                        action * pAction = mM->getCCAction( parameter );
+                        if( pAction != NULL && pAction->getType() != "NOTHING")
+                        {
+                                TiXmlElement midiEventNode( "midiEvent" );
+                                
+                                LocalFileMng::writeXmlString( &midiEventNode, "ccEvent" , QString("CC") );
+                                LocalFileMng::writeXmlString( &midiEventNode, "eventParameter" , QString::number( parameter ) );
+                                
-
-                                LocalFileMng::writeXmlString( &midiEventNode, "action" , pAction->getType() );