ofOpenALSoundPlayer: fix conflicting forward declaration in newer ver…

…sions (#6498) Declare statics inside cpp to avoid forward declaration #changelog #linux
openframeworks · Dec 9, 2019 · 2bee6a3 · 2bee6a3
1 parent 2144658
commit 2bee6a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/libs/openFrameworks/sound/ofOpenALSoundPlayer.cpp b/libs/openFrameworks/sound/ofOpenALSoundPlayer.cpp
@@ -23,10 +23,10 @@
 
 using namespace std;
 
-ALCdevice * ofOpenALSoundPlayer::alDevice = 0;
-ALCcontext * ofOpenALSoundPlayer::alContext = 0;
+static ALCdevice * alDevice = nullptr;
+static ALCcontext * alContext = nullptr;
 vector<float> ofOpenALSoundPlayer::window;
-float ofOpenALSoundPlayer::windowSum=0;
+float ofOpenALSoundPlayer::windowSum = 0.f;
 
 
 kiss_fftr_cfg ofOpenALSoundPlayer::systemFftCfg=0;
@@ -40,7 +40,7 @@ static set<ofOpenALSoundPlayer*> & players(){
 }
 
 void ofOpenALSoundUpdate(){
-	alcProcessContext(ofOpenALSoundPlayer::alContext);
+	alcProcessContext(alContext);
 }
 
 // ----------------------------------------------------------------------------

diff --git a/libs/openFrameworks/sound/ofOpenALSoundPlayer.h b/libs/openFrameworks/sound/ofOpenALSoundPlayer.h
@@ -9,12 +9,6 @@
 
 
 typedef unsigned int ALuint;
-/** Opaque device handle */
-typedef struct ALCdevice_struct ALCdevice;
-/** Opaque context handle */
-typedef struct ALCcontext_struct ALCcontext;
-
-
 
 #include "kiss_fft.h"
 #include "kiss_fftr.h"
@@ -123,8 +117,6 @@ class ofOpenALSoundPlayer : public ofBaseSoundPlayer, public ofThread {
 		float speed; // -n to n, 1 = normal, -1 backwards
 		unsigned int length; // in samples;
 
-		static ALCdevice * alDevice;
-		static ALCcontext * alContext;
 		static std::vector<float> window;
 		static float windowSum;