check value rancge when converting channel count from int

4 files changed, 5 insertions, 14 deletions

diff --git a/src/sources/audiosource.h b/src/sources/audiosource.h
index 6e720f5dbe..52a60b50e0 100644
--- a/src/sources/audiosource.h
+++ b/src/sources/audiosource.h
@@ -305,7 +305,7 @@ class AudioSource : public UrlResource, public virtual /*implements*/ IAudioSour
     explicit AudioSource(const QUrl& url);
 
     bool initChannelCountOnce(audio::ChannelCount channelCount);
-    bool initChannelCountOnce(SINT channelCount) {
+    bool initChannelCountOnce(int channelCount) {
         return initChannelCountOnce(audio::ChannelCount(channelCount));
     }
 
diff --git a/src/sources/audiosourcestereoproxy.cpp b/src/sources/audiosourcestereoproxy.cpp
index d32a0ad867..cd2f40233e 100644
--- a/src/sources/audiosourcestereoproxy.cpp
+++ b/src/sources/audiosourcestereoproxy.cpp
@@ -9,7 +9,7 @@ namespace {
 
 const Logger kLogger("AudioSourceStereoProxy");
 
-constexpr audio::ChannelCount kChannelCount = audio::ChannelCount(2);
+constexpr audio::ChannelCount kChannelCount = audio::ChannelCount::stereo();
 
 audio::SignalInfo proxySignalInfo(
         const audio::SignalInfo& signalInfo) {
diff --git a/src/sources/soundsourcemodplug.cpp b/src/sources/soundsourcemodplug.cpp
index fb637ec919..69a569aa38 100644
--- a/src/sources/soundsourcemodplug.cpp
+++ b/src/sources/soundsourcemodplug.cpp
@@ -55,15 +55,6 @@ QString getModPlugTypeFromUrl(const QUrl& url) {
 } // anonymous namespace
 
 //static
-constexpr SINT SoundSourceModPlug::kChannelCount;
-
-//static
-constexpr SINT SoundSourceModPlug::kBitsPerSample;
-
-//static
-constexpr SINT SoundSourceModPlug::kSampleRate;
-
-//static
 unsigned int SoundSourceModPlug::s_bufferSizeLimit = 0;
 
 //static
diff --git a/src/sources/soundsourcemodplug.h b/src/sources/soundsourcemodplug.h
index baed964810..e05992e5bb 100644
--- a/src/sources/soundsourcemodplug.h
+++ b/src/sources/soundsourcemodplug.h
@@ -15,9 +15,9 @@ namespace mixxx {
 // in RAM to allow seeking and smooth operation in Mixxx.
 class SoundSourceModPlug : public SoundSource {
   public:
-    static constexpr SINT kChannelCount = 2;
-    static constexpr SINT kSampleRate = 44100;
-    static constexpr SINT kBitsPerSample = 16;
+    static constexpr int kChannelCount = 2;
+    static constexpr int kSampleRate = 44100;
+    static constexpr int kBitsPerSample = 16;
 
     // apply settings for decoding
     static void configure(unsigned int bufferSizeLimit,