|
|
| version 1.18, 2011/12/24 17:50:44 | version 1.19, 2012/01/23 03:55:39 |
|---|---|
| Line 852 sdlaudio_init(UINT rate, UINT samples) | Line 852 sdlaudio_init(UINT rate, UINT samples) |
| fmt.channels = 2; | fmt.channels = 2; |
| fmt.samples = samples; | fmt.samples = samples; |
| fmt.callback = sdlaudio_callback; | fmt.callback = sdlaudio_callback; |
| fmt.userdata = (void *)(samples * 2 * sizeof(SINT16)); | fmt.userdata = UINT32_TO_PTR(samples * 2 * sizeof(SINT16)); |
| rv = SDL_InitSubSystem(SDL_INIT_AUDIO); | rv = SDL_InitSubSystem(SDL_INIT_AUDIO); |
| if (rv < 0) { | if (rv < 0) { |
| Line 931 sdlmixer_init(UINT rate, UINT samples) | Line 931 sdlmixer_init(UINT rate, UINT samples) |
| goto failure1; | goto failure1; |
| } | } |
| Mix_HookMusic(sdlaudio_callback, (void*)(samples * 2 * sizeof(SINT16))); | Mix_HookMusic(sdlaudio_callback, |
| UINT32_TO_PTR(samples * 2 * sizeof(SINT16))); | |
| return SUCCESS; | return SUCCESS; |
| Line 1040 sdlaudio_stop(void) | Line 1041 sdlaudio_stop(void) |
| static void | static void |
| sdlaudio_callback(void *userdata, unsigned char *stream, int len) | sdlaudio_callback(void *userdata, unsigned char *stream, int len) |
| { | { |
| UINT samples = (UINT)userdata; | UINT samples = PTR_TO_UINT32(userdata); |
| int nextbuf = sound_nextbuf; | int nextbuf = sound_nextbuf; |
| if (sound_event != NULL) | if (sound_event != NULL) |