scratchfoundation/scratchjr
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratchjr.git synced 2024-11-28 18:15:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

add support to handle mp3 sound

Browse source
This commit is contained in:
Yueyu 2021-10-11 08:15:50 +08:00
parent d32d2214e7
commit d656f28ca8
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/ScratchJr/app/src/main/java/org/scratchjr/android/IOManager.java
View file

@ -324,7 +324,7 @@ public class IOManager {
if (entry == null) { if (entry == null) {
continue; continue;
} }
if (!(entry.endsWith(".png") || entry.endsWith(".wav") || entry.endsWith(".svg"))) { if (!(entry.endsWith(".png") || entry.endsWith(".wav") || entry.endsWith(".mp3") || entry.endsWith(".svg"))) {
continue; continue;
} }
// copy file to target file // copy file to target file

2
ios/ScratchJr/src/IO.m
View file

@ -332,7 +332,7 @@ NSMutableDictionary *soundtimers;
NSString *path; NSString *path;
while ((path = [enumerator nextObject]) != nil) { while ((path = [enumerator nextObject]) != nil) {
// we are only interested in images and sounds // we are only interested in images and sounds
if ([path hasSuffix:@".png"] || [path hasSuffix:@".wav"] || [path hasSuffix:@".svg"]) { if ([path hasSuffix:@".png"] || [path hasSuffix:@".wav"] || [path hasSuffix:@".mp3"] || [path hasSuffix:@".svg"]) {
NSString *fileName = [path lastPathComponent]; NSString *fileName = [path lastPathComponent];
// extract file // extract file
NSString *toPath = [[IO getpath] stringByAppendingPathComponent:fileName]; NSString *toPath = [[IO getpath] stringByAppendingPathComponent:fileName];

2
src/utils/ScratchAudio.js
View file

@ -86,7 +86,7 @@ export default class ScratchAudio {
var dir = ''; var dir = '';
if (!isAndroid) { if (!isAndroid) {
if (md5.indexOf('/') > -1) dir = 'HTML5/'; if (md5.indexOf('/') > -1) dir = 'HTML5/';
else if (md5.indexOf('wav') > -1) dir = 'Documents'; else if (md5.indexOf('wav') > -1 || md5.indexOf('mp3') > -1) dir = 'Documents';
} }
ScratchAudio.loadFromLocal(dir, md5, fcn); ScratchAudio.loadFromLocal(dir, md5, fcn);
} }