20 files changed, 64 insertions, 64 deletions
diff --git a/al/effects/chorus.cpp b/al/effects/chorus.cpp
index a05ec10b..eec67d46 100644
--- a/al/effects/chorus.cpp
+++ b/al/effects/chorus.cpp
@@ -149,7 +149,7 @@ void Chorus_getParamf(const EffectProps *props, ALenum param, float *val)
 void Chorus_getParamfv(const EffectProps *props, ALenum param, float *vals)
 { Chorus_getParamf(props, param, vals); }
 
-const EffectProps genDefaultChorusProps() noexcept
+EffectProps genDefaultChorusProps() noexcept
 {
     EffectProps props{};
     props.Chorus.Waveform = *WaveformFromEnum(AL_CHORUS_DEFAULT_WAVEFORM);
diff --git a/alc/alc.cpp b/alc/alc.cpp
index a7c36d5c..bf428e07 100644
--- a/alc/alc.cpp
+++ b/alc/alc.cpp
@@ -1621,7 +1621,7 @@ std::unique_ptr<Compressor> CreateDeviceLimiter(const ALCdevice *device, const f
  * to jump forward or back. Must not be called while the device is running/
  * mixing.
  */
-static inline void UpdateClockBase(ALCdevice *device)
+inline void UpdateClockBase(ALCdevice *device)
 {
     IncrementRef(device->MixCount);
     device->ClockBase += nanoseconds{seconds{device->SamplesDone}} / device->Frequency;
diff --git a/alc/alconfig.cpp b/alc/alconfig.cpp
index 14b2580d..b0544b89 100644
--- a/alc/alconfig.cpp
+++ b/alc/alconfig.cpp
@@ -140,7 +140,7 @@ void LoadConfigFromFile(std::istream &f)
 
         if(buffer[0] == '[')
         {
-            char *line{&buffer[0]};
+            auto line = const_cast<char*>(buffer.data());
             char *section = line+1;
             char *endsection;
 
diff --git a/alc/alu.cpp b/alc/alu.cpp
index cb732738..a171067a 100644
--- a/alc/alu.cpp
+++ b/alc/alu.cpp
@@ -866,7 +866,7 @@ void CalcPanningAndFilters(Voice *voice, const float xpos, const float ypos, con
          * scaling.
          */
         std::transform(coeffs.begin(), coeffs.end(), coeffs.begin(),
-            std::bind(std::multiplies<float>{}, _1, (1.0f-coverage)*scales[0]));
+            [coverage, &scales](auto a){ return a * ((1.0f-coverage)*scales[0]); });
 
         if(!(coverage > 0.0f))
         {
@@ -1966,7 +1966,7 @@ void ApplyDistanceComp(const al::span<FloatBufferLine> Samples, const size_t Sam
             auto delay_start = std::swap_ranges(inout, inout_end, distbuf);
             std::rotate(distbuf, delay_start, distbuf + base);
         }
-        std::transform(inout, inout_end, inout, std::bind(std::multiplies<float>{}, _1, gain));
+        std::transform(inout, inout_end, inout, [gain](auto a){ return a * gain; });
     }
 }
 
diff --git a/alc/backends/alsa.cpp b/alc/backends/alsa.cpp
index e495a34d..d620a83c 100644
--- a/alc/backends/alsa.cpp
+++ b/alc/backends/alsa.cpp
@@ -132,7 +132,7 @@ constexpr char alsaDevice[] = "ALSA Default";
     MAGIC(snd_card_next);                                                     \
     MAGIC(snd_config_update_free_global)
 
-static void *alsa_handle;
+void *alsa_handle;
 #define MAKE_FUNC(f) decltype(f) * p##f
 ALSA_FUNCS(MAKE_FUNC);
 #undef MAKE_FUNC
@@ -330,7 +330,7 @@ al::vector<DevMap> probe_devices(snd_pcm_stream_t stream)
             ConfigValueStr(nullptr, "alsa", name.c_str()).value_or(main_prefix)};
 
         int dev{-1};
-        while(1)
+        while(true)
         {
             if(snd_ctl_pcm_next_device(handle, &dev) < 0)
                 ERR("snd_ctl_pcm_next_device failed\n");
@@ -692,7 +692,7 @@ bool AlsaPlayback::reset()
         break;
     }
 
-    bool allowmmap{!!GetConfigValueBool(mDevice->DeviceName.c_str(), "alsa", "mmap", 1)};
+    bool allowmmap{!!GetConfigValueBool(mDevice->DeviceName.c_str(), "alsa", "mmap", true)};
     uint periodLen{static_cast<uint>(mDevice->UpdateSize * 1000000_u64 / mDevice->Frequency)};
     uint bufferLen{static_cast<uint>(mDevice->BufferSize * 1000000_u64 / mDevice->Frequency)};
     uint rate{mDevice->Frequency};
@@ -750,7 +750,7 @@ bool AlsaPlayback::reset()
         else mDevice->FmtChans = DevFmtStereo;
     }
     /* set rate (implicitly constrains period/buffer parameters) */
-    if(!GetConfigValueBool(mDevice->DeviceName.c_str(), "alsa", "allow-resampler", 0)
+    if(!GetConfigValueBool(mDevice->DeviceName.c_str(), "alsa", "allow-resampler", false)
         || !mDevice->Flags.test(FrequencyRequest))
     {
         if(snd_pcm_hw_params_set_rate_resample(mPcmHandle, hp.get(), 0) < 0)
diff --git a/alc/backends/jack.cpp b/alc/backends/jack.cpp
index 419eb7e7..95796862 100644
--- a/alc/backends/jack.cpp
+++ b/alc/backends/jack.cpp
@@ -497,7 +497,7 @@ void JackPlayback::open(const char *name)
         mPortPattern = iter->mPattern;
     }
 
-    mRTMixing = GetConfigValueBool(name, "jack", "rt-mix", 1);
+    mRTMixing = GetConfigValueBool(name, "jack", "rt-mix", true);
     jack_set_process_callback(mClient,
         mRTMixing ? &JackPlayback::processRtC : &JackPlayback::processC, this);
 
diff --git a/alc/backends/pulseaudio.cpp b/alc/backends/pulseaudio.cpp
index 3b235c78..9b7e2c08 100644
--- a/alc/backends/pulseaudio.cpp
+++ b/alc/backends/pulseaudio.cpp
@@ -776,7 +776,7 @@ void PulsePlayback::open(const char *name)
 
     pa_stream_flags_t flags{PA_STREAM_START_CORKED | PA_STREAM_FIX_FORMAT | PA_STREAM_FIX_RATE |
         PA_STREAM_FIX_CHANNELS};
-    if(!GetConfigValueBool(nullptr, "pulse", "allow-moves", 1))
+    if(!GetConfigValueBool(nullptr, "pulse", "allow-moves", true))
         flags |= PA_STREAM_DONT_MOVE;
 
     pa_sample_spec spec{};
@@ -834,9 +834,9 @@ bool PulsePlayback::reset()
 
     pa_stream_flags_t flags{PA_STREAM_START_CORKED | PA_STREAM_INTERPOLATE_TIMING |
         PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_EARLY_REQUESTS};
-    if(!GetConfigValueBool(nullptr, "pulse", "allow-moves", 1))
+    if(!GetConfigValueBool(nullptr, "pulse", "allow-moves", true))
         flags |= PA_STREAM_DONT_MOVE;
-    if(GetConfigValueBool(mDevice->DeviceName.c_str(), "pulse", "adjust-latency", 0))
+    if(GetConfigValueBool(mDevice->DeviceName.c_str(), "pulse", "adjust-latency", false))
     {
         /* ADJUST_LATENCY can't be specified with EARLY_REQUESTS, for some
          * reason. So if the user wants to adjust the overall device latency,
@@ -845,7 +845,7 @@ bool PulsePlayback::reset()
         flags &= ~PA_STREAM_EARLY_REQUESTS;
         flags |= PA_STREAM_ADJUST_LATENCY;
     }
-    if(GetConfigValueBool(mDevice->DeviceName.c_str(), "pulse", "fix-rate", 0)
+    if(GetConfigValueBool(mDevice->DeviceName.c_str(), "pulse", "fix-rate", false)
         || !mDevice->Flags.test(FrequencyRequest))
         flags |= PA_STREAM_FIX_RATE;
 
@@ -1190,7 +1190,7 @@ void PulseCapture::open(const char *name)
     mAttr.fragsize = minu(samples, 50*mDevice->Frequency/1000) * frame_size;
 
     pa_stream_flags_t flags{PA_STREAM_START_CORKED | PA_STREAM_ADJUST_LATENCY};
-    if(!GetConfigValueBool(nullptr, "pulse", "allow-moves", 1))
+    if(!GetConfigValueBool(nullptr, "pulse", "allow-moves", true))
         flags |= PA_STREAM_DONT_MOVE;
 
     TRACE("Connecting to \"%s\"\n", pulse_name ? pulse_name : "(default)");
diff --git a/alc/backends/wave.cpp b/alc/backends/wave.cpp
index f97f42f5..1b40640c 100644
--- a/alc/backends/wave.cpp
+++ b/alc/backends/wave.cpp
@@ -234,7 +234,7 @@ bool WaveBackend::reset()
     fseek(mFile, 0, SEEK_SET);
     clearerr(mFile);
 
-    if(GetConfigValueBool(nullptr, "wave", "bformat", 0))
+    if(GetConfigValueBool(nullptr, "wave", "bformat", false))
     {
         mDevice->FmtChans = DevFmtAmbi3D;
         mDevice->mAmbiOrder = 1;
diff --git a/alc/context.cpp b/alc/context.cpp
index f9aec221..b1b95321 100644
--- a/alc/context.cpp
+++ b/alc/context.cpp
@@ -230,7 +230,7 @@ bool ALCcontext::deinit()
          * given context.
          */
         std::copy_if(oldarray->begin(), oldarray->end(), newarray->begin(),
-            std::bind(std::not_equal_to<>{}, _1, this));
+            [this](auto a){ return a != this; });
 
         /* Store the new context array in the device. Wait for any current mix
          * to finish before deleting the old array.
diff --git a/alc/panning.cpp b/alc/panning.cpp
index 60b6cbf4..62d745f1 100644
--- a/alc/panning.cpp
+++ b/alc/panning.cpp
@@ -232,7 +232,7 @@ void InitNearFieldCtrl(ALCdevice *device, float ctrl_dist, uint order, bool is3d
     static const uint chans_per_order3d[MaxAmbiOrder+1]{ 1, 3, 5, 7 };
 
     /* NFC is only used when AvgSpeakerDist is greater than 0. */
-    if(!device->getConfigValueBool("decoder", "nfc", 0) || !(ctrl_dist > 0.0f))
+    if(!device->getConfigValueBool("decoder", "nfc", false) || !(ctrl_dist > 0.0f))
         return;
 
     device->AvgSpeakerDist = clampf(ctrl_dist, 0.1f, 10.0f);
@@ -252,7 +252,7 @@ void InitDistanceComp(ALCdevice *device, const al::span<const Channel> channels,
 {
     const float maxdist{std::accumulate(std::begin(dists), std::end(dists), 0.0f, maxf)};
 
-    if(!device->getConfigValueBool("decoder", "distance-comp", 1) || !(maxdist > 0.0f))
+    if(!device->getConfigValueBool("decoder", "distance-comp", true) || !(maxdist > 0.0f))
         return;
 
     const auto distSampleScale = static_cast<float>(device->Frequency) / SpeedOfSoundMetersPerSec;
@@ -339,7 +339,7 @@ DecoderView MakeDecoderView(ALCdevice *device, const AmbDecConf *conf,
 
     switch(conf->CoeffScale)
     {
-    case AmbDecScale::Unset: ASSUME(0); break;
+    case AmbDecScale::Unset: ASSUME(false); break;
     case AmbDecScale::N3D: decoder.mScaling = DevAmbiScaling::N3D; break;
     case AmbDecScale::SN3D: decoder.mScaling = DevAmbiScaling::SN3D; break;
     case AmbDecScale::FuMa: decoder.mScaling = DevAmbiScaling::FuMa; break;
@@ -1007,8 +1007,8 @@ void aluInitRenderer(ALCdevice *device, int hrtf_id, al::optional<StereoEncoding
         const bool stablize{device->RealOut.ChannelIndex[FrontCenter] != INVALID_CHANNEL_INDEX
             && device->RealOut.ChannelIndex[FrontLeft] != INVALID_CHANNEL_INDEX
             && device->RealOut.ChannelIndex[FrontRight] != INVALID_CHANNEL_INDEX
-            && device->getConfigValueBool(nullptr, "front-stablizer", 0) != 0};
-        const bool hqdec{device->getConfigValueBool("decoder", "hq-mode", 1) != 0};
+            && device->getConfigValueBool(nullptr, "front-stablizer", false) != 0};
+        const bool hqdec{device->getConfigValueBool("decoder", "hq-mode", true) != 0};
         InitPanning(device, hqdec, stablize, decoder);
         if(decoder)
         {
diff --git a/common/alcomplex.cpp b/common/alcomplex.cpp
index c4ff8fd9..2e3e0a60 100644
--- a/common/alcomplex.cpp
+++ b/common/alcomplex.cpp
@@ -158,7 +158,7 @@ void complex_hilbert(const al::span<std::complex<double>> buffer)
 
     *bufiter *= inverse_size; ++bufiter;
     bufiter = std::transform(bufiter, halfiter, bufiter,
-        std::bind(std::multiplies<>{}, _1, 2.0*inverse_size));
+        [inverse_size](auto a){ return a * (2.0 * inverse_size); });
     *bufiter *= inverse_size; ++bufiter;
 
     std::fill(bufiter, buffer.end(), std::complex<double>{});
diff --git a/core/ambdec.cpp b/core/ambdec.cpp
index 52a1df05..5e2de6af 100644
--- a/core/ambdec.cpp
+++ b/core/ambdec.cpp
@@ -53,7 +53,7 @@ al::optional<std::string> make_error(size_t linenum, const char *fmt, ...)
     auto &str = ret.emplace();
 
     str.resize(256);
-    int printed{std::snprintf(&str[0], str.length(), "Line %zu: ", linenum)};
+    int printed{std::snprintf(const_cast<char*>(str.data()), str.length(), "Line %zu: ", linenum)};
     if(printed < 0) printed = 0;
     auto plen = std::min(static_cast<size_t>(printed), str.length());
 
diff --git a/core/cpu_caps.cpp b/core/cpu_caps.cpp
index 103d2437..d4b4d86c 100644
--- a/core/cpu_caps.cpp
+++ b/core/cpu_caps.cpp
@@ -32,7 +32,7 @@ using reg_type = unsigned int;
 inline std::array<reg_type,4> get_cpuid(unsigned int f)
 {
     std::array<reg_type,4> ret{};
-    __get_cpuid(f, &ret[0], &ret[1], &ret[2], &ret[3]);
+    __get_cpuid(f, ret.data(), &ret[1], &ret[2], &ret[3]);
     return ret;
 }
 #define CAN_GET_CPUID
diff --git a/core/except.cpp b/core/except.cpp
index f3d80d59..ba4759a3 100644
--- a/core/except.cpp
+++ b/core/except.cpp
@@ -21,7 +21,7 @@ void base_exception::setMessage(const char* msg, std::va_list args)
     if(msglen > 0) [[likely]]
     {
         mMessage.resize(static_cast<size_t>(msglen)+1);
-        std::vsnprintf(&mMessage[0], mMessage.length(), msg, args2);
+        std::vsnprintf(const_cast<char*>(mMessage.data()), mMessage.length(), msg, args2);
         mMessage.pop_back();
     }
     va_end(args2);
diff --git a/core/hrtf.cpp b/core/hrtf.cpp
index 28179189..ec42cbf4 100644
--- a/core/hrtf.cpp
+++ b/core/hrtf.cpp
@@ -257,7 +257,7 @@ void HrtfStore::getCoeffs(float elevation, float azimuth, float distance, float
     delays[1] = fastf2u(d * float{1.0f/HrirDelayFracOne});
 
     /* Calculate the blended HRIR coefficients. */
-    float *coeffout{al::assume_aligned<16>(&coeffs[0][0])};
+    float *coeffout{al::assume_aligned<16>(coeffs[0].data())};
     coeffout[0] = PassthruCoeff * (1.0f-dirfact);
     coeffout[1] = PassthruCoeff * (1.0f-dirfact);
     std::fill_n(coeffout+2, size_t{HrirLength-1}*2, 0.0f);
diff --git a/core/mastering.cpp b/core/mastering.cpp
index a4f66fbb..88a0b5e0 100644
--- a/core/mastering.cpp
+++ b/core/mastering.cpp
@@ -66,7 +66,7 @@ float UpdateSlidingHold(SlidingHold *Hold, const uint i, const float in)
                     goto found_place;
             } while(lowerIndex--);
             lowerIndex = mask;
-        } while(1);
+        } while(true);
     found_place:
 
         lowerIndex = (lowerIndex + 1) & mask;
@@ -87,10 +87,10 @@ void ShiftSlidingHold(SlidingHold *Hold, const uint n)
     if(exp_last-exp_begin < 0)
     {
         std::transform(exp_begin, std::end(Hold->mExpiries), exp_begin,
-            std::bind(std::minus<>{}, _1, n));
+            [n](auto a){ return a - n; });
         exp_begin = std::begin(Hold->mExpiries);
     }
-    std::transform(exp_begin, exp_last+1, exp_begin, std::bind(std::minus<>{}, _1, n));
+    std::transform(exp_begin, exp_last+1, exp_begin, [n](auto a){ return a - n; });
 }
 
 
@@ -121,7 +121,7 @@ void LinkChannels(Compressor *Comp, const uint SamplesToDo, const FloatBufferLin
  * it uses an instantaneous squared peak detector and a squared RMS detector
  * both with 200ms release times.
  */
-static void CrestDetector(Compressor *Comp, const uint SamplesToDo)
+void CrestDetector(Compressor *Comp, const uint SamplesToDo)
 {
     const float a_crest{Comp->mCrestCoeff};
     float y2_peak{Comp->mLastPeakSq};
@@ -155,7 +155,7 @@ void PeakDetector(Compressor *Comp, const uint SamplesToDo)
     /* Clamp the minimum amplitude to near-zero and convert to logarithm. */
     auto side_begin = std::begin(Comp->mSideChain) + Comp->mLookAhead;
     std::transform(side_begin, side_begin+SamplesToDo, side_begin,
-        [](const float s) -> float { return std::log(maxf(0.000001f, s)); });
+        [](auto s) { return std::log(maxf(0.000001f, s)); });
 }
 
 /* An optional hold can be used to extend the peak detector so it can more
@@ -404,7 +404,7 @@ void Compressor::process(const uint SamplesToDo, FloatBufferLine *OutBuffer)
         {
             float *buffer{al::assume_aligned<16>(input.data())};
             std::transform(buffer, buffer+SamplesToDo, buffer,
-                std::bind(std::multiplies<float>{}, _1, preGain));
+                [preGain](auto a){ return a * preGain; });
         };
         std::for_each(OutBuffer, OutBuffer+numChans, apply_gain);
     }
@@ -430,7 +430,7 @@ void Compressor::process(const uint SamplesToDo, FloatBufferLine *OutBuffer)
         float *buffer{al::assume_aligned<16>(input.data())};
         const float *gains{al::assume_aligned<16>(&sideChain[0])};
         std::transform(gains, gains+SamplesToDo, buffer, buffer,
-            std::bind(std::multiplies<float>{}, _1, _2));
+            [](auto a, auto b){ return a * b; });
     };
     std::for_each(OutBuffer, OutBuffer+numChans, apply_comp);
 
diff --git a/core/mixer/mixer_sse.cpp b/core/mixer/mixer_sse.cpp
index 6baad7fb..1b0d1386 100644
--- a/core/mixer/mixer_sse.cpp
+++ b/core/mixer/mixer_sse.cpp
@@ -40,36 +40,36 @@ inline void ApplyCoeffs(float2 *RESTRICT Values, const size_t IrSize, const Cons
     {
         for(size_t i{0};i < IrSize;i += 2)
         {
-            const __m128 coeffs{_mm_load_ps(&Coeffs[i][0])};
-            __m128 vals{_mm_load_ps(&Values[i][0])};
+            const __m128 coeffs{_mm_load_ps(Coeffs[i].data())};
+            __m128 vals{_mm_load_ps(Values[i].data())};
             vals = MLA4(vals, lrlr, coeffs);
-            _mm_store_ps(&Values[i][0], vals);
+            _mm_store_ps(Values[i].data(), vals);
         }
     }
     else
     {
         __m128 imp0, imp1;
-        __m128 coeffs{_mm_load_ps(&Coeffs[0][0])};
-        __m128 vals{_mm_loadl_pi(_mm_setzero_ps(), reinterpret_cast<__m64*>(&Values[0][0]))};
+        __m128 coeffs{_mm_load_ps(Coeffs[0].data())};
+        __m128 vals{_mm_loadl_pi(_mm_setzero_ps(), reinterpret_cast<__m64*>(Values[0].data()))};
         imp0 = _mm_mul_ps(lrlr, coeffs);
         vals = _mm_add_ps(imp0, vals);
-        _mm_storel_pi(reinterpret_cast<__m64*>(&Values[0][0]), vals);
+        _mm_storel_pi(reinterpret_cast<__m64*>(Values[0].data()), vals);
         size_t td{((IrSize+1)>>1) - 1};
         size_t i{1};
         do {
-            coeffs = _mm_load_ps(&Coeffs[i+1][0]);
-            vals = _mm_load_ps(&Values[i][0]);
+            coeffs = _mm_load_ps(Coeffs[i+1].data());
+            vals = _mm_load_ps(Values[i].data());
             imp1 = _mm_mul_ps(lrlr, coeffs);
             imp0 = _mm_shuffle_ps(imp0, imp1, _MM_SHUFFLE(1, 0, 3, 2));
             vals = _mm_add_ps(imp0, vals);
-            _mm_store_ps(&Values[i][0], vals);
+            _mm_store_ps(Values[i].data(), vals);
             imp0 = imp1;
             i += 2;
         } while(--td);
-        vals = _mm_loadl_pi(vals, reinterpret_cast<__m64*>(&Values[i][0]));
+        vals = _mm_loadl_pi(vals, reinterpret_cast<__m64*>(Values[i].data()));
         imp0 = _mm_movehl_ps(imp0, imp0);
         vals = _mm_add_ps(imp0, vals);
-        _mm_storel_pi(reinterpret_cast<__m64*>(&Values[i][0]), vals);
+        _mm_storel_pi(reinterpret_cast<__m64*>(Values[i].data()), vals);
     }
 }
 
diff --git a/utils/alsoft-config/mainwindow.cpp b/utils/alsoft-config/mainwindow.cpp
index eb4458b2..39b773af 100644
--- a/utils/alsoft-config/mainwindow.cpp
+++ b/utils/alsoft-config/mainwindow.cpp
@@ -21,7 +21,7 @@
 
 namespace {
 
-static const struct {
+const struct {
     char backend_name[16];
     char full_string[32];
 } backendList[] = {
@@ -75,7 +75,7 @@ static const struct {
     { "", "" }
 };
 
-static const struct NameValuePair {
+const struct NameValuePair {
     const char name[64];
     const char value[16];
 } speakerModeList[] = {
@@ -146,7 +146,7 @@ static const struct NameValuePair {
     { "", "" }
 };
 
-static QString getDefaultConfigName()
+QString getDefaultConfigName()
 {
 #ifdef Q_OS_WIN32
     static const char fname[] = "alsoft.ini";
@@ -173,7 +173,7 @@ static QString getDefaultConfigName()
     return fname;
 }
 
-static QString getBaseDataPath()
+QString getBaseDataPath()
 {
 #ifdef Q_OS_WIN32
     auto get_appdata_path = []() noexcept -> QString
@@ -196,7 +196,7 @@ static QString getBaseDataPath()
     return base;
 }
 
-static QStringList getAllDataPaths(const QString &append)
+QStringList getAllDataPaths(const QString &append)
 {
     QStringList list;
     list.append(getBaseDataPath());
@@ -227,7 +227,7 @@ static QStringList getAllDataPaths(const QString &append)
 }
 
 template<size_t N>
-static QString getValueFromName(const NameValuePair (&list)[N], const QString &str)
+QString getValueFromName(const NameValuePair (&list)[N], const QString &str)
 {
     for(size_t i = 0;i < N-1;i++)
     {
@@ -238,7 +238,7 @@ static QString getValueFromName(const NameValuePair (&list)[N], const QString &s
 }
 
 template<size_t N>
-static QString getNameFromValue(const NameValuePair (&list)[N], const QString &str)
+QString getNameFromValue(const NameValuePair (&list)[N], const QString &str)
 {
     for(size_t i = 0;i < N-1;i++)
     {
@@ -844,7 +844,7 @@ void MainWindow::loadConfig(const QString &fname)
     ui->enabledBackendList->clear();
     ui->disabledBackendList->clear();
     QStringList drivers{settings.value("drivers").toStringList()};
-    if(drivers.size() == 0)
+    if(drivers.empty())
         ui->backendCheckBox->setChecked(true);
     else
     {
@@ -1091,7 +1091,7 @@ void MainWindow::saveConfig(const QString &fname) const
             }
         }
     }
-    if(strlist.size() == 0 && !ui->backendCheckBox->isChecked())
+    if(strlist.empty() && !ui->backendCheckBox->isChecked())
         strlist.append("-all");
     else if(ui->backendCheckBox->isChecked())
         strlist.append(QString{});
@@ -1322,7 +1322,7 @@ void MainWindow::removeHrtfFile()
 
 void MainWindow::updateHrtfRemoveButton()
 {
-    ui->hrtfRemoveButton->setEnabled(ui->hrtfFileList->selectedItems().size() != 0);
+    ui->hrtfRemoveButton->setEnabled(!ui->hrtfFileList->selectedItems().empty());
 }
 
 void MainWindow::showEnabledBackendMenu(QPoint pt)
@@ -1333,7 +1333,7 @@ void MainWindow::showEnabledBackendMenu(QPoint pt)
 
     QMenu ctxmenu;
     QAction *removeAction{ctxmenu.addAction(QIcon::fromTheme("list-remove"), "Remove")};
-    if(ui->enabledBackendList->selectedItems().size() == 0)
+    if(ui->enabledBackendList->selectedItems().empty())
         removeAction->setEnabled(false);
     ctxmenu.addSeparator();
     for(size_t i = 0;backendList[i].backend_name[0];i++)
@@ -1341,8 +1341,8 @@ void MainWindow::showEnabledBackendMenu(QPoint pt)
         QString backend{backendList[i].full_string};
         QAction *action{ctxmenu.addAction(QString("Add ")+backend)};
         actionMap[action] = backend;
-        if(ui->enabledBackendList->findItems(backend, Qt::MatchFixedString).size() != 0 ||
-           ui->disabledBackendList->findItems(backend, Qt::MatchFixedString).size() != 0)
+        if(!ui->enabledBackendList->findItems(backend, Qt::MatchFixedString).empty() ||
+           !ui->disabledBackendList->findItems(backend, Qt::MatchFixedString).empty())
             action->setEnabled(false);
     }
 
@@ -1371,7 +1371,7 @@ void MainWindow::showDisabledBackendMenu(QPoint pt)
 
     QMenu ctxmenu;
     QAction *removeAction{ctxmenu.addAction(QIcon::fromTheme("list-remove"), "Remove")};
-    if(ui->disabledBackendList->selectedItems().size() == 0)
+    if(ui->disabledBackendList->selectedItems().empty())
         removeAction->setEnabled(false);
     ctxmenu.addSeparator();
     for(size_t i = 0;backendList[i].backend_name[0];i++)
@@ -1379,8 +1379,8 @@ void MainWindow::showDisabledBackendMenu(QPoint pt)
         QString backend{backendList[i].full_string};
         QAction *action{ctxmenu.addAction(QString("Add ")+backend)};
         actionMap[action] = backend;
-        if(ui->disabledBackendList->findItems(backend, Qt::MatchFixedString).size() != 0 ||
-           ui->enabledBackendList->findItems(backend, Qt::MatchFixedString).size() != 0)
+        if(!ui->disabledBackendList->findItems(backend, Qt::MatchFixedString).empty() ||
+           !ui->enabledBackendList->findItems(backend, Qt::MatchFixedString).empty())
             action->setEnabled(false);
     }
 
diff --git a/utils/makemhr/makemhr.cpp b/utils/makemhr/makemhr.cpp
index e0911438..e3585530 100644
--- a/utils/makemhr/makemhr.cpp
+++ b/utils/makemhr/makemhr.cpp
@@ -1024,7 +1024,7 @@ static void NormalizeHrirs(HrirDataT *hData)
 
     /* Now scale all IRs by the given factor. */
     auto proc_channel = [irSize,factor](double *ir)
-    { std::transform(ir, ir+irSize, ir, std::bind(std::multiplies<double>{}, _1, factor)); };
+    { std::transform(ir, ir+irSize, ir, [factor](auto a){ return a * factor; }};
     auto proc_azi = [channels,proc_channel](HrirAzT &azi)
     { std::for_each(azi.mIrs, azi.mIrs+channels, proc_channel); };
     auto proc_elev = [proc_azi](HrirEvT &elev)
diff --git a/utils/uhjencoder.cpp b/utils/uhjencoder.cpp
index 9af1b3cf..34698993 100644
--- a/utils/uhjencoder.cpp
+++ b/utils/uhjencoder.cpp
@@ -349,7 +349,7 @@ int main(int argc, char **argv)
             else
             {
                 std::string mapstr;
-                if(chanmap.size() > 0)
+                if(!chanmap.empty())
                 {
                     mapstr = std::to_string(chanmap[0]);
                     for(int idx : al::span<int>{chanmap}.subspan<1>())
@@ -414,7 +414,7 @@ int main(int argc, char **argv)
 
         auto encoder = std::make_unique<UhjEncoder>();
         auto splbuf = al::vector<FloatBufferLine, 16>(static_cast<uint>(9+ininfo.channels)+uhjchans);
-        auto ambmem = al::span<FloatBufferLine,4>{&splbuf[0], 4};
+        auto ambmem = al::span<FloatBufferLine,4>{splbuf.data(), 4};
         auto encmem = al::span<FloatBufferLine,4>{&splbuf[4], 4};
         auto srcmem = al::span<float,BufferLineSize>{splbuf[8].data(), BufferLineSize};
         auto outmem = al::span<float>{splbuf[9].data(), BufferLineSize*uhjchans};