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

GUI: fix per-chan osc debug crash

Browse source 
fixes #600
This commit is contained in:
tildearrow 2022-07-23 19:01:30 -05:00
parent 984d61d081
commit 26d60dd107
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/gui/debugWindow.cpp
View file

@ -220,24 +220,34 @@ void FurnaceGUI::drawDebug() {
ImGui::Text("Data"); ImGui::Text("Data");
for (int j=0; j<e->getChannelCount(system); j++, c++) { for (int j=0; j<e->getChannelCount(system); j++, c++) {
DivDispatchOscBuffer* oscBuf=e->getOscBuffer(c);
if (oscBuf==NULL) {
ImGui::TableNextRow();
// channel
ImGui::TableNextColumn();
ImGui::Text("%d",j);
ImGui::TableNextColumn();
ImGui::Text("<NULL!>");
continue;
}
ImGui::TableNextRow(); ImGui::TableNextRow();
// channel // channel
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("%d",j); ImGui::Text("%d",j);
// follow // follow
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Checkbox(fmt::sprintf("##%d_OSCFollow_%d",i,c).c_str(),&e->getOscBuffer(c)->follow); ImGui::Checkbox(fmt::sprintf("##%d_OSCFollow_%d",i,c).c_str(),&oscBuf->follow);
// address // address
ImGui::TableNextColumn(); ImGui::TableNextColumn();
int needle=e->getOscBuffer(c)->follow?e->getOscBuffer(c)->needle:e->getOscBuffer(c)->followNeedle; int needle=oscBuf->follow?oscBuf->needle:oscBuf->followNeedle;
ImGui::BeginDisabled(e->getOscBuffer(c)->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)) {
e->getOscBuffer(c)->followNeedle=MIN(MAX(needle,0),65535); oscBuf->followNeedle=MIN(MAX(needle,0),65535);
} }
ImGui::EndDisabled(); ImGui::EndDisabled();
// data // data
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("%d",e->getOscBuffer(c)->data[needle]); ImGui::Text("%d",oscBuf->data[needle]);
} }
ImGui::EndTable(); ImGui::EndTable();
} }