Changeset 562

Timestamp:

10/15/08 00:00:41 (2 months ago)

Author:

smoors

Message:

added actions to control panning via midi

Files:

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

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

@@ -84 +84 @@
-        << "STRIP_VOLUME_RELATIVE"
-        << "STRIP_VOLUME_ABSOLUTE"
+        << "PAN_RELATIVE"
+        << "PAN_ABSOULTE"
-        << "BEATCOUNTER"
-        << "TAP_TEMPO";
@@ -225 +227 @@
-
-                if( vol_param != 0 ){
-
+ && instr->get_volume() < 1.5 
-                                        instr->set_volume( instr->get_volume() + 0.1 );  
-
-
+
+
+
+
-                                }
-                } else {
@@ -261 +265 @@
-
-                Hydrogen::get_instance()->setSelectedInstrumentNumber(nLine);
+        }
+
+        
+        if( sActionString == "PAN_ABSOULTE" ){
+                /*
+                 * sets the absolute panning of a given mixer channel
+                */
+                
+                bool ok;
+                int nLine = pAction->getParameter1().toInt(&ok,10);
+                int pan_param = pAction->getParameter2().toInt(&ok,10);
+
+                
+                float pan_L;
+                float pan_R;
+
+                Hydrogen *engine = Hydrogen::get_instance();
+                engine->setSelectedInstrumentNumber( nLine );
+                Song *song = engine->getSong();
+                InstrumentList *instrList = song->get_instrument_list();
+
+                Instrument *instr = instrList->get( nLine );
+                
+                if( instr == NULL )
+                        return false;
+                
+                pan_L = instr->get_pan_l();
+                pan_R = instr->get_pan_r();
+
+                // pan
+                float fPanValue = 0.0;
+                if (pan_R == 1.0) {
+                        fPanValue = 1.0 - (pan_L / 2.0);
+                }
+                else {
+                        fPanValue = pan_R / 2.0;
+                }
+
+                
+                fPanValue = 1 * ( ((float) pan_param) / 127.0 );
+
+
+                if (fPanValue >= 0.5) {
+                        pan_L = (1.0 - fPanValue) * 2;
+                        pan_R = 1.0;
+                }
+                else {
+                        pan_L = 1.0;
+                        pan_R = fPanValue * 2;
+                }
+
+
+                instr->set_pan_l( pan_L );
+                instr->set_pan_r( pan_R );
+
+                Hydrogen::get_instance()->setSelectedInstrumentNumber(nLine);
+
+                return true;
+        }
+
+        if( sActionString == "PAN_RELATIVE" ){
+                /*
+                 * changes the panning of a given mixer channel
+                 * this is useful if the panning is set by a rotary control knob
+                */
+                
+                bool ok;
+                int nLine = pAction->getParameter1().toInt(&ok,10);
+                int pan_param = pAction->getParameter2().toInt(&ok,10);
+
+                
+                float pan_L;
+                float pan_R;
+
+                Hydrogen *engine = Hydrogen::get_instance();
+                engine->setSelectedInstrumentNumber( nLine );
+                Song *song = engine->getSong();
+                InstrumentList *instrList = song->get_instrument_list();
+
+                Instrument *instr = instrList->get( nLine );
+                
+                if( instr == NULL )
+                        return false;
+                
+                pan_L = instr->get_pan_l();
+                pan_R = instr->get_pan_r();
+
+                // pan
+                float fPanValue = 0.0;
+                if (pan_R == 1.0) {
+                        fPanValue = 1.0 - (pan_L / 2.0);
+                }
+                else {
+                        fPanValue = pan_R / 2.0;
+                }
+
+                if( pan_param == 1 && fPanValue < 1 ){
+                        fPanValue += 0.05;
+                }
+
+                if( pan_param != 1 && fPanValue > 0 ){
+                        fPanValue -= 0.05;
+                }
+
+                if (fPanValue >= 0.5) {
+                        pan_L = (1.0 - fPanValue) * 2;
+                        pan_R = 1.0;
+                }
+                else {
+                        pan_L = 1.0;
+                        pan_R = fPanValue * 2;
+                }
+
+
+                instr->set_pan_l( pan_L );
+                instr->set_pan_r( pan_R );
+
+                Hydrogen::get_instance()->setSelectedInstrumentNumber(nLine);
+
+                return true;
-        }
-