- fixes

src/engine/audio/Audio_WavFile.cpp

@@ -33,7 +33,7 @@ WaveFormatEx;
 
 #define LOG_SUBSYSTEM "WavFileReader"
 
-#define LOCK std::unique_lock<std::mutex> lock(mFileMtx);
+#define LOCK std::unique_lock<std::recursive_mutex> lock(mFileMtx);
 
 using namespace Audio;
 

src/engine/audio/Audio_WavFile.h

@@ -28,7 +28,7 @@ namespace Audio
     short mBits;
     int mRate;
     std::tstring mFileName;
-    mutable std::mutex mFileMtx;
+    mutable std::recursive_mutex mFileMtx;
     unsigned mDataOffset;
     unsigned mDataLength;
     Resampler mResampler;
@@ -59,10 +59,11 @@ namespace Audio
   protected:
     FILE*                   mHandle;        /// Handle of audio file.
     std::tstring            mFileName;      /// Path to requested audio file.
-    std::mutex      mFileMtx;       /// Mutex to protect this instance.
+    std::recursive_mutex    mFileMtx;       /// Mutex to protect this instance.
     int                     mWritten;       /// Amount of written data (in bytes)
     int                     mLengthOffset;  /// Position of length field.
-    int             mRate, mChannels;
+    int                     mRate,
+                            mChannels;
 
     void checkWriteResult(int result);
 

src/engine/endpoint/EP_Session.cpp

@@ -461,8 +461,7 @@ void Session::getSessionInfo(Session::InfoOptions options, VariantMap& info)
 #if defined(USE_PVQA_LIBRARY) && !defined(PVQA_SERVER)
             if (options != InfoOptions::Standard)
             {
-        //if (s.mPvqaMos == 0.0f)
+                // This information is available AFTER audio stream is deleted
-        //  s.mPvqaMos = calculatePvqaMos(AUDIO_SAMPLERATE);
                 info[SessionInfo_PvqaMos] = s.mPvqaMos;
                 info[SessionInfo_PvqaReport] = s.mPvqaReport;
             }