Merge pull request #56 from lrusak/modernization

Modernization

Author: garbear

src/main.cpp

@@ -145,8 +145,8 @@ vec2 getUV()
 
 CVisualizationMatrix::CVisualizationMatrix()
   : m_kissCfg(kiss_fft_alloc(AUDIO_BUFFER, 0, nullptr, nullptr)),
-    m_audioData(new GLubyte[AUDIO_BUFFER]()),
-    m_magnitudeBuffer(new float[NUM_BANDS]()),
+    m_audioData(AUDIO_BUFFER),
+    m_magnitudeBuffer(NUM_BANDS),
     m_pcm(new float[AUDIO_BUFFER]())
 {
   m_currentPreset = kodi::addon::GetSettingInt("lastpresetidx");
@@ -175,8 +175,6 @@ CVisualizationMatrix::CVisualizationMatrix()
 
 CVisualizationMatrix::~CVisualizationMatrix()
 {
-  delete [] m_audioData;
-  delete [] m_magnitudeBuffer;
   delete [] m_pcm;
   free(m_kissCfg);
 }
@@ -244,7 +242,7 @@ void CVisualizationMatrix::AudioData(const float* pAudioData, size_t iAudioDataL
 
   out[0].i = 0;
 
-  SmoothingOverTime(m_magnitudeBuffer, m_magnitudeBuffer, out, NUM_BANDS, SMOOTHING_TIME_CONSTANT, AUDIO_BUFFER);
+  SmoothingOverTime(m_magnitudeBuffer.data(), m_magnitudeBuffer.data(), out, NUM_BANDS, SMOOTHING_TIME_CONSTANT, AUDIO_BUFFER);
 
   const double rangeScaleFactor = MAX_DECIBELS == MIN_DECIBELS ? 1 : (1.0 / (MAX_DECIBELS - MIN_DECIBELS));
   for (unsigned int i = 0; i < NUM_BANDS; i++)
@@ -384,7 +382,7 @@ void CVisualizationMatrix::RenderTo(GLuint shader, GLuint effect_fb)
         {
           glActiveTexture(GL_TEXTURE0 + i);
           glBindTexture(GL_TEXTURE_2D, m_channelTextures[i]);
-          glTexImage2D(GL_TEXTURE_2D, 0, GL_RED, NUM_BANDS, 2, 0, GL_RED, GL_UNSIGNED_BYTE, m_audioData);
+          glTexImage2D(GL_TEXTURE_2D, 0, GL_RED, NUM_BANDS, 2, 0, GL_RED, GL_UNSIGNED_BYTE, m_audioData.data());
         }
       }
       m_needsUpload = false;
@@ -516,7 +514,7 @@ void CVisualizationMatrix::Launch(int preset)
     }
   }
   // Audio
-  m_channelTextures[0] = CreateTexture(GL_RED, NUM_BANDS, 2, m_audioData);
+  m_channelTextures[0] = CreateTexture(GL_RED, NUM_BANDS, 2, m_audioData.data());
   // Logo
   if (!m_shaderTextures[1].texture.empty())
   {

src/main.h

@@ -55,8 +55,8 @@ class ATTR_DLL_LOCAL CVisualizationMatrix
   //double MeasurePerformance(const std::string& shaderPath, int size);
 
   kiss_fft_cfg m_kissCfg;
-  GLubyte* m_audioData;
-  float* m_magnitudeBuffer;
+  std::vector<GLubyte> m_audioData;
+  std::vector<float> m_magnitudeBuffer;
   float* m_pcm;
 
   bool m_initialized = false;