Changeset 166

Timestamp:

05/26/08 23:46:37 (5 years ago)

Author:

smoors

Message:

added experimental support for customizable note messages

Location:

trunk

Files:

• gui/src/PreferencesDialog.cpp (modified) (5 diffs)
• libs/hydrogen/include/hydrogen/action.h (modified) (1 diff)
• libs/hydrogen/src/IO/midi_input.cpp (modified) (2 diffs)
• libs/hydrogen/src/action.cpp (modified) (5 diffs)
• libs/hydrogen/src/preferences.cpp (modified) (3 diffs)

trunk/gui/src/PreferencesDialog.cpp

@@ -389 +389 @@
 
 
+
 void PreferencesDialog::setupMidiTable()
 {
@@ -446 +447 @@
 
                 QString actionParameter;
-                if(pAction->getParameterList().size() != 0){
+                if( pAction->getParameterList().size() != 0 ){
                         actionParameter = pAction->getParameterList().at(0);
                 }
@@ -457 +458 @@
                 tableWidget->setCellWidget( rowCount , 3, actionParameterSpinner );
                 rowCount++;
+        }
+
+        for( int note = 0; note < 128; note++ ){
+                
+                QString eventString = "NOTE";
+                
+                action * pAction = mM->getNoteAction( note );
+                if( pAction->getType() != "NOTHING" ){
+                        cout << note << pAction << endl;
+                        
+                        tableWidget->insertRow( tableWidget->rowCount() );
+                        QComboBox *eventBox = new QComboBox();
+                        eventBox->insertItems( rowCount , aH->getEventList() );
+                        eventBox->setCurrentIndex( eventBox->findText(eventString) );
+                        tableWidget->setCellWidget( rowCount, 0, eventBox );
+                        
+                        QSpinBox *eventParameterSpinner = new QSpinBox();
+                        tableWidget->setCellWidget( rowCount , 1, eventParameterSpinner );
+                        eventParameterSpinner->setValue( note );
+                        
+                        QComboBox *actionBox = new QComboBox();
+                        actionBox->insertItems(rowCount,aH->getActionList());
+                        actionBox->setCurrentIndex ( actionBox->findText(pAction->getType() ) );
+                        tableWidget->setCellWidget( rowCount , 2, actionBox );
+                
+        
+                        QString actionParameter;
+                        QSpinBox *actionParameterSpinner = new QSpinBox();
+
+                        if( pAction->getParameterList().size() > 0 ){
+                                actionParameter = pAction->getParameterList().at(0);
+                                bool ok;
+                                actionParameterSpinner->setValue( actionParameter.toInt(&ok,10) );
+                        }
+        
+                        tableWidget->setCellWidget( rowCount , 3, actionParameterSpinner );
+                        rowCount++;
+                }
         }
         
@@ -490 +529 @@
                 QComboBox * eventCombo =  dynamic_cast <QComboBox *> ( tableWidget->cellWidget( row, 0 ) );
         
+                QSpinBox * eventSpinner = dynamic_cast <QSpinBox *> ( tableWidget->cellWidget( row, 1 ) );
+
                 QComboBox * actionCombo = dynamic_cast <QComboBox *> ( tableWidget->cellWidget( row, 2 ) );
 
                 QSpinBox * actionSpinner = dynamic_cast <QSpinBox *> ( tableWidget->cellWidget( row, 3 ) );
+
+                
 
                 QString eventString;
                 QString actionString;
+                
 
                 if( eventCombo->currentText() != "" && actionCombo->currentText() != "" ){
@@ -508 +552 @@
                         }
         
-                        mM->registerMMCEvent( eventString , pAction );
+                        if( eventString.left(3) == "MMC" ){
+                                mM->registerMMCEvent( eventString , pAction );
+                        }
+                        
+                        if( eventString.left(4) == "NOTE" ){
+                                mM->registerNoteEvent( eventSpinner->cleanText().toInt() , pAction );
+                                cout << "register " << eventSpinner->value() << endl;
+                        }
                 }
         }

trunk/libs/hydrogen/include/hydrogen/action.h

@@ -53 +53 @@
 
                 void registerMMCEvent( QString,action * );
+                void registerNoteEvent( int , action * );
+
+                map <QString , action *> getMMCMap();
 
                 action * getMMCAction( QString );
+                action * getNoteAction( int note );
+
+                void setupNoteArray();
                 
-                map <QString , action *> getMMCMap();
+                
+
+        private:
+
+                action * noteArray[128];
                 map <QString , action *> mmcMap;
 };

trunk/libs/hydrogen/src/IO/midi_input.cpp

@@ -37 +37 @@
 {
         //INFOLOG( "INIT" );
+        
 }
 
@@ -132 +133 @@
 {
         INFOLOG( "handleNoteOnMessage" );
+
+        actionManager * aH = actionManager::getInstance();
+        midiMap * mM = midiMap::getInstance();
+
+        aH->handleAction( mM->getNoteAction( msg.m_nData1 ) );
 
         int nMidiChannelFilter = Preferences::getInstance()->m_nMidiChannelFilter;

trunk/libs/hydrogen/src/action.cpp

@@ -61 +61 @@
 {
         //constructor
+        for(int note = 0; note < 128; note++ ){
+                noteArray[ note ] = new action("NOTHING");
+        }
 }
 
@@ -66 +69 @@
 {
         std::map< QString , action *>::iterator dIter(mmcMap.begin());
+
         for( dIter = mmcMap.begin(); dIter != mmcMap.end(); dIter++ )
         {
                 delete dIter->second;
         }
+
+        for(int i = 0; i < 128; i++){
+                delete noteArray[i];
+        }
+
         instance = NULL;
 }
@@ -88 +97 @@
 }
 
+void midiMap::registerNoteEvent( int note , action * pAction ){
+        
+        if( note >= 0 && note < 128 ){
+                delete noteArray[ note ];
+                noteArray[ note ] = pAction;
+        }
+}
 
 action * midiMap::getMMCAction( QString eventString ){
@@ -100 +116 @@
 }
 
-
+action * midiMap::getNoteAction( int note ){
+        return noteArray[ note ];
+}
 
 
@@ -127 +145 @@
         << "MMC_RECORD_STROBE"
         << "MMC_RECORD_EXIT"
-        << "MMC_PAUSE";
+        << "MMC_PAUSE"
+        << "NOTE";
 }
 

trunk/libs/hydrogen/src/preferences.cpp

@@ -421 +421 @@
                                                 
                                         }
+
+                                        
+                                        if( pMidiEventNode->FirstChild()->Value() == QString("noteEvent")){
+                                                QString event = pMidiEventNode->FirstChild("noteEvent")->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->registerNoteEvent(s_eventParameter.toInt(), pAction);
+                                        }
                                 }
                         } else {
@@ -643 +661 @@
         {
                 
-                std::map< QString , action *>::iterator dIter(mmcMap.begin());
+                std::map< QString , action *>::iterator dIter( mmcMap.begin() );
                 for( dIter = mmcMap.begin(); dIter != mmcMap.end(); dIter++ ){
                         
@@ -665 +683 @@
                                 midiEventMapNode.InsertEndChild(midiEventNode);
 
+                        }
+                }
+                
+                for( int note=0; note < 128; note++ ){
+                        action * pAction = mM->getNoteAction( note );
+                        if( pAction != NULL && pAction->getType() != "NOTHING")
+                        {
+                                TiXmlElement midiEventNode( "midiEvent" );
+                                
+                                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);
                         }
                 }