projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h
[ardour.git]
/
libs
/
surfaces
/
mackie
/
mcp_buttons.cc
diff --git
a/libs/surfaces/mackie/mcp_buttons.cc
b/libs/surfaces/mackie/mcp_buttons.cc
index 1869d5e2317dba4114f866723d1983a40ce84b4b..4733327d2c4ff0bb672474fa631f30f8a81947c7 100644
(file)
--- a/
libs/surfaces/mackie/mcp_buttons.cc
+++ b/
libs/surfaces/mackie/mcp_buttons.cc
@@
-32,7
+32,7
@@
#include "surface.h"
#include "fader.h"
#include "surface.h"
#include "fader.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
/* handlers for all buttons, broken into a separate file to avoid clutter in
* mackie_control_protocol.cc
/* handlers for all buttons, broken into a separate file to avoid clutter in
* mackie_control_protocol.cc
@@
-102,7
+102,7
@@
MackieControlProtocol::left_press (Button &)
return none;
}
return none;
}
- Sorted sorted = get_sorted_
rout
es();
+ Sorted sorted = get_sorted_
stripabl
es();
uint32_t strip_cnt = n_strips ();
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("bank left with current initial = %1 nstrips = %2 tracks/busses = %3\n",
uint32_t strip_cnt = n_strips ();
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("bank left with current initial = %1 nstrips = %2 tracks/busses = %3\n",
@@
-130,7
+130,7
@@
MackieControlProtocol::right_press (Button &)
return none;
}
return none;
}
- Sorted sorted = get_sorted_
rout
es();
+ Sorted sorted = get_sorted_
stripabl
es();
uint32_t strip_cnt = n_strips();
uint32_t route_cnt = sorted.size();
uint32_t max_bank = route_cnt / strip_cnt * strip_cnt;
uint32_t strip_cnt = n_strips();
uint32_t route_cnt = sorted.size();
uint32_t max_bank = route_cnt / strip_cnt * strip_cnt;
@@
-270,7
+270,7
@@
MackieControlProtocol::channel_left_press (Button &)
if (_subview_mode != None) {
return none;
}
if (_subview_mode != None) {
return none;
}
- Sorted sorted = get_sorted_
rout
es();
+ Sorted sorted = get_sorted_
stripabl
es();
if (sorted.size() > n_strips()) {
prev_track();
return on;
if (sorted.size() > n_strips()) {
prev_track();
return on;
@@
-291,7
+291,7
@@
MackieControlProtocol::channel_right_press (Button &)
if (_subview_mode != None) {
return none;
}
if (_subview_mode != None) {
return none;
}
- Sorted sorted = get_sorted_
rout
es();
+ Sorted sorted = get_sorted_
stripabl
es();
if (sorted.size() > n_strips()) {
next_track();
return on;
if (sorted.size() > n_strips()) {
next_track();
return on;
@@
-383,7
+383,7
@@
MackieControlProtocol::save_press (Button &)
} else {
save_state ();
}
} else {
save_state ();
}
-
+
return none;
}
return none;
}
@@
-703,7
+703,7
@@
LedState
MackieControlProtocol::pan_press (Button &)
{
/* XXX eventually pan may have its own subview mode */
MackieControlProtocol::pan_press (Button &)
{
/* XXX eventually pan may have its own subview mode */
- set_subview_mode (MackieControlProtocol::None, boost::shared_ptr<
Rout
e>());
+ set_subview_mode (MackieControlProtocol::None, boost::shared_ptr<
Stripabl
e>());
return none;
}
LedState
return none;
}
LedState
@@
-726,7
+726,7
@@
MackieControlProtocol::plugin_release (Button &)
LedState
MackieControlProtocol::eq_press (Button &)
{
LedState
MackieControlProtocol::eq_press (Button &)
{
- set_subview_mode (EQ, first_selected_
rout
e ());
+ set_subview_mode (EQ, first_selected_
stripabl
e ());
return none; /* led state handled by set_subview_mode() */
}
return none; /* led state handled by set_subview_mode() */
}
@@
-738,7
+738,7
@@
MackieControlProtocol::eq_release (Button &)
LedState
MackieControlProtocol::dyn_press (Button &)
{
LedState
MackieControlProtocol::dyn_press (Button &)
{
- set_subview_mode (Dynamics, first_selected_
rout
e ());
+ set_subview_mode (Dynamics, first_selected_
stripabl
e ());
return none; /* led state handled by set_subview_mode() */
}
return none; /* led state handled by set_subview_mode() */
}
@@
-794,7
+794,7
@@
MackieControlProtocol::cancel_press (Button &)
if (main_modifier_state() & MODIFIER_SHIFT) {
access_action ("Transport/ToggleExternalSync");
} else {
if (main_modifier_state() & MODIFIER_SHIFT) {
access_action ("Transport/ToggleExternalSync");
} else {
- access_action ("
Editor/e
scape");
+ access_action ("
Main/E
scape");
}
return none;
}
}
return none;
}
@@
-886,15
+886,9
@@
MackieControlProtocol::clearsolo_press (Mackie::Button&)
access_action ("Editor/set-session-from-edit-range");
return none;
}
access_action ("Editor/set-session-from-edit-range");
return none;
}
-
- if (session) {
- if (session->soloing()) {
- session->set_solo (session->get_routes(), false);
- } else if (session->listening()) {
- session->set_listen (session->get_routes(), false);
- }
- session->clear_all_solo_state (session->get_routes()); // safeguard, ideally this won't do anything, check the log-window
+ if (session) {
+ session->cancel_all_solo ();
}
return none;
}
}
return none;
}
@@
-909,7
+903,7
@@
MackieControlProtocol::clearsolo_release (Mackie::Button&)
Mackie::LedState
MackieControlProtocol::track_press (Mackie::Button&)
{
Mackie::LedState
MackieControlProtocol::track_press (Mackie::Button&)
{
- set_subview_mode (TrackView, first_selected_
rout
e());
+ set_subview_mode (TrackView, first_selected_
stripabl
e());
return none;
}
Mackie::LedState
return none;
}
Mackie::LedState
@@
-920,7
+914,7
@@
MackieControlProtocol::track_release (Mackie::Button&)
Mackie::LedState
MackieControlProtocol::send_press (Mackie::Button&)
{
Mackie::LedState
MackieControlProtocol::send_press (Mackie::Button&)
{
- set_subview_mode (Sends, first_selected_
rout
e());
+ set_subview_mode (Sends, first_selected_
stripabl
e());
return none; /* led state handled by set_subview_mode() */
}
Mackie::LedState
return none; /* led state handled by set_subview_mode() */
}
Mackie::LedState
@@
-1063,7
+1057,7
@@
MackieControlProtocol::nudge_release (Mackie::Button&)
_modifier_state &= ~MODIFIER_NUDGE;
/* XXX these action names are stupid, because the action can affect
_modifier_state &= ~MODIFIER_NUDGE;
/* XXX these action names are stupid, because the action can affect
- * regions, markers or the playhead depending on selection state.
+ * regions, markers or the playhead depending on selection state.
*/
if (main_modifier_state() & MODIFIER_SHIFT) {
*/
if (main_modifier_state() & MODIFIER_SHIFT) {