Sync with master

This commit is contained in:
cam900 2022-10-22 10:13:22 +09:00
parent 61aeb0bb5e
commit f714acc8a6
3 changed files with 12 additions and 13 deletions

View file

@ -95,8 +95,8 @@ class vox_core : public vgsound_emu_core
bool m_loop_saved = false; bool m_loop_saved = false;
}; };
static constexpr s8 m_index_table[8] = {-1, -1, -1, -1, 2, 4, 6, 8}; const s8 m_index_table[8] = {-1, -1, -1, -1, 2, 4, 6, 8};
static constexpr s32 m_step_table[49] = { const s32 m_step_table[49] = {
16, 17, 19, 21, 23, 25, 28, 31, 34, 37, 41, 45, 50, 55, 60, 66, 73, 16, 17, 19, 21, 23, 25, 28, 31, 34, 37, 41, 45, 50, 55, 60, 66, 73,
80, 88, 97, 107, 118, 130, 143, 157, 173, 190, 209, 230, 253, 279, 307, 337, 371, 80, 88, 97, 107, 118, 130, 143, 157, 173, 190, 209, 230, 253, 279, 307, 337, 371,
408, 449, 494, 544, 598, 658, 724, 796, 876, 963, 1060, 1166, 1282, 1411, 1552}; 408, 449, 494, 544, 598, 658, 724, 796, 876, 963, 1060, 1166, 1282, 1411, 1552};

View file

@ -33,7 +33,7 @@ class k053260_core : public vgsound_emu_core
friend class k053260_intf; // k053260 specific interface friend class k053260_intf; // k053260 specific interface
private: private:
static constexpr int pan_dir[8] = {-1, 0, 24, 35, 45, 55, 66, 90}; // pan direction const int pan_dir[8] = {-1, 0, 24, 35, 45, 55, 66, 90}; // pan direction
class voice_t : public vgsound_emu_core class voice_t : public vgsound_emu_core
{ {

View file

@ -23,16 +23,15 @@ class msm6295_core : public vox_core
private: private:
// Internal volume table, 9 step // Internal volume table, 9 step
static constexpr s32 m_volume_table[9] = { const s32 m_volume_table[9] = {32 /* 0.0dB */,
32 /* 0.0dB */, 22 /* -3.2dB */,
22 /* -3.2dB */, 16 /* -6.0dB */,
16 /* -6.0dB */, 11 /* -9.2dB */,
11 /* -9.2dB */, 8 /* -12.0dB */,
8 /* -12.0dB */, 6 /* -14.5dB */,
6 /* -14.5dB */, 4 /* -18.0dB */,
4 /* -18.0dB */, 3 /* -20.5dB */,
3 /* -20.5dB */, 2 /* -24.0dB */}; // scale out to 5 bit for optimization
2 /* -24.0dB */}; // scale out to 5 bit for optimization
// msm6295 voice classes // msm6295 voice classes
class voice_t : vox_decoder_t class voice_t : vox_decoder_t