From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Fri, 18 Jan 2019 20:45:00 +0000 (+0100)
Subject: Fix some Clang 7 warnings.
X-Git-Tag: 1.8.2~6
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4b84fc30175a4dfb56a25ba0b2f9b88ab54cfe7d;p=nageru

Fix some Clang 7 warnings.
---

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<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 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<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 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<MIDIDevice::LightKey, uint8_t> *active_lights);
 
 	std::atomic<bool> should_quit{false};
-	int should_quit_fd;
 
 	std::atomic<bool> has_peaked[MAX_BUSES] {{ false }};