Skip to content

Commit 81635ed

Browse files
committed
Unhide sound editor functions
1 parent e38762d commit 81635ed

File tree

5 files changed

+6
-18
lines changed

5 files changed

+6
-18
lines changed

src/xrSound/Sound.h

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@
66
#include "xrCore/_vector3d.h"
77
#include "xrCommon/xr_vector.h" // DEFINE_VECTOR
88

9-
#ifdef __BORLANDC__
10-
#define XRSOUND_EDITOR_API XRSOUND_API
11-
12-
// editor only refs
13-
class XRSOUND_EDITOR_API SoundEnvironment_LIB;
14-
#else
15-
#define XRSOUND_EDITOR_API
16-
#endif
17-
189
constexpr pcstr SNDENV_FILENAME = "sEnvironment.xr";
1910
#define OGG_COMMENT_VERSION 0x0003
2011

@@ -25,6 +16,7 @@ class XRSOUND_API CSound_source;
2516
class XRSOUND_API CSound_emitter;
2617
class XRSOUND_API CSound_stream_interface;
2718
class XRSOUND_API CSound_environment;
19+
class XRSOUND_API SoundEnvironment_LIB; // editor only ref
2820
struct xr_token;
2921
class IReader;
3022
template <class T>
@@ -301,14 +293,13 @@ class XRSOUND_API CSound_manager_interface
301293

302294
virtual void object_relcase(IGameObject* obj) = 0;
303295
virtual const Fvector& listener_position() = 0;
304-
#ifdef __BORLANDC__
296+
305297
virtual SoundEnvironment_LIB* get_env_library() = 0;
306298
virtual void refresh_env_library() = 0;
307299
virtual void set_user_env(CSound_environment* E) = 0;
308300
virtual void refresh_sources() = 0;
309301
virtual void set_environment(u32 id, CSound_environment** dst_env) = 0;
310302
virtual void set_environment_size(CSound_environment* src_env, CSound_environment** dst_env) = 0;
311-
#endif
312303
};
313304

314305
class CSound_manager_interface;

src/xrSound/SoundRender_Core.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,6 @@ void CSoundRender_Core::object_relcase(IGameObject* obj)
561561
}
562562
}
563563

564-
#ifdef _EDITOR
565564
void CSoundRender_Core::set_user_env(CSound_environment* E)
566565
{
567566
if (0 == E && !bUserEnvironment)
@@ -625,4 +624,3 @@ void CSoundRender_Core::set_environment(u32 id, CSound_environment** dst_env)
625624
i_eax_listener_get(DE);
626625
}
627626
}
628-
#endif

src/xrSound/SoundRender_Core.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,13 @@ class CSoundRender_Core : public CSound_manager_interface
116116
void i_eax_listener_set(CSound_environment* E);
117117
void i_eax_listener_get(CSound_environment* E);
118118

119-
#ifdef _EDITOR
120119
virtual SoundEnvironment_LIB* get_env_library() { return s_environment; }
121120
virtual void refresh_env_library();
122121
virtual void set_user_env(CSound_environment* E);
123122
virtual void refresh_sources();
124123
virtual void set_environment(u32 id, CSound_environment** dst_env);
125124
virtual void set_environment_size(CSound_environment* src_env, CSound_environment** dst_env);
126-
#endif
125+
127126
public:
128127
CSoundRender_Source* i_create_source(pcstr name);
129128
void i_destroy_source(CSoundRender_Source* S);

src/xrSound/SoundRender_Environment.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
// refs
4-
class XRSOUND_EDITOR_API CSoundRender_Environment : public CSound_environment
4+
class XRSOUND_API CSoundRender_Environment : public CSound_environment
55
{
66
public:
77
u32 version;
@@ -31,7 +31,7 @@ class XRSOUND_EDITOR_API CSoundRender_Environment : public CSound_environment
3131
void save(IWriter* fs);
3232
};
3333

34-
class XRSOUND_EDITOR_API SoundEnvironment_LIB
34+
class XRSOUND_API SoundEnvironment_LIB
3535
{
3636
public:
3737
using SE_VEC = xr_vector<CSoundRender_Environment*>;

src/xrSound/SoundRender_Source.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// refs
66
struct OggVorbis_File;
77

8-
class XRSOUND_EDITOR_API CSoundRender_Source : public CSound_source
8+
class XRSOUND_API CSoundRender_Source : public CSound_source
99
{
1010
public:
1111
shared_str pname;

0 commit comments

Comments
 (0)