otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Y8950: fix ADPCM chan osc

Browse source
This commit is contained in:
tildearrow 2025-04-08 02:12:28 -05:00
parent 032ff82955
commit a2c745cb10
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/engine/platform/opl.cpp
View file

@ -188,7 +188,7 @@ void DivPlatformOPL::acquire_nuked(short** buf, size_t len) {
thread_local ymfm::ymfm_output<2> aOut; thread_local ymfm::ymfm_output<2> aOut;
thread_local short pcmBuf[24]; thread_local short pcmBuf[24];
for (int i=0; i<totalChans; i++) { for (int i=0; i<MAX(adpcmChan+1,totalChans); i++) {
oscBuf[i]->begin(len); oscBuf[i]->begin(len);
} }
@ -349,7 +349,7 @@ void DivPlatformOPL::acquire_nuked(short** buf, size_t len) {
} }
} }
for (int i=0; i<totalChans; i++) { for (int i=0; i<MAX(adpcmChan+1,totalChans); i++) {
oscBuf[i]->end(len); oscBuf[i]->end(len);
} }
} }
@ -471,7 +471,7 @@ void DivPlatformOPL::acquire_ymfm8950(short** buf, size_t len) {
fmChan[i]=fme->debug_channel(i); fmChan[i]=fme->debug_channel(i);
} }
for (int i=0; i<totalChans; i++) { for (int i=0; i<totalChans+1; i++) {
oscBuf[i]->begin(len); oscBuf[i]->begin(len);
} }
@ -502,16 +502,16 @@ void DivPlatformOPL::acquire_ymfm8950(short** buf, size_t len) {
oscBuf[8]->putSample(h,CLAMP(fmChan[8]->debug_special1()<<2,-32768,32767)); oscBuf[8]->putSample(h,CLAMP(fmChan[8]->debug_special1()<<2,-32768,32767));
oscBuf[9]->putSample(h,CLAMP(fmChan[8]->debug_special2()<<2,-32768,32767)); oscBuf[9]->putSample(h,CLAMP(fmChan[8]->debug_special2()<<2,-32768,32767));
oscBuf[10]->putSample(h,CLAMP(fmChan[7]->debug_special2()<<2,-32768,32767)); oscBuf[10]->putSample(h,CLAMP(fmChan[7]->debug_special2()<<2,-32768,32767));
oscBuf[11]->putSample(h,CLAMP(abe->get_last_out(0),-32768,32767)); oscBuf[11]->putSample(h,CLAMP(abe->get_last_out(0)<<2,-32768,32767));
} else { } else {
for (int i=0; i<9; i++) { for (int i=0; i<9; i++) {
oscBuf[i]->putSample(h,CLAMP(fmChan[i]->debug_output(0)<<2,-32768,32767)); oscBuf[i]->putSample(h,CLAMP(fmChan[i]->debug_output(0)<<2,-32768,32767));
} }
oscBuf[9]->putSample(h,CLAMP(abe->get_last_out(0),-32768,32767)); oscBuf[9]->putSample(h,CLAMP(abe->get_last_out(0)<<2,-32768,32767));
} }
} }
for (int i=0; i<totalChans; i++) { for (int i=0; i<totalChans+1; i++) {
oscBuf[i]->end(len); oscBuf[i]->end(len);
} }
} }
@ -755,7 +755,7 @@ void DivPlatformOPL::acquire_nukedLLE2(short** buf, size_t len) {
int chOut[11]; int chOut[11];
thread_local ymfm::ymfm_output<2> aOut; thread_local ymfm::ymfm_output<2> aOut;
for (int i=0; i<totalChans; i++) { for (int i=0; i<MAX(adpcmChan+1,totalChans); i++) {
oscBuf[i]->begin(len); oscBuf[i]->begin(len);
} }
@ -899,7 +899,7 @@ void DivPlatformOPL::acquire_nukedLLE2(short** buf, size_t len) {
buf[0][h]=dacOut; buf[0][h]=dacOut;
} }
for (int i=0; i<totalChans; i++) { for (int i=0; i<MAX(adpcmChan+1,totalChans); i++) {
oscBuf[i]->end(len); oscBuf[i]->end(len);
} }
} }

8
src/gui/debugWindow.cpp
View file

@ -276,14 +276,14 @@ void FurnaceGUI::drawDebug() {
ImGui::Checkbox(fmt::sprintf("##%d_OSCFollow_%d",i,c).c_str(),&oscBuf->follow); ImGui::Checkbox(fmt::sprintf("##%d_OSCFollow_%d",i,c).c_str(),&oscBuf->follow);
// address // address
ImGui::TableNextColumn(); ImGui::TableNextColumn();
int needle=oscBuf->needle; unsigned int needle=oscBuf->needle;
ImGui::BeginDisabled(oscBuf->follow); ImGui::BeginDisabled(oscBuf->follow);
if (ImGui::InputInt(fmt::sprintf("##%d_OSCFollowNeedle_%d",i,c).c_str(),&needle,1,100)) { /*if (ImGui::InputInt(fmt::sprintf("##%d_OSCFollowNeedle_%d",i,c).c_str(),&needle,1,100)) {
} }*/
ImGui::EndDisabled(); ImGui::EndDisabled();
// data // data
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("%d",oscBuf->data[needle]); ImGui::Text("%d",oscBuf->data[needle>>16]);
} }
ImGui::EndTable(); ImGui::EndTable();
} }