Merge branch 'master' into svxreflector

sm0svx · Jun 19, 2017 · 9962d2c · 9962d2c
2 parents 71ac50f + e67bf4e
commit 9962d2c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/async/audio/AsyncAudioDeviceAlsa.cpp b/src/async/audio/AsyncAudioDeviceAlsa.cpp
@@ -548,7 +548,7 @@ bool AudioDeviceAlsa::initParams(snd_pcm_t *pcm_handle)
     return false;
   }
 
-  if (::abs(real_rate - sample_rate) > 100)
+  if (::abs(static_cast<int>(real_rate) - sample_rate) > 100)
   {
     cerr << "*** ERROR: The sample rate could not be set to "
          << sample_rate << "Hz for ALSA device \"" << dev_name << "\". "

diff --git a/src/async/audio/AsyncAudioDeviceFactory.h b/src/async/audio/AsyncAudioDeviceFactory.h
@@ -94,7 +94,7 @@ class AudioDevice;
  * @param   _class The name of the class that handle the new audio device type
  */
 #define REGISTER_AUDIO_DEVICE_TYPE(_name, _class) \
-  AudioDevice *create_ ## _class(const string& dev_name) \
+  AudioDevice *create_ ## _class(const std::string& dev_name) \
           { return new _class(dev_name); } \
   static bool _class ## _creator_registered = \
           AudioDeviceFactory::instance().registerCreator(_name, \