From 0b4a8e76d0137146ac89527892eac7e64d89f217 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 17 Jul 2024 09:14:31 -0400
Subject: Fix narrowing conversions

---
 src/AlsaDriver.cpp | 10 +++++-----
 src/Patchage.cpp   | 10 ++++++----
 src/Reactor.cpp    |  5 +++--
 3 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/AlsaDriver.cpp b/src/AlsaDriver.cpp
index 1842598..7671402 100644
--- a/src/AlsaDriver.cpp
+++ b/src/AlsaDriver.cpp
@@ -93,7 +93,7 @@ addr_to_id(const snd_seq_addr_t& addr, const bool is_input)
 SignalDirection
 port_direction(const snd_seq_port_info_t* const pinfo)
 {
-  const int caps = snd_seq_port_info_get_capability(pinfo);
+  const unsigned caps = snd_seq_port_info_get_capability(pinfo);
 
   if ((caps & SND_SEQ_PORT_CAP_READ) && (caps & SND_SEQ_PORT_CAP_WRITE)) {
     return SignalDirection::duplex;
@@ -119,7 +119,7 @@ client_info(snd_seq_client_info_t* const cinfo)
 PortInfo
 port_info(const snd_seq_port_info_t* const pinfo)
 {
-  const int type = snd_seq_port_info_get_type(pinfo);
+  const unsigned type = snd_seq_port_info_get_type(pinfo);
 
   return {snd_seq_port_info_get_name(pinfo),
           PortType::alsa_midi,
@@ -281,8 +281,8 @@ AlsaDriver::ignore(const snd_seq_addr_t& addr, bool add)
   snd_seq_port_info_set_port(pinfo, addr.port);
   snd_seq_get_any_port_info(_seq, addr.client, addr.port, pinfo);
 
-  const int type = snd_seq_port_info_get_type(pinfo);
-  const int caps = snd_seq_port_info_get_capability(pinfo);
+  const unsigned type = snd_seq_port_info_get_type(pinfo);
+  const unsigned caps = snd_seq_port_info_get_capability(pinfo);
 
   if (caps & SND_SEQ_PORT_CAP_NO_EXPORT) {
     _ignored.insert(addr);
@@ -442,7 +442,7 @@ AlsaDriver::_refresh_main()
     return;
   }
 
-  int caps = 0;
+  unsigned caps = 0U;
 
   snd_seq_client_info_t* cinfo = nullptr;
   snd_seq_client_info_alloca(&cinfo);
diff --git a/src/Patchage.cpp b/src/Patchage.cpp
index d4026a3..94d580e 100644
--- a/src/Patchage.cpp
+++ b/src/Patchage.cpp
@@ -383,7 +383,8 @@ Patchage::Patchage(Options options)
   _main_win->present();
 
   // Set the default font size based on the current GUI environment
-  _conf.set<setting::FontSize>(_canvas->get_default_font_size());
+  _conf.set<setting::FontSize>(
+    static_cast<float>(_canvas->get_default_font_size()));
 
   // Load configuration file (but do not apply it yet, see below)
   _conf.load();
@@ -526,8 +527,8 @@ Patchage::update_toolbar()
                                             latency_ms));
 
       _latency_label->set_visible(true);
-      _buf_size_combo->set_active(
-        static_cast<int>(log2f(_drivers.jack()->buffer_size()) - 5));
+      _buf_size_combo->set_active(static_cast<int>(
+        log2f(static_cast<float>(_drivers.jack()->buffer_size())) - 5));
       updating = false;
       return;
     }
@@ -811,7 +812,8 @@ Patchage::on_messages_resized(Gtk::Allocation&)
 void
 Patchage::save()
 {
-  _conf.set<setting::Zoom>(_canvas->get_zoom()); // Can be changed by ganv
+  // Zoom can be changed by ganv
+  _conf.set<setting::Zoom>(static_cast<float>(_canvas->get_zoom()));
   _conf.save();
 }
 
diff --git a/src/Reactor.cpp b/src/Reactor.cpp
index 49cbe5a..7163539 100644
--- a/src/Reactor.cpp
+++ b/src/Reactor.cpp
@@ -137,7 +137,8 @@ Reactor::operator()(const action::Refresh&)
 void
 Reactor::operator()(const action::ResetFontSize&)
 {
-  _conf.set<setting::FontSize>(_canvas.get_default_font_size());
+  _conf.set<setting::FontSize>(
+    static_cast<float>(_canvas.get_default_font_size()));
 }
 
 void
@@ -158,7 +159,7 @@ void
 Reactor::operator()(const action::ZoomFull&)
 {
   _canvas.zoom_full();
-  _conf.set<setting::Zoom>(_canvas.get_zoom());
+  _conf.set<setting::Zoom>(static_cast<float>(_canvas.get_zoom()));
 }
 
 void
-- 
cgit v1.2.1