diff options
| author | Chris Robinson <[email protected]> | 2012-10-31 22:38:27 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2012-10-31 22:38:27 -0700 |
| commit | 6450d0cbcad5afb314af8b26bdfc634d22158687 (patch) | |
| tree | 09f42652cbe444434bb12367148122eddf8bc8f2 | |
| parent | 4e281350a017f35dd4c4141a20de5e5d88316e32 (diff) | |
Avoid prefixing function pointers in the streaming example
| -rw-r--r-- | examples/alstream.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/examples/alstream.c b/examples/alstream.c index a8447eae..4ed8299d 100644 --- a/examples/alstream.c +++ b/examples/alstream.c @@ -38,8 +38,8 @@ #include "common/alffmpeg.h" -LPALBUFFERSAMPLESSOFT palBufferSamplesSOFT = wrap_BufferSamples; -LPALISBUFFERFORMATSUPPORTEDSOFT palIsBufferFormatSupportedSOFT = NULL; +LPALBUFFERSAMPLESSOFT alBufferSamplesSOFT = wrap_BufferSamples; +LPALISBUFFERFORMATSUPPORTEDSOFT alIsBufferFormatSupportedSOFT = NULL; /* Define the number of buffers and buffer size (in samples) to use. 4 buffers @@ -144,7 +144,7 @@ static int OpenPlayerFile(StreamPlayer *player, const char *filename) goto error; } - player->format = GetFormat(player->channels, player->type, palIsBufferFormatSupportedSOFT); + player->format = GetFormat(player->channels, player->type, alIsBufferFormatSupportedSOFT); if(player->format == 0) { fprintf(stderr, "Unsupported format (%s, %s) for %s\n", @@ -203,9 +203,9 @@ static int StartPlayer(StreamPlayer *player) got = readAVAudioData(player->stream, player->data, player->datasize); if(got == 0) break; - palBufferSamplesSOFT(player->buffers[i], player->rate, player->format, - BytesToFrames(got, player->channels, player->type), - player->channels, player->type, player->data); + alBufferSamplesSOFT(player->buffers[i], player->rate, player->format, + BytesToFrames(got, player->channels, player->type), + player->channels, player->type, player->data); } if(alGetError() != AL_NO_ERROR) { @@ -252,9 +252,9 @@ static int UpdatePlayer(StreamPlayer *player) got = readAVAudioData(player->stream, player->data, player->datasize); if(got > 0) { - palBufferSamplesSOFT(bufid, player->rate, player->format, - BytesToFrames(got, player->channels, player->type), - player->channels, player->type, player->data); + alBufferSamplesSOFT(bufid, player->rate, player->format, + BytesToFrames(got, player->channels, player->type), + player->channels, player->type, player->data); alSourceQueueBuffers(player->source, 1, &bufid); } if(alGetError() != AL_NO_ERROR) @@ -304,8 +304,8 @@ int main(int argc, char **argv) if(alIsExtensionPresent("AL_SOFT_buffer_samples")) { printf("AL_SOFT_buffer_samples supported!\n"); - palBufferSamplesSOFT = alGetProcAddress("alBufferSamplesSOFT"); - palIsBufferFormatSupportedSOFT = alGetProcAddress("alIsBufferFormatSupportedSOFT"); + alBufferSamplesSOFT = alGetProcAddress("alBufferSamplesSOFT"); + alIsBufferFormatSupportedSOFT = alGetProcAddress("alIsBufferFormatSupportedSOFT"); } else printf("AL_SOFT_buffer_samples not supported\n"); |