Convert to std::array and std::string. (audiooutputbase)

MythTV · Aug 28, 2020 · dcd51e2 · dcd51e2
1 parent 067d370
commit dcd51e2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.cpp b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
@@ -64,7 +64,7 @@ AudioOutputBase::AudioOutputBase(const AudioSettings &settings) :
     m_source(settings.m_source),
     m_setInitialVol(settings.m_setInitialVol)
 {
-    m_srcIn = m_srcInBuf;
+    m_srcIn = m_srcInBuf.data();
 
     if (m_mainDevice.startsWith("AudioTrack:"))
         m_usesSpdif = false;
@@ -1401,7 +1401,7 @@ bool AudioOutputBase::AddData(void *in_buffer, int in_len,
         }
 
         // Final float conversion space requirement
-        len = sizeof(*m_srcInBuf) / sampleSize * len;
+        len = sizeof(m_srcInBuf[0]) / sampleSize * len;
 
         // Account for changes in number of channels
         if (m_needsDownmix)

diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.h b/mythtv/libs/libmyth/audio/audiooutputbase.h
@@ -282,7 +282,7 @@ class AudioOutputBase : public AudioOutput, public MThread
     // All actual buffers
     SRC_DATA          m_srcData                           {};
     uint              m_memoryCorruptionTest0             {0xdeadbeef};
-    alignas(16) float m_srcInBuf[kAudioSRCInputSize]      {};
+    alignas(16) std::array<float,kAudioSRCInputSize> m_srcInBuf {};
     uint              m_memoryCorruptionTest1             {0xdeadbeef};;
     float            *m_srcOut                            {nullptr};
     int               m_kAudioSRCOutputSize               {0};