This reverts commit 58fbb463. # Conflicts: # src/android/i_sound.c # src/dummy/i_sound.c # src/win32/win_snd.c