FMOD|FluidSynth: Import the public Con API

skyjake · Jan 4, 2013 · 82d6152 · 82d6152
1 parent 4c24f18
commit 82d6152
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/doomsday/plugins/fluidsynth/include/driver_fluidsynth.h b/doomsday/plugins/fluidsynth/include/driver_fluidsynth.h
@@ -31,6 +31,7 @@
 #include <cassert>
 #include <iostream>
 #include <fluidsynth.h>
+#include "api_console.h"
 #include "api_audiod_sfx.h"
 
 extern "C" {
@@ -56,4 +57,6 @@ audiointerface_sfx_generic_t* DMFluid_Sfx();
 
 #include "fluidsynth_music.h"
 
+DENG_USING_API(Con);
+
 #endif /* end of include guard: __DSFLUIDSYNTH_DRIVER_H__ */
diff --git a/doomsday/plugins/fluidsynth/src/driver_fluidsynth.cpp b/doomsday/plugins/fluidsynth/src/driver_fluidsynth.cpp
@@ -162,7 +162,13 @@ int DS_Set(int prop, const void* ptr)
  * Declares the type of the plugin so the engine knows how to treat it. Called
  * automatically when the plugin is loaded.
  */
-extern "C" const char* deng_LibraryType(void)
+DENG_EXTERN_C const char* deng_LibraryType(void)
 {
     return "deng-plugin/audio";
 }
+
+DENG_DECLARE_API(Con);
+
+DENG_API_EXCHANGE(
+    DENG_GET_API(DE_API_CONSOLE, Con);
+)
diff --git a/doomsday/plugins/fmod/include/driver_fmod.h b/doomsday/plugins/fmod/include/driver_fmod.h
@@ -53,6 +53,7 @@
 #include <stdio.h>
 #include <cassert>
 #include <iostream>
+#include "api_console.h"
 
 extern "C" {
 
@@ -81,4 +82,6 @@ extern FMOD::System* fmodSystem;
 #include "fmod_cd.h"
 #include "fmod_util.h"
 
+DENG_USING_API(Con);
+
 #endif /* end of include guard: __DSFMOD_DRIVER_H__ */
diff --git a/doomsday/plugins/fmod/src/driver_fmod.cpp b/doomsday/plugins/fmod/src/driver_fmod.cpp
@@ -193,7 +193,13 @@ int DS_Set(int prop, const void* ptr)
  * Declares the type of the plugin so the engine knows how to treat it. Called
  * automatically when the plugin is loaded.
  */
-extern "C" const char* deng_LibraryType(void)
+DENG_EXTERN_C const char* deng_LibraryType(void)
 {
     return "deng-plugin/audio";
 }
+
+DENG_DECLARE_API(Con);
+
+DENG_API_EXCHANGE(
+    DENG_GET_API(DE_API_CONSOLE, Con);
+)