diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-09 20:21:19 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-09 20:21:19 +0000 |
| commit | e6eb059576eefd9a26c177627ae7dd3ba2feb727 (patch) | |
| tree | 536ce6ee456f2306bb0346a51ede0a4aa64a8e63 /libs/surfaces/control_protocol/control_protocol.cc | |
| parent | 9bd274bfdee62c9cc0e5752d2a72027d2c732cd0 (diff) | |
the big Route structure refactor. !!!! THIS WILL ***NOT LOAD*** PRIOR 3.0 or 2.X SESSIONS !!!! BREAKAGE IS EXPECTED !!!! IF YOU HAVE AND NEED A WORKING 3.0 DO **NOT** UPDATE. !!!! otherwise, update and enjoy the steadily emerging joys of this major reworking of ardour internals
git-svn-id: svn://localhost/ardour2/branches/3.0@5137 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/control_protocol/control_protocol.cc')
| -rw-r--r-- | libs/surfaces/control_protocol/control_protocol.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libs/surfaces/control_protocol/control_protocol.cc b/libs/surfaces/control_protocol/control_protocol.cc index f95aadb2b8..2d59912dc8 100644 --- a/libs/surfaces/control_protocol/control_protocol.cc +++ b/libs/surfaces/control_protocol/control_protocol.cc @@ -18,11 +18,12 @@ */ -#include <ardour/session.h> -#include <ardour/route.h> -#include <ardour/audio_track.h> -#include <ardour/meter.h> -#include <control_protocol/control_protocol.h> +#include "ardour/session.h" +#include "ardour/route.h" +#include "ardour/audio_track.h" +#include "ardour/meter.h" +#include "ardour/amp.h" +#include "control_protocol/control_protocol.h" using namespace ARDOUR; using namespace std; @@ -212,7 +213,7 @@ ControlProtocol::route_get_gain (uint32_t table_index) return 0.0f; } - return r->gain (); + return r->amp()->gain (); } void @@ -242,7 +243,7 @@ ControlProtocol::route_get_effective_gain (uint32_t table_index) return 0.0f; } - return r->effective_gain (); + return r->amp()->gain_control()->get_value(); } |