Fix some Clang 7 warnings.

diff --git a/futatabi/export.cpp b/futatabi/export.cpp
index 50fc950bbd2fa8ead59a365c28375b9be66ac278..d513cf0dacf5a6f6f74ff9cbe14ffde737cee615 100644 (file)
--- a/futatabi/export.cpp
+++ b/futatabi/export.cpp
@@ -237,7 +237,7 @@ void export_interpolated_clip(const string &filename, const vector<Clip> &clips)
        player.set_done_callback([&done_promise] {
                done_promise.set_value();
        });
-       player.set_progress_callback([&current_value, &clips, total_length](const std::map<uint64_t, double> &player_progress, double time_remaining) {
+       player.set_progress_callback([&current_value, total_length](const std::map<uint64_t, double> &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 98ea6113ab6a7435f5c77c59c17b425bcbcb2de4..b3549feffe54e15cdfa068beb12eb12ab325f455 100644 (file)
--- a/futatabi/midi_mapper.h
+++ b/futatabi/midi_mapper.h
@@ -102,7 +102,6 @@ private:
        void update_lights_lock_held();
 
        std::atomic<bool> should_quit{false};
-       int should_quit_fd;
 
        mutable std::mutex mu;
        ControllerReceiver *receiver;  // Under <mu>.

diff --git a/nageru/midi_mapper.h b/nageru/midi_mapper.h
index 9630780dfaee51c3e63759daeb7d7c4e79666c85..dd5c7ab33a7bf957adf3da5d12264f0a4f11c39b 100644 (file)
--- 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<MIDIDevice::LightKey, uint8_t> *active_lights);
 
        std::atomic<bool> should_quit{false};
-       int should_quit_fd;
 
        std::atomic<bool> has_peaked[MAX_BUSES] {{ false }};