Skip to content

Bugfix emscripten audio loading #7632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ofTheo merged 4 commits into from
Sep 5, 2023
Merged

Bugfix emscripten audio loading #7632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea7cc6c
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Sep 2, 2023
7fc0dcd
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Sep 3, 2023
8d3f2a9
fix audio loading from index.data for emscripten
ofTheo Sep 3, 2023
68d15b5
add more ext / mime types
ofTheo Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 35 additions & 1 deletion addons/ofxEmscripten/libs/html5audio/lib/emscripten/library_html5audio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
16 changes: 10 additions & 6 deletions addons/ofxEmscripten/src/ofxEmscriptenSoundPlayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions addons/ofxEmscripten/src/ofxEmscriptenSoundPlayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down