diff --git a/audio/41525__Jamius__BigLaser.wav b/audio/41525__Jamius__BigLaser.wav deleted file mode 100644 index 81e5b52..0000000 Binary files a/audio/41525__Jamius__BigLaser.wav and /dev/null differ diff --git a/audio/bg_music.ogg b/audio/bg_music.ogg new file mode 100755 index 0000000..060c1a3 Binary files /dev/null and b/audio/bg_music.ogg differ diff --git a/audio/18979__bebeto__Loop008_acid.wav b/audio/bg_music.wav similarity index 100% rename from audio/18979__bebeto__Loop008_acid.wav rename to audio/bg_music.wav diff --git a/audio/big_laser.ogg b/audio/big_laser.ogg new file mode 100755 index 0000000..4afaa6a Binary files /dev/null and b/audio/big_laser.ogg differ diff --git a/audio/click.ogg b/audio/click.ogg new file mode 100644 index 0000000..812295c Binary files /dev/null and b/audio/click.ogg differ diff --git a/audio/explode.mp3 b/audio/explode.mp3 new file mode 100644 index 0000000..5317d24 Binary files /dev/null and b/audio/explode.mp3 differ diff --git a/audio/explode.ogg b/audio/explode.ogg new file mode 100755 index 0000000..39a67ab Binary files /dev/null and b/audio/explode.ogg differ diff --git a/audio/mp3-ogg.sh b/audio/mp3-ogg.sh new file mode 100755 index 0000000..822d0d1 --- /dev/null +++ b/audio/mp3-ogg.sh @@ -0,0 +1,9 @@ +#! /bin/bash + +mplayer -vo null -vc dummy -af resample=44100 -ao pcm:waveheader $1; +oggenc -m 256 audiodump.wav; +mv audiodump.ogg "`basename "$1" .mp3`.ogg"; +rm audiodump.wav; +chmod 755 "`basename "$1" .mp3`.ogg"; + +#ffmpeg -i "$1" -ab $(mplayer -frames 0 -identify "$1" 2>/dev/null | grep -m 1 'ID_AUDIO_BITRATE' | cut -d '=' -f 2) "${1%.mp3}.ogg" \ No newline at end of file diff --git a/css/style.css b/css/style.css index 1362a6a..b7c02c7 100644 --- a/css/style.css +++ b/css/style.css @@ -1,3 +1,11 @@ +#soundmanager-debug { + /* SM2 debug container (optional, use or customize this as you like - makes in-browser debug output more useable) */ + position:fixed;_position:absolute;right:1em;bottom:1em;width:50em;height:18em;overflow:auto;background:#fff;margin:1em;padding:1em;border:1px solid #999;font-family:monaco,"lucida console",verdana,tahoma,"sans serif";font-size:x-small;line-height:1.5em;opacity:0.9;filter:alpha(opacity=90);z-index: 1000; +} + +/* RESET CSS */ + + /* GOOGLE FONT */ .orbitron { font-family: 'Orbitron', serif; diff --git a/index.html b/index.html index 147230d..7e02c22 100644 --- a/index.html +++ b/index.html @@ -68,6 +68,8 @@ +
+