diff options
author | Uwe Klotz <uklotz@mixxx.org> | 2021-05-24 22:29:58 +0200 |
---|---|---|
committer | Uwe Klotz <uklotz@mixxx.org> | 2021-05-24 22:29:58 +0200 |
commit | 9b9fbaafc404f8cfc822f64d356ed3c37e8778c1 (patch) | |
tree | 8e9b842a2321f506265b3854249155ed2a818008 /src/sources | |
parent | 1659294fa52d93a1f8f6d74d51498c88d595363e (diff) | |
parent | 6ea8777e3358baabc06f89349ce66acc6347b943 (diff) |
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
# Conflicts:
# src/controllers/controllerengine.cpp
Diffstat (limited to 'src/sources')
-rw-r--r-- | src/sources/audiosource.h | 2 | ||||
-rw-r--r-- | src/sources/audiosourcestereoproxy.cpp | 2 | ||||
-rw-r--r-- | src/sources/soundsourcemodplug.cpp | 9 | ||||
-rw-r--r-- | src/sources/soundsourcemodplug.h | 6 |
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, |