summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTérence Clastres <t.clastres@gmail.com>2018-08-13 18:52:18 +0200
committerPaul Davis <paul@linuxaudiosystems.com>2018-08-15 18:48:32 -0400
commit7c6c8ac2705de04fff7e6c90ec38a8e442c53d35 (patch)
treec4b8dc81540a9b80f5a4d650876a43ec957efb2d
parent928a6ef4beca221c88ffc7481f14d2428ede7cdf (diff)
Attempt to make some function's names more explicit
-rw-r--r--libs/surfaces/launch_control_xl/controllers.cc6
-rw-r--r--libs/surfaces/launch_control_xl/launch_control_xl.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/libs/surfaces/launch_control_xl/controllers.cc b/libs/surfaces/launch_control_xl/controllers.cc
index 65608e9d19..21ab491848 100644
--- a/libs/surfaces/launch_control_xl/controllers.cc
+++ b/libs/surfaces/launch_control_xl/controllers.cc
@@ -260,7 +260,7 @@ LaunchControlXL::fader_name_by_id (FaderID id)
}
LaunchControlXL::TrackButton*
-LaunchControlXL::track_button_by_number(uint8_t n, uint8_t first, uint8_t middle)
+LaunchControlXL::track_button_by_range(uint8_t n, uint8_t first, uint8_t middle)
{
NNNoteButtonMap::iterator b;
if ( n < 4) {
@@ -282,7 +282,7 @@ LaunchControlXL::track_button_by_number(uint8_t n, uint8_t first, uint8_t middle
void
LaunchControlXL::button_track_focus(uint8_t n)
{
- TrackButton* b = focus_button_by_number(n);
+ TrackButton* b = focus_button_by_collumn(n);
if (!b) {
return;
@@ -328,7 +328,7 @@ LaunchControlXL::get_ac_by_state(uint8_t n) {
void
LaunchControlXL::update_track_control_led(uint8_t n)
{
- TrackButton* b = control_button_by_number(n);
+ TrackButton* b = control_button_by_collumn(n);
if (!b) {
return;
diff --git a/libs/surfaces/launch_control_xl/launch_control_xl.h b/libs/surfaces/launch_control_xl/launch_control_xl.h
index 9d7112a8eb..3b645f2375 100644
--- a/libs/surfaces/launch_control_xl/launch_control_xl.h
+++ b/libs/surfaces/launch_control_xl/launch_control_xl.h
@@ -449,9 +449,9 @@ private:
/* Button methods */
- TrackButton* track_button_by_number(uint8_t n, uint8_t first, uint8_t middle);
- TrackButton* focus_button_by_number(uint8_t n) { return track_button_by_number(n, 41, 57) ; }
- TrackButton* control_button_by_number(uint8_t n) { return track_button_by_number(n, 73, 89) ; }
+ TrackButton* track_button_by_range(uint8_t n, uint8_t first, uint8_t middle);
+ TrackButton* focus_button_by_collumn(uint8_t col) { return track_button_by_range(col, 41, 57) ; }
+ TrackButton* control_button_by_collumn(uint8_t col) { return track_button_by_range(col, 73, 89) ; }
void button_device();