Fixed compiling SDL_fsaudio.c against fusionsound 1.0.0
authorCouriersud <couriersud@arcor.de>
Mon, 03 Aug 2009 18:07:31 +0000
changeset 3230816a7a65a59a
parent 3229 09172593e9b6
child 3231 cf1ec33ae056
Fixed compiling SDL_fsaudio.c against fusionsound 1.0.0
src/audio/fusionsound/SDL_fsaudio.c
     1.1 --- a/src/audio/fusionsound/SDL_fsaudio.c	Sun Aug 02 20:45:11 2009 +0000
     1.2 +++ b/src/audio/fusionsound/SDL_fsaudio.c	Mon Aug 03 18:07:31 2009 +0000
     1.3 @@ -34,6 +34,8 @@
     1.4  #include "../SDL_audio_c.h"
     1.5  #include "SDL_fsaudio.h"
     1.6  
     1.7 +#include <fusionsound/fusionsound_version.h>
     1.8 +
     1.9  //#define SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC "libfusionsound.so"
    1.10  
    1.11  #ifdef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC
    1.12 @@ -43,6 +45,10 @@
    1.13  #define SDL_NAME(X)	X
    1.14  #endif
    1.15  
    1.16 +#if (FUSIONSOUND_MAJOR_VERSION == 1) && (FUSIONSOUND_MINOR_VERSION < 1)
    1.17 +typedef DFBResult DirectResult;
    1.18 +#endif
    1.19 +
    1.20  /* The tag name used by fusionsoundc audio */
    1.21  #define SDL_FS_DRIVER_NAME         "fusionsound"
    1.22  /* Buffers to use - more than 2 gives a lot of latency */
    1.23 @@ -53,8 +59,8 @@
    1.24  static const char *fs_library = SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC;
    1.25  static void *fs_handle = NULL;
    1.26  
    1.27 -static DirectResult(*SDL_NAME(FusionSoundInit)) (int *argc, char *(*argv[]));
    1.28 -static DirectResult(*SDL_NAME(FusionSoundCreate)) (IFusionSound **
    1.29 +static DirectResult (*SDL_NAME(FusionSoundInit)) (int *argc, char *(*argv[]));
    1.30 +static DirectResult (*SDL_NAME(FusionSoundCreate)) (IFusionSound **
    1.31                                                     ret_interface);
    1.32  
    1.33  #define SDL_FS_SYM(x) { #x, (void **) (char *) &SDL_NAME(x) }