diff --git a/annotations/src/main/java/io/anuke/annotations/AssetsAnnotationProcessor.java b/annotations/src/main/java/io/anuke/annotations/AssetsAnnotationProcessor.java index 32bd471288..6fed3137de 100644 --- a/annotations/src/main/java/io/anuke/annotations/AssetsAnnotationProcessor.java +++ b/annotations/src/main/java/io/anuke/annotations/AssetsAnnotationProcessor.java @@ -80,7 +80,7 @@ public class AssetsAnnotationProcessor extends AbstractProcessor{ } load.addStatement(name + " = io.anuke.arc.Core.audio."+loadMethod+"(io.anuke.arc.Core.files.internal(io.anuke.arc.Core.app.getType() != io.anuke.arc.Application.ApplicationType.iOS ? $S : $S))", - path.substring(path.lastIndexOf("/") + 1) + "/" + fname, (path.substring(path.lastIndexOf("/") + 1) + "/" + fname).replace(".ogg", ".caf")); + path.substring(path.lastIndexOf("/") + 1) + "/" + fname, (path.substring(path.lastIndexOf("/") + 1) + "/" + fname).replace(".ogg", ".mp3")); dispose.addStatement(name + ".dispose()"); dispose.addStatement(name + " = null"); type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new io.anuke.arc.audio.mock.Mock" + rtype.substring(rtype.lastIndexOf(".") + 1)+ "()").build()); diff --git a/ios/convert_audio.sh b/ios/convert_audio.sh index c4772fadc3..8e27eb60df 100755 --- a/ios/convert_audio.sh +++ b/ios/convert_audio.sh @@ -1,7 +1,15 @@ #!/usr/bin/bash -#convert ogg to .caf files for iOS -for i in $1/*.ogg; do +cd $1 + +#convert ogg to .mp3 files for iOS +for i in *.ogg; do echo $i - ffmpeg -i "$i" "${i%.*}.caf" -done \ No newline at end of file + ffmpeg -i "$i" "OUT_${i%.*}.mp3" +done + +find . -type f ! -name "OUT_*" -delete + +for file in OUT_*; do mv "$file" "${file#OUT_}"; done; + +cd ../../