Changeset 564

Timestamp:

10/15/08 05:51:53 (2 months ago)

Author:

smoors

Message:

added midi-action to control master fader

Files:

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

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

@@ -85 +85 @@
-        << "BPM_DECR"
-        << "BPM_CC_RELATIVE"
+        << "MASTER_VOLUME_RELATIVE"
+        << "MASTER_VOLUME_ABSOLUTE"
-        << "STRIP_VOLUME_RELATIVE"
-        << "STRIP_VOLUME_ABSOLUTE"
@@ -212 +214 @@
-
-
+
+
+        if( sActionString == "MASTER_VOLUME_RELATIVE" ){
+                //increments/decrements the volume of the whole song    
+                
+                bool ok;
+                int vol_param = pAction->getParameter2().toInt(&ok,10);
+                        
+                Hydrogen *engine = Hydrogen::get_instance();
+                Song *song = engine->getSong();
+
+
+
+                if( vol_param != 0 ){
+                                if ( vol_param == 1 && song->get_volume() < 1.5 ){
+                                        song->set_volume( song->get_volume() + 0.05 );  
+                                }  else  {
+                                        if( song->get_volume() >= 0.0 ){
+                                                song->set_volume( song->get_volume() - 0.05 );
+                                        }
+                                }
+                } else {
+                        song->set_volume( 0 );
+                }
+
+        }
+
+        if( sActionString == "MASTER_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