Audio|FluidSynth|FMOD: Make audio plugin entry points visible

skyjake · Sep 1, 2019 · f90b06c · f90b06c
1 parent e951f63
commit f90b06c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 41 deletions.
diff --git a/doomsday/apps/plugins/fluidsynth/include/driver_fluidsynth.h b/doomsday/apps/plugins/fluidsynth/include/driver_fluidsynth.h
@@ -35,18 +35,14 @@
 #include "api_console.h"
 #include "api_audiod_sfx.h"
 
-extern "C" {
-
-int     DS_Init(void);
-void    DS_Shutdown(void);
-void    DS_Event(int type);
-int     DS_Set(int prop, const void* ptr);
-
-}
-
-fluid_synth_t* DMFluid_Synth();
-fluid_audio_driver_t* DMFluid_Driver();
-audiointerface_sfx_generic_t* DMFluid_Sfx();
+DE_ENTRYPOINT   int     DS_Init(void);
+DE_ENTRYPOINT   void    DS_Shutdown(void);
+DE_ENTRYPOINT   void    DS_Event(int type);
+DE_ENTRYPOINT   int     DS_Set(int prop, const void* ptr);
+
+fluid_synth_t *                 DMFluid_Synth();
+fluid_audio_driver_t *          DMFluid_Driver();
+audiointerface_sfx_generic_t *  DMFluid_Sfx();
 
 #define MAX_SYNTH_GAIN      0.4f
 

diff --git a/doomsday/apps/plugins/fmod/include/driver_fmod.h b/doomsday/apps/plugins/fmod/include/driver_fmod.h
@@ -56,14 +56,10 @@
 #include <de/Log>
 #include "api_console.h"
 
-extern "C" {
-
-int     DS_Init(void);
-void    DS_Shutdown(void);
-void    DS_Event(int type);
-int     DS_Set(int prop, const void* ptr);
-
-}
+DE_ENTRYPOINT int  DS_Init(void);
+DE_ENTRYPOINT void DS_Shutdown(void);
+DE_ENTRYPOINT void DS_Event(int type);
+DE_ENTRYPOINT int  DS_Set(int prop, const void* ptr);
 
 #define DSFMOD_TRACE(args)  LOGDEV_AUDIO_XVERBOSE("[FMOD] ", args)
 

diff --git a/doomsday/apps/plugins/fmod/include/fmod_sfx.h b/doomsday/apps/plugins/fmod/include/fmod_sfx.h
@@ -44,26 +44,18 @@
 
 #include "api_audiod_sfx.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int             DS_SFX_Init(void);
-sfxbuffer_t*    DS_SFX_CreateBuffer(int flags, int bits, int rate);
-void            DS_SFX_DestroyBuffer(sfxbuffer_t* buf);
-void            DS_SFX_Load(sfxbuffer_t* buf, struct sfxsample_s* sample);
-void            DS_SFX_Reset(sfxbuffer_t* buf);
-void            DS_SFX_Play(sfxbuffer_t* buf);
-void            DS_SFX_Stop(sfxbuffer_t* buf);
-void            DS_SFX_Refresh(sfxbuffer_t* buf);
-void            DS_SFX_Set(sfxbuffer_t* buf, int prop, float value);
-void            DS_SFX_Setv(sfxbuffer_t* buf, int prop, float* values);
-void            DS_SFX_Listener(int prop, float value);
-void            DS_SFX_Listenerv(int prop, float* values);
-int             DS_SFX_Getv(int prop, void* values);
-
-#ifdef __cplusplus
-}
-#endif
+DE_ENTRYPOINT   int             DS_SFX_Init(void);
+DE_ENTRYPOINT   sfxbuffer_t*    DS_SFX_CreateBuffer(int flags, int bits, int rate);
+DE_ENTRYPOINT   void            DS_SFX_DestroyBuffer(sfxbuffer_t* buf);
+DE_ENTRYPOINT   void            DS_SFX_Load(sfxbuffer_t* buf, struct sfxsample_s* sample);
+DE_ENTRYPOINT   void            DS_SFX_Reset(sfxbuffer_t* buf);
+DE_ENTRYPOINT   void            DS_SFX_Play(sfxbuffer_t* buf);
+DE_ENTRYPOINT   void            DS_SFX_Stop(sfxbuffer_t* buf);
+DE_ENTRYPOINT   void            DS_SFX_Refresh(sfxbuffer_t* buf);
+DE_ENTRYPOINT   void            DS_SFX_Set(sfxbuffer_t* buf, int prop, float value);
+DE_ENTRYPOINT   void            DS_SFX_Setv(sfxbuffer_t* buf, int prop, float* values);
+DE_ENTRYPOINT   void            DS_SFX_Listener(int prop, float value);
+DE_ENTRYPOINT   void            DS_SFX_Listenerv(int prop, float* values);
+DE_ENTRYPOINT   int             DS_SFX_Getv(int prop, void* values);
 
 #endif /* end of include guard: __DSFMOD_SFX_H__ */