diff options
| author | David Robillard <d@drobilla.net> | 2006-11-19 16:45:16 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-11-19 16:45:16 +0000 |
| commit | ef6b25432d9c46d71b08c0f7d5f2686df428c4e8 (patch) | |
| tree | 9b30d87b6670aadce365c9b112321dd674a0bab4 /libs/surfaces | |
| parent | af105afe6cde5b0088647cea7d5e4e3314f8478b (diff) | |
Merged with trunk R1141
git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/control_protocol/SConscript | 1 | ||||
| -rw-r--r-- | libs/surfaces/control_protocol/basic_ui.cc | 4 | ||||
| -rw-r--r-- | libs/surfaces/tranzport/tranzport_control_protocol.cc | 10 |
3 files changed, 12 insertions, 3 deletions
diff --git a/libs/surfaces/control_protocol/SConscript b/libs/surfaces/control_protocol/SConscript index ce59b1c67c..88aeeda376 100644 --- a/libs/surfaces/control_protocol/SConscript +++ b/libs/surfaces/control_protocol/SConscript @@ -33,6 +33,7 @@ cp.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"") cp.Merge ([ libraries['ardour'], + libraries['sndfile-ardour'], libraries['sigc2'], libraries['pbd'], libraries['midi++2'], diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc index 07e000ab20..e6642d3394 100644 --- a/libs/surfaces/control_protocol/basic_ui.cc +++ b/libs/surfaces/control_protocol/basic_ui.cc @@ -55,7 +55,7 @@ BasicUI::register_thread (std::string name) void BasicUI::loop_toggle () { - if (Config->get_auto_loop()) { + if (session->get_play_loop()) { session->request_play_loop (false); } else { session->request_play_loop (true); @@ -107,7 +107,7 @@ BasicUI::transport_play (bool from_last_start) { bool rolling = session->transport_rolling (); - if (Config->get_auto_loop()) { + if (session->get_play_loop()) { session->request_play_loop (false); } diff --git a/libs/surfaces/tranzport/tranzport_control_protocol.cc b/libs/surfaces/tranzport/tranzport_control_protocol.cc index 2e2d943244..ea85a32a77 100644 --- a/libs/surfaces/tranzport/tranzport_control_protocol.cc +++ b/libs/surfaces/tranzport/tranzport_control_protocol.cc @@ -718,7 +718,7 @@ TranzportControlProtocol::update_state () /* global */ - if (Config->get_auto_loop()) { + if (session->get_play_loop()) { pending_lights[LightLoop] = true; } else { pending_lights[LightLoop] = false; @@ -760,6 +760,14 @@ TranzportControlProtocol::update_state () } } + if (pending_lights[LightTrackrec] != lights[LightTrackrec]) { + if (pending_lights[LightTrackrec]) { + light_on (LightTrackrec); + } else { + light_off (LightTrackrec); + } + } + if (pending_lights[LightTrackmute] != lights[LightTrackmute]) { if (pending_lights[LightTrackmute]) { light_on (LightTrackmute); |