Unhide sound editor functions

OpenXRay · Jan 7, 2018 · 81635ed · 81635ed
1 parent e38762d
commit 81635ed
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 18 deletions.
diff --git a/src/xrSound/Sound.h b/src/xrSound/Sound.h
@@ -6,15 +6,6 @@
 #include "xrCore/_vector3d.h"
 #include "xrCommon/xr_vector.h" // DEFINE_VECTOR
 
-#ifdef __BORLANDC__
-#define XRSOUND_EDITOR_API XRSOUND_API
-
-// editor only refs
-class XRSOUND_EDITOR_API SoundEnvironment_LIB;
-#else
-#define XRSOUND_EDITOR_API
-#endif
-
 constexpr pcstr SNDENV_FILENAME = "sEnvironment.xr";
 #define OGG_COMMENT_VERSION 0x0003
 
@@ -25,6 +16,7 @@ class XRSOUND_API CSound_source;
 class XRSOUND_API CSound_emitter;
 class XRSOUND_API CSound_stream_interface;
 class XRSOUND_API CSound_environment;
+class XRSOUND_API SoundEnvironment_LIB; // editor only ref
 struct xr_token;
 class IReader;
 template <class T>
@@ -301,14 +293,13 @@ class XRSOUND_API CSound_manager_interface
 
     virtual void object_relcase(IGameObject* obj) = 0;
     virtual const Fvector& listener_position() = 0;
-#ifdef __BORLANDC__
+
     virtual SoundEnvironment_LIB* get_env_library() = 0;
     virtual void refresh_env_library() = 0;
     virtual void set_user_env(CSound_environment* E) = 0;
     virtual void refresh_sources() = 0;
     virtual void set_environment(u32 id, CSound_environment** dst_env) = 0;
     virtual void set_environment_size(CSound_environment* src_env, CSound_environment** dst_env) = 0;
-#endif
 };
 
 class CSound_manager_interface;

diff --git a/src/xrSound/SoundRender_Core.cpp b/src/xrSound/SoundRender_Core.cpp
@@ -561,7 +561,6 @@ void CSoundRender_Core::object_relcase(IGameObject* obj)
     }
 }
 
-#ifdef _EDITOR
 void CSoundRender_Core::set_user_env(CSound_environment* E)
 {
     if (0 == E && !bUserEnvironment)
@@ -625,4 +624,3 @@ void CSoundRender_Core::set_environment(u32 id, CSound_environment** dst_env)
         i_eax_listener_get(DE);
     }
 }
-#endif
diff --git a/src/xrSound/SoundRender_Core.h b/src/xrSound/SoundRender_Core.h
@@ -116,14 +116,13 @@ class CSoundRender_Core : public CSound_manager_interface
     void i_eax_listener_set(CSound_environment* E);
     void i_eax_listener_get(CSound_environment* E);
 
-#ifdef _EDITOR
     virtual SoundEnvironment_LIB* get_env_library() { return s_environment; }
     virtual void refresh_env_library();
     virtual void set_user_env(CSound_environment* E);
     virtual void refresh_sources();
     virtual void set_environment(u32 id, CSound_environment** dst_env);
     virtual void set_environment_size(CSound_environment* src_env, CSound_environment** dst_env);
-#endif
+
 public:
     CSoundRender_Source* i_create_source(pcstr name);
     void i_destroy_source(CSoundRender_Source* S);

diff --git a/src/xrSound/SoundRender_Environment.h b/src/xrSound/SoundRender_Environment.h
@@ -1,7 +1,7 @@
 #pragma once
 
 // refs
-class XRSOUND_EDITOR_API CSoundRender_Environment : public CSound_environment
+class XRSOUND_API CSoundRender_Environment : public CSound_environment
 {
 public:
     u32 version;
@@ -31,7 +31,7 @@ class XRSOUND_EDITOR_API CSoundRender_Environment : public CSound_environment
     void save(IWriter* fs);
 };
 
-class XRSOUND_EDITOR_API SoundEnvironment_LIB
+class XRSOUND_API SoundEnvironment_LIB
 {
 public:
     using SE_VEC = xr_vector<CSoundRender_Environment*>;

diff --git a/src/xrSound/SoundRender_Source.h b/src/xrSound/SoundRender_Source.h
@@ -5,7 +5,7 @@
 // refs
 struct OggVorbis_File;
 
-class XRSOUND_EDITOR_API CSoundRender_Source : public CSound_source
+class XRSOUND_API CSoundRender_Source : public CSound_source
 {
 public:
     shared_str pname;