Changeset 578

Show
Ignore:
Timestamp:
10/16/08 19:11:00 (3 months ago)
Author:
smoors
Message:

corrected the action list and added actions to control the master volume

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libs/hydrogen/src/action.cpp

    r576 r578  
    8787        << "MASTER_VOLUME_RELATIVE" 
    8888        << "MASTER_VOLUME_ABSOLUTE" 
    89       << "STRIP_VOLUME_RELATIVE" 
     89/*    << "STRIP_VOLUME_RELATIVE" 
    9090        << "STRIP_VOLUME_ABSOLUTE" 
    91 /*    << "EFFECT1_LEVEL_RELATIVE" 
     91      << "EFFECT1_LEVEL_RELATIVE" 
    9292        << "EFFECT2_LEVEL_RELATIVE" 
    9393        << "EFFECT3_LEVEL_RELATIVE" 
     
    9696        << "EFFECT2_LEVEL_ABSOLUTE" 
    9797        << "EFFECT3_LEVEL_ABSOLUTE" 
    98         << "EFFECT4_LEVEL_ABSOLUTE"*/ 
     98        << "EFFECT4_LEVEL_ABSOLUTE" 
    9999        << "PAN_RELATIVE" 
    100         << "PAN_ABSOULTE" 
     100        << "PAN_ABSOULTE"*/ 
    101101        << "BEATCOUNTER" 
    102102        << "TAP_TEMPO"; 
     
    140140} 
    141141 
     142 
    142143/* 
    143  
    144144bool setAbsoluteFXLevel( int nLine, int fx_channel , int fx_param) 
    145145{ 
     
    165165 
    166166}*/ 
    167  
    168167 
    169168bool ActionManager::handleAction( Action * pAction ){ 
     
    281280 
    282281 
    283  
     282        */ 
    284283 
    285284        if( sActionString == "MASTER_VOLUME_RELATIVE" ){ 
     
    308307        } 
    309308 
     309         
     310 
    310311        if( sActionString == "MASTER_VOLUME_ABSOLUTE" ){ 
    311312                //sets the volume of a mixer strip to a given level (percentage) 
     
    327328 
    328329        } 
     330 
     331        /* 
    329332 
    330333        if( sActionString == "STRIP_VOLUME_RELATIVE" ){