temp fix for brokwen emscripten window (#7490)

#changelog #emscripten
openframeworks · Apr 15, 2023 · 102986e · 102986e
1 parent 59301f7
commit 102986e
Showing 1 changed file with 23 additions and 11 deletions.
diff --git a/libs/openFrameworks/sound/ofSoundStream.cpp b/libs/openFrameworks/sound/ofSoundStream.cpp
@@ -20,12 +20,24 @@
 #define OF_SOUND_STREAM_TYPE ofxEmscriptenSoundStream
 #endif
 
-namespace{
-    ofSoundStream &getSystemSoundStream() {
-        static ofSoundStream _;
-        return _;
+
+//FIXME: this is needed to make video work on emscripten
+//See: https://github.com/openframeworks/openFrameworks/issues/7377 
+#ifdef OF_SOUNDSTREAM_EMSCRIPTEN
+    namespace{
+        ofSoundStream systemSoundStream;
     }
-}
+    #define OF_SYSTEM_SS systemSoundStream
+#else
+    namespace{
+        ofSoundStream &getSystemSoundStream() {
+            static ofSoundStream _;
+            return _;
+        }
+    }
+    #define OF_SYSTEM_SS getSystemSoundStream()
+#endif
+
 
 using std::shared_ptr;
 using std::vector;
@@ -121,27 +133,27 @@ void ofSoundStreamSetup(int nOutputChannels, int nInputChannels, ofBaseApp * app
 
 //------------------------------------------------------------
 void ofSoundStreamSetup(ofSoundStreamSettings & settings) {
-    getSystemSoundStream().setup(settings);
+    OF_SYSTEM_SS.setup(settings);
 }
 
 //------------------------------------------------------------
 void ofSoundStreamStop(){
-    getSystemSoundStream().stop();
+    OF_SYSTEM_SS.stop();
 }
 
 //------------------------------------------------------------
 void ofSoundStreamStart(){
-    getSystemSoundStream().start();
+    OF_SYSTEM_SS.start();
 }
 
 //------------------------------------------------------------
 void ofSoundStreamClose(){
-    getSystemSoundStream().close();
+    OF_SYSTEM_SS.close();
 }
 
 //------------------------------------------------------------
 vector<ofSoundDevice> ofSoundStreamListDevices(){
-	vector<ofSoundDevice> deviceList = getSystemSoundStream().getDeviceList();
+	vector<ofSoundDevice> deviceList = OF_SYSTEM_SS.getDeviceList();
 	ofLogNotice("ofSoundStreamListDevices") << std::endl << deviceList;
 	return deviceList;
 }
@@ -190,7 +202,7 @@ void ofSoundStream::printDeviceList()  const{
 void ofSoundStream::setDeviceID(int deviceID){
 	if( soundStream ){
 		tmpDeviceId = deviceID;
-	}	
+	}
 }
 
 //------------------------------------------------------------