diff options
| -rw-r--r-- | src/JackDbusDriver.cpp | 12 | ||||
| -rw-r--r-- | src/JackDbusDriver.hpp | 8 | ||||
| -rw-r--r-- | wscript | 1 |
3 files changed, 11 insertions, 10 deletions
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; diff --git a/src/JackDbusDriver.hpp b/src/JackDbusDriver.hpp index 9015907..8504f68 100644 --- a/src/JackDbusDriver.hpp +++ b/src/JackDbusDriver.hpp @@ -52,10 +52,10 @@ public: bool disconnect(PatchagePort* src, PatchagePort* dst); - size_t get_xruns(); - void reset_xruns(); - float get_max_dsp_load(); - void reset_max_dsp_load(); + uint32_t get_xruns(); + void reset_xruns(); + float get_max_dsp_load(); + void reset_max_dsp_load(); float sample_rate(); jack_nframes_t buffer_size(); @@ -79,6 +79,7 @@ def configure(conf): '-Wno-pedantic', '-Wno-shadow', '-Wno-stack-protector', + '-Wno-suggest-attribute=noreturn', '-Wno-unused-parameter', ], }) |