Merge pull request #76 from AlwinEsch/Nexus-changes

[Nexus] API related update
xbmc · Sep 16, 2022 · 9f74404 · 9f74404
2 parents d683b5d + 9f51f44
commit 9f74404
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 22 deletions.
diff --git a/src/Main_dx.cpp b/src/Main_dx.cpp
@@ -50,9 +50,9 @@ class CVisualizationWaveForm
   ~CVisualizationWaveForm() override;
 
   ADDON_STATUS Create() override;
-  bool Start(int channels, int samplesPerSec, int bitsPerSample, std::string songName) override;
+  bool Start(int channels, int samplesPerSec, int bitsPerSample, const std::string& songName) override;
   void Render() override;
-  void AudioData(const float* audioData, int audioDataLength, float *freqData, int freqDataLength) override;
+  void AudioData(const float* audioData, size_t audioDataLength) override;
 
 private:
   bool init_renderer_objs();
@@ -118,7 +118,7 @@ ADDON_STATUS CVisualizationWaveForm::Create()
 //-- Start -------------------------------------------------------------------
 // Called on load. Addon should fully initalize or return error status
 //-----------------------------------------------------------------------------
-bool CVisualizationWaveForm::Start(int channels, int samplesPerSec, int bitsPerSample, std::string songName)
+bool CVisualizationWaveForm::Start(int channels, int samplesPerSec, int bitsPerSample, const std::string& songName)
 {
   (void)channels;
   (void)samplesPerSec;
@@ -156,14 +156,11 @@ bool CVisualizationWaveForm::Start(int channels, int samplesPerSec, int bitsPerS
 //-- Audiodata ----------------------------------------------------------------
 // Called by Kodi to pass new audio data to the vis
 //-----------------------------------------------------------------------------
-void CVisualizationWaveForm::AudioData(const float* pAudioData, int iAudioDataLength, float *pFreqData, int iFreqDataLength)
+void CVisualizationWaveForm::AudioData(const float* pAudioData, size_t iAudioDataLength)
 {
-  (void)pFreqData;
-  (void)iFreqDataLength;
-
-  int ipos = 0;
-  int length = iAudioDataLength;
-  int usedStep;
+  size_t ipos = 0;
+  size_t length = iAudioDataLength;
+  size_t usedStep;
   if (m_ignoreResample)
   {
     usedStep = 2;
@@ -176,7 +173,7 @@ void CVisualizationWaveForm::AudioData(const float* pAudioData, int iAudioDataLe
 
   while (ipos < m_usedLinePoints)
   {
-    for (int i=0; i < length; i+=usedStep)
+    for (size_t i=0; i < length; i+=usedStep)
     {
       m_fWaveform[0][ipos] = pAudioData[i  ]; // left channel
       m_fWaveform[1][ipos] = pAudioData[i+1]; // right channel

diff --git a/src/Main_gl.cpp b/src/Main_gl.cpp
@@ -41,11 +41,11 @@ class ATTR_DLL_LOCAL CVisualizationWaveForm
   CVisualizationWaveForm() = default;
   ~CVisualizationWaveForm() override = default;
 
-  bool Start(int channels, int samplesPerSec, int bitsPerSample, std::string songName) override;
+  bool Start(int channels, int samplesPerSec, int bitsPerSample, const std::string& songName) override;
   void Stop() override;
   void Render() override;
   bool IsDirty() override { return true; }
-  void AudioData(const float* audioData, int audioDataLength, float *freqData, int freqDataLength) override;
+  void AudioData(const float* audioData, size_t audioDataLength) override;
 
   void OnCompiledAndLinked() override;
   bool OnEnabled() override;
@@ -79,7 +79,7 @@ class ATTR_DLL_LOCAL CVisualizationWaveForm
 //-- Start -------------------------------------------------------------------
 // Called on load. Addon should fully initalize or return error status
 //-----------------------------------------------------------------------------
-bool CVisualizationWaveForm::Start(int channels, int samplesPerSec, int bitsPerSample, std::string songName)
+bool CVisualizationWaveForm::Start(int channels, int samplesPerSec, int bitsPerSample, const std::string& songName)
 {
   (void)channels;
   (void)samplesPerSec;
@@ -249,13 +249,10 @@ void CVisualizationWaveForm::DrawLine(float* waveform, bool topBottom)
   glDrawArrays(mode, 0, ptr);
 }
 
-void CVisualizationWaveForm::AudioData(const float* pAudioData, int iAudioDataLength, float *pFreqData, int iFreqDataLength)
+void CVisualizationWaveForm::AudioData(const float* pAudioData, size_t iAudioDataLength)
 {
-  (void)pFreqData;
-  (void)iFreqDataLength;
-
-  int ipos = 0;
-  int usedStep;
+  size_t ipos = 0;
+  size_t usedStep;
   if (m_ignoreResample)
   {
     usedStep = 2;
@@ -267,7 +264,7 @@ void CVisualizationWaveForm::AudioData(const float* pAudioData, int iAudioDataLe
   }
   while (ipos < m_usedLinePoints)
   {
-    for (int i=0; i < iAudioDataLength; i+=usedStep)
+    for (size_t i=0; i < iAudioDataLength; i+=usedStep)
     {
       m_fWaveform[0][ipos] = pAudioData[i  ]; // left channel
       m_fWaveform[1][ipos] = pAudioData[i+1]; // right channel

diff --git a/visualization.waveform/addon.xml.in b/visualization.waveform/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="visualization.waveform"
-  version="20.1.0"
+  version="20.2.0"
   name="Waveform"
   provider-name="MrC">
   <requires>@ADDON_DEPENDS@</requires>