Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

daemon/src/audio/audioloop.cpp

@@ -41,7 +41,7 @@
 #include <cassert>
 #include "logger.h"
 
-AudioLoop::AudioLoop() : buffer_(0),  size_(0), pos_(0), sampleRate_(0), isRecording_(false)
+AudioLoop::AudioLoop(unsigned int sampleRate) : buffer_(0),  size_(0), pos_(0), sampleRate_(sampleRate), isRecording_(false)
 {}
 
 AudioLoop::~AudioLoop()

daemon/src/audio/audioloop.h

@@ -44,7 +44,7 @@
 
 class AudioLoop {
     public:
-        AudioLoop();
+        AudioLoop(unsigned int sampleRate);
 
         virtual ~AudioLoop();
 

daemon/src/audio/sound/audiofile.cpp

@@ -43,7 +43,7 @@
 #include "logger.h"
 
 RawFile::RawFile(const std::string& name, sfl::AudioCodec *codec, unsigned int sampleRate)
-    : AudioFile(name), audioCodec_(codec)
+    : AudioFile(name, sampleRate), audioCodec_(codec)
 {
     if (filepath_.empty())
         throw AudioFileException("Unable to open audio file: filename is empty");
@@ -109,7 +109,7 @@ RawFile::RawFile(const std::string& name, sfl::AudioCodec *codec, unsigned int s
 }
 
 
-WaveFile::WaveFile(const std::string &fileName, int newRate) : AudioFile(fileName)
+WaveFile::WaveFile(const std::string &fileName, int sampleRate) : AudioFile(fileName, sampleRate)
 {
     const std::fstream fs(fileName.c_str(), std::ios_base::in);
 

daemon/src/audio/sound/audiofile.h

@@ -52,7 +52,9 @@ class AudioFileException : public std::runtime_error {
  */
 class AudioFile : public AudioLoop {
     public:
-        AudioFile(const std::string &filepath) : filepath_(filepath) {}
+        AudioFile(const std::string &filepath, unsigned int sampleRate) : AudioLoop(sampleRate), filepath_(filepath)
+        {}
+
         std::string getFilePath() const {
             return filepath_;
         }
@@ -83,7 +85,7 @@ class WaveFile : public AudioFile {
          * @param filename      The absolute path to the file
          * @param sampleRate    The sample rate to read it
          */
-        WaveFile(const std::string&, int);
+        WaveFile(const std::string&, unsigned int sampleRate);
 };
 
 #endif // __AUDIOFILE_H__

daemon/src/audio/sound/tone.cpp

@@ -44,7 +44,7 @@
 #include <vector>
 
 Tone::Tone(const std::string& definition, unsigned int sampleRate) :
-    sampleRate_(sampleRate), xhigher_(0.0), xlower_(0.0)
+    AudioLoop(sampleRate), xhigher_(0.0), xlower_(0.0)
 {
     fillWavetable();
     genBuffer(definition); // allocate memory with definition parameter

daemon/src/audio/sound/tone.h

@@ -83,9 +83,6 @@ class Tone : public AudioLoop {
          */
         void genBuffer(const std::string& definition);
 
-        /** Sample rate */
-        unsigned int sampleRate_;
-
         static const int TABLE_LENGTH = 4096;
         double wavetable_[TABLE_LENGTH];