Fix compiler warnings with shadowed declarations
Merge pull request #3 from teragonaudio/unshadowing

Fix compiler warnings with shadowed declarations