diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-19 14:38:46 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-19 14:38:46 +0000 |
| commit | 6f8cd634501efd70711b148b4ac0e0ce2aa5cc95 (patch) | |
| tree | 07df4b771792ec9a0b8ba7c8c01db0234f1efe22 /libs/surfaces | |
| parent | 60f588f21d6ad62335d72e8dc682abf8859107ea (diff) | |
chris goddard's region list patch; port 2.X marker drag/move changes to 3.0; compilation fixes-post-evoral
git-svn-id: svn://localhost/ardour2/branches/3.0@3760 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/generic_midi/SConscript | 1 | ||||
| -rw-r--r-- | libs/surfaces/mackie/SConscript | 1 | ||||
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 2 | ||||
| -rw-r--r-- | libs/surfaces/mackie/route_signal.cc | 2 | ||||
| -rw-r--r-- | libs/surfaces/powermate/SConscript | 1 | ||||
| -rw-r--r-- | libs/surfaces/tranzport/SConscript | 1 |
6 files changed, 6 insertions, 2 deletions
diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript index e3e62e7402..d4c9e92214 100644 --- a/libs/surfaces/generic_midi/SConscript +++ b/libs/surfaces/generic_midi/SConscript @@ -33,6 +33,7 @@ genericmidi.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"") genericmidi.Append(CPPPATH = libraries['jack'].get('CPPPATH', [])) genericmidi.Merge ([ + libraries['evoral'], libraries['ardour'], libraries['ardour_cp'], libraries['sndfile'], diff --git a/libs/surfaces/mackie/SConscript b/libs/surfaces/mackie/SConscript index 143ebc9856..c19d145c73 100644 --- a/libs/surfaces/mackie/SConscript +++ b/libs/surfaces/mackie/SConscript @@ -47,6 +47,7 @@ mackie.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"") mackie.Append(CPPPATH = libraries['jack'].get('CPPPATH', [])) mackie.Merge ([ + libraries['evoral'], libraries['ardour'], libraries['ardour_cp'], libraries['sigc2'], diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index 5ef28d4549..4558dc641c 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -1019,7 +1019,7 @@ void MackieControlProtocol::notify_panner_changed( RouteSignal * route_signal ) // TODO handle plugin automation polling void MackieControlProtocol::update_automation( RouteSignal & rs ) { - ARDOUR::AutoState gain_state = rs.route().gain_control()->list()->automation_state(); + ARDOUR::AutoState gain_state = rs.route().gain_control()->alist()->automation_state(); if ( gain_state == Touch || gain_state == Play ) { notify_gain_changed( &rs ); diff --git a/libs/surfaces/mackie/route_signal.cc b/libs/surfaces/mackie/route_signal.cc index b01b5e0cf5..adaeadd805 100644 --- a/libs/surfaces/mackie/route_signal.cc +++ b/libs/surfaces/mackie/route_signal.cc @@ -37,7 +37,7 @@ void RouteSignal::connect() _mute_changed_connection = _route.mute_control()->Changed.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_mute_changed ), this ) ); if ( _strip.has_gain() ) - _gain_changed_connection = _route.control(ARDOUR::GainAutomation)->Changed.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_gain_changed ), this ) ); + _gain_changed_connection = _route.gain_control()->Changed.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_gain_changed ), this ) ); _name_changed_connection = _route.NameChanged.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_name_changed ), this ) ); diff --git a/libs/surfaces/powermate/SConscript b/libs/surfaces/powermate/SConscript index c1a79fe955..3e01e2042b 100644 --- a/libs/surfaces/powermate/SConscript +++ b/libs/surfaces/powermate/SConscript @@ -31,6 +31,7 @@ powermate.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"") powermate.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"") powermate.Merge ([ + libraries['evoral'], libraries['ardour'], libraries['ardour_cp'], libraries['sigc2'], diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript index ff48eb64e3..31630fb2e0 100644 --- a/libs/surfaces/tranzport/SConscript +++ b/libs/surfaces/tranzport/SConscript @@ -55,6 +55,7 @@ tranzport.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"") tranzport.Append(CPPPATH = libraries['jack'].get('CPPPATH', [])) tranzport.Merge ([ + libraries['evoral'], libraries['ardour'], libraries['ardour_cp'], libraries['sigc2'], |