TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Factor out sound_function_table_t where possible

Browse source 
Move it to namespace dcx when this does not cause a dcx->dsx dependency.
This commit is contained in:
Kp 2020-05-31 23:04:25 +00:00
parent d06ad449b8
commit 2e1e142767
2 changed files with 102 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/digi.h
View file

@ -41,6 +41,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
namespace dcx {
struct sound_object;
extern int digi_volume;
}
namespace dsx {
@ -135,7 +136,6 @@ extern void digi_start_sound_queued( short soundnum, fix volume );
#define SOUND_MAX_VOLUME F1_0 / 2
extern int digi_volume;
#if defined(DXX_BUILD_DESCENT_I)
extern int digi_sample_rate;
#endif

161
similar/arch/sdl/digi.cpp
View file

@ -33,13 +33,30 @@
#include "hmp.h"
#endif
namespace dsx {
namespace dcx {
#ifndef __PIE__
int digi_volume = SOUND_MAX_VOLUME;
/* The values for these three defines are arbitrary and can be changed,
* provided that they remain unique with respect to each other.
*/
#define DXX_STS_MIXER_WITH_POINTER 0
#define DXX_STS_MIXER_WITH_COPY 1
#define DXX_STS_NO_MIXER 2
#if DXX_USE_SDLMIXER
#ifndef DXX_SOUND_TABLE_STYLE
#ifdef __PIE__
/* PIE -> paranoid checks
* No PIE -> prefer speed
*/
#define DXX_COPY_SOUND_TABLE
#define DXX_SOUND_TABLE_STYLE DXX_STS_MIXER_WITH_POINTER
#else
#define DXX_SOUND_TABLE_STYLE DXX_STS_MIXER_WITH_COPY
#endif
#endif
#else
#define DXX_SOUND_TABLE_STYLE DXX_STS_NO_MIXER
#endif
/* Sound system function pointers */
@ -63,6 +80,86 @@ struct sound_function_table_t
void (*set_digi_volume)(int);
};
#if DXX_SOUND_TABLE_STYLE == DXX_STS_MIXER_WITH_POINTER
[[noreturn]]
__attribute_cold
void report_invalid_table()
{
/* Out of line due to length of generated code */
throw std::logic_error("invalid sound table pointer");
}
#endif
}
}
#if DXX_SOUND_TABLE_STYLE == DXX_STS_MIXER_WITH_POINTER
namespace dsx
#else
namespace dcx
#endif
{
namespace {
class sound_function_pointers_t
{
#if DXX_SOUND_TABLE_STYLE == DXX_STS_MIXER_WITH_COPY
sound_function_table_t table;
#elif DXX_SOUND_TABLE_STYLE == DXX_STS_MIXER_WITH_POINTER
const sound_function_table_t *table;
#endif
public:
inline const sound_function_table_t *operator->();
inline sound_function_pointers_t &operator=(const sound_function_table_t &t);
};
#if DXX_SOUND_TABLE_STYLE == DXX_STS_MIXER_WITH_COPY
const sound_function_table_t *sound_function_pointers_t::operator->()
{
return &table;
}
sound_function_pointers_t &sound_function_pointers_t::operator=(const sound_function_table_t &t)
{
table = t;
return *this;
}
#elif DXX_SOUND_TABLE_STYLE == DXX_STS_MIXER_WITH_POINTER
sound_function_pointers_t &sound_function_pointers_t::operator=(const sound_function_table_t &t)
{
table = &t;
/* Trap bad initial assignment */
operator->();
return *this;
}
#elif DXX_SOUND_TABLE_STYLE == DXX_STS_NO_MIXER
const sound_function_table_t *sound_function_pointers_t::operator->()
{
return &digi_audio_table;
}
sound_function_pointers_t &sound_function_pointers_t::operator=(const sound_function_table_t &)
{
return *this;
}
#endif
}
static sound_function_pointers_t fptr;
}
namespace dsx {
namespace {
/* Some of the functions are in dsx, so the definition and
* initializer must be in dsx.
*/
#if DXX_USE_SDLMIXER
constexpr sound_function_table_t digi_mixer_table{
&digi_mixer_init,
@ -97,72 +194,17 @@ constexpr sound_function_table_t digi_audio_table{
&digi_audio_set_digi_volume,
};
class sound_function_pointers_t
{
#if DXX_USE_SDLMIXER
#ifdef DXX_COPY_SOUND_TABLE
sound_function_table_t table;
#else
const sound_function_table_t *table;
#endif
#endif
public:
__attribute_cold
void report_invalid_table() __noreturn;
inline const sound_function_table_t *operator->();
inline sound_function_pointers_t &operator=(const sound_function_table_t &t);
};
#if DXX_USE_SDLMIXER
#ifdef DXX_COPY_SOUND_TABLE
const sound_function_table_t *sound_function_pointers_t::operator->()
{
return &table;
}
sound_function_pointers_t &sound_function_pointers_t::operator=(const sound_function_table_t &t)
{
table = t;
return *this;
}
#else
void sound_function_pointers_t::report_invalid_table()
{
/* Out of line due to length of generated code */
throw std::logic_error("invalid table");
}
#if DXX_SOUND_TABLE_STYLE == DXX_STS_MIXER_WITH_POINTER
const sound_function_table_t *sound_function_pointers_t::operator->()
{
if (table != &digi_audio_table && table != &digi_mixer_table)
report_invalid_table();
return table;
}
sound_function_pointers_t &sound_function_pointers_t::operator=(const sound_function_table_t &t)
{
table = &t;
/* Trap bad initial assignment */
operator->();
return *this;
}
#endif
#else
const sound_function_table_t *sound_function_pointers_t::operator->()
{
return &digi_audio_table;
}
sound_function_pointers_t &sound_function_pointers_t::operator=(const sound_function_table_t &)
{
return *this;
}
#endif
}
static sound_function_pointers_t fptr;
void digi_select_system()
{
#if DXX_USE_SDLMIXER
@ -182,7 +224,6 @@ void digi_select_system()
#if defined(DXX_BUILD_DESCENT_I)
int digi_sample_rate = SAMPLE_RATE_11K;
#endif
int digi_volume = SOUND_MAX_VOLUME;
/* Stub functions */