More audio output work. Still fixing SWIG issues.