Max/kichikuou_system3-sdl2
1
0
Fork 0
mirror of https://github.com/kichikuou/system3-sdl2.git synced 2026-09-22 22:58:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix Y103 command (play_pcm)

Browse Source 
* The parameter is the number of times to loop, e.g. Y103,2: will play
  the sound twice. This still does not work on Windows because
  PlaySound() does not support specifying the loop count.
* Get AMSE data size from its header. This fixes audio glitch at the end
  of sounds.
This commit is contained in:
kichikuou
2025-03-04 15:59:22 +09:00
parent c0d8566dbd
commit d97d49dbe7
5 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/emscripten/mako.cpp
+5 -4
View File
@@ -100,7 +100,7 @@ void MAKO::get_mark(int* mark, int* loop)
}
}
void MAKO::play_pcm(int page, bool loop)
void MAKO::play_pcm(int page, int loops)
{
static const char header[44] = {
'R' , 'I' , 'F' , 'F' , 0x00, 0x00, 0x00, 0x00,
@@ -117,7 +117,8 @@ void MAKO::play_pcm(int page, bool loop)
std::vector<uint8_t> buffer = amse.load(page);
if (!buffer.empty()) {
// AMSE形式 (乙女戦記)
int samples = (buffer.size() - 12) * 2;
uint32_t amse_size = SDL_SwapLE32(*reinterpret_cast<uint32_t*>(&buffer[8]));
int samples = (amse_size - 12) * 2;
int total = samples + 0x24;
wav_buffer.resize(total + 8);
@@ -130,14 +131,14 @@ void MAKO::play_pcm(int page, bool loop)
wav_buffer[41] = (samples >> 8) & 0xff;
wav_buffer[42] = (samples >> 16) & 0xff;
wav_buffer[43] = (samples >> 24) & 0xff;
for (size_t i = 12, p = 44; i < buffer.size(); i++) {
for (uint32_t i = 12, p = 44; i < amse_size; i++) {
wav_buffer[p++] = buffer[i] & 0xf0;
wav_buffer[p++] = (buffer[i] & 0x0f) << 4;
}
}
}
if (muspcm_load_data(wav_buffer.data(), wav_buffer.size()))
EM_ASM({ xsystem35.audio.pcm_start(0, $0); }, loop ? 0 : 1);
EM_ASM({ xsystem35.audio.pcm_start(0, $0); }, loops);
}
void MAKO::stop_pcm() {
src/generic/mako.cpp
+6 -5
View File
@@ -185,7 +185,7 @@ void MAKO::get_mark(int* mark, int* loop)
midi->get_mark(mark, loop);
}
void MAKO::play_pcm(int page, bool loop)
void MAKO::play_pcm(int page, int loops)
{
static char header[44] = {
'R' , 'I' , 'F' , 'F' , 0x00, 0x00, 0x00, 0x00, 'W' , 'A' , 'V' , 'E' , 'f' , 'm' , 't' , ' ' ,
@@ -199,13 +199,14 @@ void MAKO::play_pcm(int page, bool loop)
if (!buffer.empty()) {
// WAV形式 (Only You)
mix_chunk = Mix_LoadWAV_RW(SDL_RWFromConstMem(buffer.data(), buffer.size()), 1 /* freesrc */);
Mix_PlayChannel(-1, mix_chunk, loop ? -1 : 0);
Mix_PlayChannel(-1, mix_chunk, loops ? loops : -1);
return;
}
buffer = amse.load(page);
if (!buffer.empty()) {
// AMSE形式 (乙女戦記)
int samples = (buffer.size() - 12) * 2;
uint32_t amse_size = SDL_SwapLE32(*reinterpret_cast<uint32_t*>(&buffer[8]));
int samples = (amse_size - 12) * 2;
int total = samples + 0x24;
uint8* wav = (uint8*)malloc(total + 8);
@@ -218,14 +219,14 @@ void MAKO::play_pcm(int page, bool loop)
wav[41] = (samples >> 8) & 0xff;
wav[42] = (samples >> 16) & 0xff;
wav[43] = (samples >> 24) & 0xff;
for (size_t i = 12, p = 44; i < buffer.size(); i++) {
for (uint32_t i = 12, p = 44; i < amse_size; i++) {
wav[p++] = buffer[i] & 0xf0;
wav[p++] = (buffer[i] & 0x0f) << 4;
}
mix_chunk = Mix_LoadWAV_RW(SDL_RWFromConstMem(wav, total + 8), 1 /* freesrc */);
free(wav);
Mix_PlayChannel(-1, mix_chunk, loop ? -1 : 0);
Mix_PlayChannel(-1, mix_chunk, loops ? loops : -1);
}
}
src/sys/mako.h
+1 -1
View File
@@ -35,7 +35,7 @@ public:
bool check_music();
void get_mark(int* mark, int* loop);
void play_pcm(int page, bool loop);
void play_pcm(int page, int loops);
void stop_pcm();
bool check_pcm();
src/sys/nact_sys3.cpp
+1 -1
View File
@@ -942,7 +942,7 @@ void NACT_Sys3::cmd_y()
break;
case 103:
if(pcm_index < MAX_PCM) {
mako->play_pcm(pcm[pcm_index], param ? false : true);
mako->play_pcm(pcm[pcm_index], param);
}
break;
case 104:
src/win/mako.cpp
+5 -4
View File
@@ -408,7 +408,7 @@ void MAKO::get_mark(int* mark, int* loop)
midi->get_mark(mark, loop);
}
void MAKO::play_pcm(int page, bool loop)
void MAKO::play_pcm(int page, int loops)
{
static char header[44] = {
'R' , 'I' , 'F' , 'F' , 0x00, 0x00, 0x00, 0x00, 'W' , 'A' , 'V' , 'E' , 'f' , 'm' , 't' , ' ' ,
@@ -424,7 +424,8 @@ void MAKO::play_pcm(int page, bool loop)
std::vector<uint8_t> buffer = amse.load(page);
if (!buffer.empty()) {
// AMSE形式 (乙女戦記)
int samples = (static_cast<int>(buffer.size()) - 12) * 2;
uint32_t amse_size = SDL_SwapLE32(*reinterpret_cast<uint32_t*>(&buffer[8]));
int samples = (static_cast<int>(amse_size) - 12) * 2;
int total = samples + 0x24;
wav_buffer.resize(total + 8);
@@ -437,13 +438,13 @@ void MAKO::play_pcm(int page, bool loop)
wav_buffer[41] = (samples >> 8) & 0xff;
wav_buffer[42] = (samples >> 16) & 0xff;
wav_buffer[43] = (samples >> 24) & 0xff;
for (size_t i = 12, p = 44; i < buffer.size(); i++) {
for (uint32_t i = 12, p = 44; i < amse_size; i++) {
wav_buffer[p++] = buffer[i] & 0xf0;
wav_buffer[p++] = (buffer[i] & 0x0f) << 4;
}
}
}
PlaySound((LPCTSTR)wav_buffer.data(), NULL, SND_ASYNC | SND_MEMORY | (loop ? SND_LOOP : 0));
PlaySound((LPCTSTR)wav_buffer.data(), NULL, SND_ASYNC | SND_MEMORY | (loops ? 0 : SND_LOOP));
}
void MAKO::stop_pcm()