From 40e84ba67cb7ae2b9a3b02889ec5c80ada639f85 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Fri, 27 Nov 2020 17:12:51 +0100
Subject: Fix warnings in Jack DBus driver

---
 src/JackDbusDriver.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/JackDbusDriver.cpp')

diff --git a/src/JackDbusDriver.cpp b/src/JackDbusDriver.cpp
index 4d2023e..0646b4d 100644
--- a/src/JackDbusDriver.cpp
+++ b/src/JackDbusDriver.cpp
@@ -52,7 +52,7 @@
 
 JackDriver::JackDriver(Patchage* app)
     : _app(app)
-    , _dbus_connection(0)
+    , _dbus_connection(nullptr)
     , _max_dsp_load(0)
     , _server_responding(false)
     , _server_started(false)
@@ -1080,7 +1080,7 @@ JackDriver::is_realtime() const
 	return realtime;
 }
 
-size_t
+uint32_t
 JackDriver::get_xruns()
 {
 	DBusMessage*  reply_ptr;
@@ -1133,8 +1133,8 @@ JackDriver::reset_xruns()
 float
 JackDriver::get_max_dsp_load()
 {
-	DBusMessage* reply_ptr;
-	double       load;
+	DBusMessage* reply_ptr = nullptr;
+	double       load      = 0.0;
 
 	if (_server_responding && !_server_started) {
 		return 0.0;
@@ -1163,8 +1163,8 @@ JackDriver::get_max_dsp_load()
 
 	load /= 100.0; // convert from percent to [0..1]
 
-	if (load > _max_dsp_load) {
-		_max_dsp_load = load;
+	if (load > static_cast<double>(_max_dsp_load)) {
+		_max_dsp_load = static_cast<float>(load);
 	}
 
 	return _max_dsp_load;
-- 
cgit v1.2.1