From 4b84fc30175a4dfb56a25ba0b2f9b88ab54cfe7d Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Fri, 18 Jan 2019 21:45:00 +0100 Subject: [PATCH] Fix some Clang 7 warnings. --- futatabi/export.cpp | 2 +- futatabi/midi_mapper.h | 1 - nageru/midi_mapper.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/futatabi/export.cpp b/futatabi/export.cpp index 50fc950..d513cf0 100644 --- a/futatabi/export.cpp +++ b/futatabi/export.cpp @@ -237,7 +237,7 @@ void export_interpolated_clip(const string &filename, const vector &clips) player.set_done_callback([&done_promise] { done_promise.set_value(); }); - player.set_progress_callback([¤t_value, &clips, total_length](const std::map &player_progress, double time_remaining) { + player.set_progress_callback([¤t_value, total_length](const std::map &player_progress, double time_remaining) { current_value = 1.0 - time_remaining / total_length; }); player.play(clips_with_id); diff --git a/futatabi/midi_mapper.h b/futatabi/midi_mapper.h index 98ea611..b3549fe 100644 --- a/futatabi/midi_mapper.h +++ b/futatabi/midi_mapper.h @@ -102,7 +102,6 @@ private: void update_lights_lock_held(); std::atomic should_quit{false}; - int should_quit_fd; mutable std::mutex mu; ControllerReceiver *receiver; // Under . diff --git a/nageru/midi_mapper.h b/nageru/midi_mapper.h index 9630780..dd5c7ab 100644 --- a/nageru/midi_mapper.h +++ b/nageru/midi_mapper.h @@ -112,7 +112,6 @@ private: void activate_lights_all_buses(int field_number, std::map *active_lights); std::atomic should_quit{false}; - int should_quit_fd; std::atomic has_peaked[MAX_BUSES] {{ false }}; -- 2.39.2