Merge branch 'master' of github.com:openframeworks/openFrameworks

Author: ofTheo

addons/ofxAndroid/src/ofAppAndroidWindow.cpp

@@ -129,9 +129,9 @@ void ofAppAndroidWindow::setup(const ofxAndroidWindowSettings & settings){
 	glesVersion = settings.glesVersion;
 	ofLogError() << "setup gles" << glesVersion;
 	if(glesVersion<2){
-		currentRenderer = make_shared<ofGLRenderer>(this);
+		currentRenderer = std::make_shared<ofGLRenderer>(this);
 	}else{
-		currentRenderer = make_shared<ofGLProgrammableRenderer>(this);
+		currentRenderer = std::make_shared<ofGLProgrammableRenderer>(this);
 	}
 
 	jclass javaClass = ofGetJNIEnv()->FindClass("cc/openframeworks/OFAndroid");

addons/ofxAssimpModelLoader/src/ofxAssimpMeshHelper.cpp

@@ -24,7 +24,7 @@ void ofxAssimpMeshHelper::addTexture(ofxAssimpTexture & aAssimpTex){
 			meshTextures.push_back(shared_ptr<ofxAssimpTexture>(&assimpTexture,[](ofxAssimpTexture*){}));
 		}
 	}else{
-		auto otherTex = make_shared<ofxAssimpTexture>();
+		auto otherTex = std::make_shared<ofxAssimpTexture>();
 		(*otherTex.get()) = aAssimpTex;
 
 		meshTextures.push_back(otherTex);

addons/ofxEmscripten/libs/html5audio/lib/emscripten/library_html5audio.js

@@ -80,7 +80,41 @@ var LibraryHTML5Audio = {
     },
 
     html5audio_sound_load: function (player_id, url) {
-        AUDIO.player[player_id].src = UTF8ToString(url);
+        try {
+            var filePath = UTF8ToString(url); 
+
+            if( filePath.indexOf("http") == 0 ) {
+                AUDIO.player[player_id].src = filePath;
+            }else{
+
+                //console.log("file path is" + filePath);
+                
+                var data = FS.readFile(filePath, { encoding: 'binary' });
+                
+                var ext = filePath.split('.').pop();
+                
+                var stats = FS.stat(filePath)
+                var fileSizeInBytes = stats.size;
+                    
+                var tag = ext; //this covers most types
+                if( ext == mp3 ){
+                    tag = 'mpeg';
+                }else if( ext == 'oga'){
+                    tag = 'ogg';
+                }else if( ext == 'weba'){
+                    tag = 'webm';
+                }
+                
+                const blob = new Blob([data], { type: 'audio/' + tag });
+                const audioSrc = URL.createObjectURL(blob);
+            
+                AUDIO.player[player_id].src = audioSrc;
+            }
+
+        } catch (error) {
+            console.error('Error reading file:' + filePath + " " + error);
+        }
+        
     },
 
     html5audio_sound_play: function (player_id, multiplay, volume, speed, pan, offset) {

addons/ofxEmscripten/src/ofxAppEmscriptenWindow.cpp

@@ -47,7 +47,7 @@ void ofxAppEmscriptenWindow::setup(const ofGLESWindowSettings & settings){
 
     makeCurrent();
 
-    _renderer = make_shared<ofGLProgrammableRenderer>(this);
+    _renderer = std::make_shared<ofGLProgrammableRenderer>(this);
     ((ofGLProgrammableRenderer*)_renderer.get())->setup(2,0);
 
     emscripten_set_keydown_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW,this,1,&keydown_cb);

addons/ofxEmscripten/src/ofxEmscriptenSoundPlayer.cpp

@@ -37,15 +37,19 @@ ofxEmscriptenSoundPlayer::~ofxEmscriptenSoundPlayer(){
 	html5audio_sound_free(player_id);
 }
 
-bool ofxEmscriptenSoundPlayer::load(const std::filesystem::path& fileName, bool stream){
-	html5audio_sound_load(player_id, ofToDataPath(fileName).c_str());
+bool ofxEmscriptenSoundPlayer::load(const of::filesystem::path& filePath, bool stream){
+        auto soundFilePath = filePath.string();
+        if ( soundFilePath.substr(0, 7) != "http://" && soundFilePath.substr(0, 8) != "https://"){
+            soundFilePath = ofToDataPath(soundFilePath);
+	}
+	html5audio_sound_load(player_id, soundFilePath.c_str());
 	return true;
 }
 
-bool ofxEmscriptenSoundPlayer::load(const std::string& fileName, bool stream){
-	html5audio_sound_load(player_id, fileName.c_str());
-	return true;
-}
+//bool ofxEmscriptenSoundPlayer::load(const std::string& fileName, bool stream){
+//	html5audio_sound_load(player_id, fileName.c_str());
+//	return true;
+//}
 
 void ofxEmscriptenSoundPlayer::unload(){
 	html5audio_sound_free(player_id);

addons/ofxEmscripten/src/ofxEmscriptenSoundPlayer.h

@@ -8,8 +8,8 @@ class ofxEmscriptenSoundPlayer: public ofBaseSoundPlayer {
 	ofxEmscriptenSoundPlayer();
 	~ofxEmscriptenSoundPlayer();
 
-	bool load(const std::filesystem::path& fileName, bool stream = false);
-	bool load(const std::string& fileName, bool stream = false);
+	bool load(const of::filesystem::path& fileName, bool stream = false);
+//	bool load(const std::string& fileName, bool stream = false);
 	void unload();
 	void play();
 	void stop();

apps/devApps/random explorer/src/main.cpp

@@ -10,7 +10,7 @@ int main( ){
 
 	auto window = ofCreateWindow(settings);
 
-	ofRunApp(window, make_shared<ofApp>());
+	ofRunApp(window, std::make_shared<ofApp>());
 	ofRunMainLoop();
 
 }

examples/3d/3DPrimitivesExample/src/main.cpp

@@ -10,7 +10,7 @@ int main(){
 
 	auto window = ofCreateWindow(settings);
 
-	ofRunApp(window, make_shared<ofApp>());
+	ofRunApp(window, std::make_shared<ofApp>());
 	ofRunMainLoop();
 
 }

examples/3d/advanced3dExample/src/main.cpp

@@ -11,7 +11,7 @@ int main( ){
 
 	auto window = ofCreateWindow(settings);
 
-	ofRunApp(window, make_shared<ofApp>());
+	ofRunApp(window, std::make_shared<ofApp>());
 	ofRunMainLoop();
 
 }

examples/3d/assimp3DModelLoaderExample/src/main.cpp

@@ -12,7 +12,7 @@ int main( ){
 
     auto window = ofCreateWindow(settings);
 
-    ofRunApp(window, make_shared<ofApp>());
+    ofRunApp(window, std::make_shared<ofApp>());
     ofRunMainLoop();
 
 }