Changeset 565

Timestamp:

10/15/08 12:51:48 (2 months ago)

Author:

smoors

Message:

added midi-action which controls the effect level ( absoulute only )

Files:

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

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

@@ -89 +89 @@
-        << "STRIP_VOLUME_RELATIVE"
-        << "STRIP_VOLUME_ABSOLUTE"
+        << "EFFECT1_LEVEL_RELATIVE"
+        << "EFFECT2_LEVEL_RELATIVE"
+        << "EFFECT3_LEVEL_RELATIVE"
+        << "EFFECT4_LEVEL_RELATIVE"
+        << "EFFECT1_LEVEL_ABSOLUTE"
+        << "EFFECT2_LEVEL_ABSOLUTE"
+        << "EFFECT3_LEVEL_ABSOLUTE"
+        << "EFFECT4_LEVEL_ABSOLUTE"
-        << "PAN_RELATIVE"
-        << "PAN_ABSOULTE"
@@ -132 +140 @@
-}
-
+
+
+bool setAbsoluteFXLevel( int nLine, int fx_channel , int fx_param)
+{
+        //helper function to set fx levels
+                        
+        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 false;
+
+        if( fx_param != 0 ){
+                        instr->set_fx_level(  ( (float) (fx_param / 127.0 ) ), fx_channel );
+        } else {
+                        instr->set_fx_level( 0 , fx_channel );
+        }
+                
+        Hydrogen::get_instance()->setSelectedInstrumentNumber(nLine);
+        
+        return true;
+
+}
+
+
-bool actionManager::handleAction( action * pAction ){
-
@@ -212 +247 @@
-                return true;
-        }
+
+
+
+        if( sActionString == "STRIP_VOLUME_ABSOLUTE" ){
+                //sets the volume of a mixer strip to a given level (percentage)
+
+                bool ok;
+                int nLine = pAction->getParameter1().toInt(&ok,10);
+                int vol_param = pAction->getParameter2().toInt(&ok,10);
+                        
+
+                Hydrogen *engine = Hydrogen::get_instance();
+                Song *song = engine->getSong();
+
+
+                if( vol_param != 0 ){
+                                song->set_volume( 1.5* ( (float) (vol_param / 127.0 ) ));
+                } else {
+                                song->set_volume( 0 );
+                }
+
+        }
+
+        if( sActionString == "STRIP_VOLUME_RELATIVE" ){
+                //increments/decrements the volume of one mixer strip   
+                
+                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->get_volume() < 1.5 ){
+                                        instr->set_volume( instr->get_volume() + 0.1 );  
+                                }  else  {
+                                        if( instr->get_volume() >= 0.0 ){
+                                                instr->set_volume( instr->get_volume() - 0.1 );
+                                        }
+                                }
+                } else {
+                        instr->set_volume( 0 );
+                }
+
+                Hydrogen::get_instance()->setSelectedInstrumentNumber(nLine);
+        }
+
+        if( sActionString == "EFFECT1_LEVEL_ABSOLUTE" ){
+                bool ok;
+                int nLine = pAction->getParameter1().toInt(&ok,10);
+                int fx_param = pAction->getParameter2().toInt(&ok,10);
+                setAbsoluteFXLevel( nLine, 0 , fx_param );
+        }
+
+        if( sActionString == "EFFECT2_LEVEL_ABSOLUTE" ){
+                bool ok;
+                int nLine = pAction->getParameter1().toInt(&ok,10);
+                int fx_param = pAction->getParameter2().toInt(&ok,10);
+                setAbsoluteFXLevel( nLine, 1 , fx_param );
+        }
+
+        if( sActionString == "EFFECT3_LEVEL_ABSOLUTE" ){
+                bool ok;
+                int nLine = pAction->getParameter1().toInt(&ok,10);
+                int fx_param = pAction->getParameter2().toInt(&ok,10);
+                setAbsoluteFXLevel( nLine, 2 , fx_param );
+        }
+
+        if( sActionString == "EFFECT4_LEVEL_ABSOLUTE" ){
+                bool ok;
+                int nLine = pAction->getParameter1().toInt(&ok,10);
+                int fx_param = pAction->getParameter2().toInt(&ok,10);
+                setAbsoluteFXLevel( nLine, 3 , fx_param );
+        }
+
-
-