Moved old NukedOPL to own namespace

This fixes linking issues on non-MSVC targets and improves code navigation
This commit is contained in:
alexey.lysiuk 2018-03-08 09:51:37 +02:00
parent 15138c38ca
commit 114e56b334
2 changed files with 11 additions and 1 deletions

View File

@ -62,6 +62,9 @@
// Envelope generator // Envelope generator
// //
namespace OPL3
{
typedef Bit16s(*envelope_sinfunc)(Bit16u phase, Bit16u envelope); typedef Bit16s(*envelope_sinfunc)(Bit16u phase, Bit16u envelope);
typedef void(*envelope_genfunc)(opl_slot *slott); typedef void(*envelope_genfunc)(opl_slot *slott);
@ -1017,6 +1020,8 @@ NukedOPL3::NukedOPL3(bool stereo) {
Reset(); Reset();
} }
} // namespace OPL3
OPLEmul *NukedOPL3Create(bool stereo) { OPLEmul *NukedOPL3Create(bool stereo) {
return new NukedOPL3(stereo); return new OPL3::NukedOPL3(stereo);
} }

View File

@ -32,6 +32,9 @@
#include "opl.h" #include "opl.h"
#include "musicblock.h" #include "musicblock.h"
namespace OPL3
{
typedef uintptr_t Bitu; typedef uintptr_t Bitu;
typedef intptr_t Bits; typedef intptr_t Bits;
typedef uint32_t Bit32u; typedef uint32_t Bit32u;
@ -233,3 +236,5 @@ public:
NukedOPL3(bool stereo); NukedOPL3(bool stereo);
}; };
} // namespace OPL3