Merge PR #6536: BUILD: Fix compiler warnings on 32bit architectures

mumble-voip · Aug 20, 2024 · 4610353 · 4610353
2 parents 4985b18 + da02ba2
commit 4610353
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/src/MumbleProtocol.cpp b/src/MumbleProtocol.cpp
@@ -781,7 +781,7 @@ namespace Protocol {
  }
 
 
- m_audioData.payload = gsl::span< byte >(payloadBegin, payloadSize);
+ m_audioData.payload = gsl::span< byte >(payloadBegin, static_cast< std::size_t >(payloadSize));
 
  if (stream.left() == 3 * sizeof(float)) {
  // If there are further bytes after the audio payload, this means that there is positional data attached to

diff --git a/src/mumble/Audio.cpp b/src/mumble/Audio.cpp
@@ -43,7 +43,7 @@ void LoopUser::addFrame(const Mumble::Protocol::AudioData &audioData) {
  QMutexLocker l(&qmLock);
  bool restart = (qetLastFetch.elapsed() > 100);
 
- long time = qetTicker.elapsed();
+ qint64 time = qetTicker.elapsed();
 
  float r;
  if (restart)

diff --git a/src/mumble/AudioOutput.cpp b/src/mumble/AudioOutput.cpp
@@ -616,12 +616,13 @@ bool AudioOutput::mix(void *outbuff, unsigned int frameCount) {
  if (speech->bStereo) {
  // Mix down stereo to mono. TODO: stereo record support
  // frame: for a stereo stream, the [LR] pair inside ...[LR]LRLRLR.... is a frame
- for (unsigned int i = 0; i < frameCount; ++i) {
- recbuff[i] += (pfBuffer[2 * i] / 2.0f + pfBuffer[2 * i + 1] / 2.0f) * volumeAdjustment;
+ for (std::size_t i = 0; i < frameCount; ++i) {
+ recbuff.get()[i] +=
+ (pfBuffer[2 * i] / 2.0f + pfBuffer[2 * i + 1] / 2.0f) * volumeAdjustment;
  }
  } else {
- for (unsigned int i = 0; i < frameCount; ++i) {
- recbuff[i] += pfBuffer[i] * volumeAdjustment;
+ for (std::size_t i = 0; i < frameCount; ++i) {
+ recbuff.get()[i] += pfBuffer[i] * volumeAdjustment;
  }
  }
 

diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp
@@ -1047,7 +1047,7 @@ void Server::sendMessage(ServerUser &u, const unsigned char *data, int len, QByt
  ((reinterpret_cast< quint64 >(ebuffer.data()) + 8) & static_cast< quint64 >(~7)) + 4);
 #else
  std::vector< char > bufVec;
- bufVec.resize(len + 4);
+ bufVec.resize(static_cast< std::size_t >(len + 4));
  char *buffer = bufVec.data();
 #endif
  {