diff --git a/soundfont-generator/inc/base64.js b/soundfont-generator/inc/gen-base64.js similarity index 54% rename from soundfont-generator/inc/base64.js rename to soundfont-generator/inc/gen-base64.js index 468a896..f40e241 100644 --- a/soundfont-generator/inc/base64.js +++ b/soundfont-generator/inc/gen-base64.js @@ -1,7 +1,5 @@ var fs = require('fs'); var file = process.argv[2]; - fs.readFile(file, 'binary', function(err, data) { - var base64 = new Buffer(data, 'binary').toString('base64'); - console.log(base64); + console.log(new Buffer(data, 'binary').toString('base64')); }); \ No newline at end of file diff --git a/soundfont-generator/sf2-piano.js b/soundfont-generator/inc/gen-midi.js similarity index 98% rename from soundfont-generator/sf2-piano.js rename to soundfont-generator/inc/gen-midi.js index a49fa9a..f7a7414 100644 --- a/soundfont-generator/sf2-piano.js +++ b/soundfont-generator/inc/gen-midi.js @@ -2,14 +2,13 @@ Soundfont Builder : 0.1 */ -/// window = {}; // create fake window atob = require('atob'); btoa = require('btoa'); http = require('http'); fs = require('fs'); /// -require('./inc/jsmidi.js'); +require('./jsmidi.js'); ////////////// diff --git a/soundfont-generator/inc/jsmidi.js b/soundfont-generator/inc/jsmidi.js index 212fda7..dd6e4c3 100644 --- a/soundfont-generator/inc/jsmidi.js +++ b/soundfont-generator/inc/jsmidi.js @@ -1,9 +1,7 @@ /* - JSMIDI --------- https://github.com/sergi/jsmidi - */ (function (window) { diff --git a/soundfont-generator/sf2-piano.sh b/soundfont-generator/sf2-piano.sh index 827dedb..0eb8c0a 100755 --- a/soundfont-generator/sf2-piano.sh +++ b/soundfont-generator/sf2-piano.sh @@ -36,7 +36,7 @@ JSHEADER="{" JSFOOTER="}" # create MIDI files for audible notes -node "./sf2-piano.js" +node "./inc/gen-midi.js" # write the headers if [ $OGG -eq 1 ]; then @@ -57,7 +57,7 @@ find $MIDIDIR -name '*.midi' -print0 | while read -d $'\0' file ./inc/oggenc -m 32 -M 64 "$file.wav" mv "$file.ogg" "$OGGFILE" # from OGG to base64 embedded in Javascript - JSCONTENT="\"`basename \"${file%.midi}\"`\": \"data:audio/ogg;base64,`node ./inc/base64.js \"$OGGFILE\"`\"," + JSCONTENT="\"`basename \"${file%.midi}\"`\": \"data:audio/ogg;base64,`node ./inc/gen-base64.js \"$OGGFILE\"`\"," if [ $SINGLE -eq 1 ]; then echo $JSHEADER > "$OGGFILE.js" echo $JSCONTENT >> "$OGGFILE.js" @@ -77,7 +77,7 @@ find $MIDIDIR -name '*.midi' -print0 | while read -d $'\0' file MP3FILE=`echo "${file%.midi}.mp3"` ./inc/lame -v -b 8 -B 32 "$file.wav" "$MP3FILE" # from MP3 to base64 embedded in Javascript - JSCONTENT="\"`basename \"${file%.midi}\"`\": \"data:audio/mpeg;base64,`node ./inc/base64.js \"$MP3FILE\"`\"," + JSCONTENT="\"`basename \"${file%.midi}\"`\": \"data:audio/mpeg;base64,`node ./inc/gen-base64.js \"$MP3FILE\"`\"," if [ $SINGLE -eq 1 ]; then echo $JSHEADER > "$MP3FILE.js" echo $JSCONTENT >> "$MP3FILE.js"