summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2018-09-06 19:28:45 +0200
committerRobin Gareus <robin@gareus.org>2018-09-06 19:28:45 +0200
commite1c58aad6089d7eff31ab1b1e8d73aa1eb184c71 (patch)
treee052f7567020342dde7431a7800d822cb2dbf62e
parenteff7a51de1d9044af01f5a47779360ff9977cb2d (diff)
Fix an invalid conversion from 'int' to non-scalar.
-rw-r--r--libs/surfaces/launch_control_xl/controllers.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/libs/surfaces/launch_control_xl/controllers.cc b/libs/surfaces/launch_control_xl/controllers.cc
index b8a72272a3..dfdfa540d1 100644
--- a/libs/surfaces/launch_control_xl/controllers.cc
+++ b/libs/surfaces/launch_control_xl/controllers.cc
@@ -270,14 +270,11 @@ LaunchControlXL::track_button_by_range(uint8_t n, uint8_t first, uint8_t middle)
b = nn_note_button_map.find (middle + n - 4);
}
- boost::shared_ptr<TrackButton> button = 0;
-
if (b != nn_note_button_map.end()) {
- button = boost::dynamic_pointer_cast<TrackButton> (b->second);
+ return (b->second);
}
- return button;
-
+ return boost::shared_ptr<LaunchControlXL::TrackButton>();
}
void
@@ -325,8 +322,6 @@ LaunchControlXL::button_track_focus(uint8_t n)
}
}
-
-
boost::shared_ptr<AutomationControl>
LaunchControlXL::get_ac_by_state(uint8_t n) {
boost::shared_ptr<AutomationControl> ac;