Changeset 558

Timestamp:

10/14/08 22:03:47 (2 months ago)

Author:

smoors

Message:

added actions to control mixer strip volume via midi

Files:

• branches/midiAutosense/libs/hydrogen/src/action.cpp (modified) (2 diffs)

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

@@ -82 +82 @@
-        << "BPM_DECR"
-        << "BPM_CC_RELATIVE"
+        << "STRIP_VOLUME_RELATIVE"
+        << "STRIP_VOLUME_ABSOLUTE"
-        << "BEATCOUNTER"
-        << "TAP_TEMPO";
@@ -204 +206 @@
-
-
+        if( sActionString == "STRIP_VOLUME_RELATIVE" ){
+                
+                bool ok;
+                int nLine = pAction->getParameter1().toInt(&ok,10);
+                int vol_param = pAction->getParameter2().toInt(&ok,10);
+                        
+                Hydrogen::get_instance()->setSelectedInstrumentNumber( nLine );
+
+                Hydrogen *engine = Hydrogen::get_instance();
+                Song *song = engine->getSong();
+                InstrumentList *instrList = song->get_instrument_list();
+
+                Instrument *instr = instrList->get( nLine );
+
+                if ( instr == NULL) return 0;
+
+                if( vol_param != 0 ){
+                                if ( vol_param == 1){
+                                        instr->set_volume( instr->get_volume() + 0.1 );  
+                                } else {
+                                        instr->set_volume( instr->get_volume() - 0.1 );
+                                }
+                } else {
+                        instr->set_volume( 0 );
+                }
+
+                Hydrogen::get_instance()->setSelectedInstrumentNumber(nLine);
+        }
+
+        if( sActionString == "STRIP_VOLUME_ABSOLUTE" ){
+                
+                bool ok;
+                int nLine = pAction->getParameter1().toInt(&ok,10);
+                int vol_param = pAction->getParameter2().toInt(&ok,10);
+                        
+                Hydrogen::get_instance()->setSelectedInstrumentNumber( nLine );
+
+                Hydrogen *engine = Hydrogen::get_instance();
+                Song *song = engine->getSong();
+                InstrumentList *instrList = song->get_instrument_list();
+
+                Instrument *instr = instrList->get( nLine );
+
+                if ( instr == NULL) return 0;
+
+                if( vol_param != 0 ){
+                                instr->set_volume( 1.5* ( (float) (vol_param / 127.0 ) ));
+                } else {
+                                instr->set_volume( 0 );
+                }
+
+                Hydrogen::get_instance()->setSelectedInstrumentNumber(nLine);
+        }
+
-        if( sActionString == "BPM_CC_RELATIVE" ){
-                AudioEngine::get_instance()->lock( "Action::BPM_CC_RELATIVE" );