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

asdfasdfasdf

Browse source
This commit is contained in:
tildearrow 2024-03-09 03:32:03 -05:00
parent 8ff8ee89e9
commit 8099df183d
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gui/csPlayer.cpp
View file

@ -72,7 +72,7 @@ void FurnaceGUI::drawCSPlayer() {
for (int i=0; i<chans; i++) { for (int i=0; i<chans; i++) {
DivCSChannelState* state=cs->getChanState(i); DivCSChannelState* state=cs->getChanState(i);
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("$%x",state->readPos); ImGui::Text("$%.4x",state->readPos);
} }
ImGui::EndTable(); ImGui::EndTable();
} }
@ -80,11 +80,12 @@ void FurnaceGUI::drawCSPlayer() {
float oneCharSize=ImGui::CalcTextSize("A").x; float oneCharSize=ImGui::CalcTextSize("A").x;
float threeCharSize=ImGui::CalcTextSize("AA").x; float threeCharSize=ImGui::CalcTextSize("AA").x;
float charViewSize=ImGui::CalcTextSize("0123456789ABCDEF").x; float charViewSize=ImGui::CalcTextSize("0123456789ABCDEF").x;
float fiveCharSize=ImGui::CalcTextSize("AAAAA").x;
if (ImGui::BeginTable("CSHexPos",19)) { if (ImGui::BeginTable("CSHexView",19,ImGuiTableFlags_ScrollY)) {
char charView[17]; char charView[17];
ImGui::TableSetupScrollFreeze(1,1); ImGui::TableSetupScrollFreeze(1,1);
ImGui::TableSetupColumn("addr",ImGuiTableColumnFlags_WidthFixed); ImGui::TableSetupColumn("addr",ImGuiTableColumnFlags_WidthFixed,fiveCharSize);
ImGui::TableSetupColumn("d0",ImGuiTableColumnFlags_WidthFixed,threeCharSize); ImGui::TableSetupColumn("d0",ImGuiTableColumnFlags_WidthFixed,threeCharSize);
ImGui::TableSetupColumn("d1",ImGuiTableColumnFlags_WidthFixed,threeCharSize); ImGui::TableSetupColumn("d1",ImGuiTableColumnFlags_WidthFixed,threeCharSize);
ImGui::TableSetupColumn("d2",ImGuiTableColumnFlags_WidthFixed,threeCharSize); ImGui::TableSetupColumn("d2",ImGuiTableColumnFlags_WidthFixed,threeCharSize);
@ -105,7 +106,7 @@ void FurnaceGUI::drawCSPlayer() {
ImGui::TableSetupColumn("char",ImGuiTableColumnFlags_WidthFixed,charViewSize); ImGui::TableSetupColumn("char",ImGuiTableColumnFlags_WidthFixed,charViewSize);
// header // header
ImGui::TableNextRow(); ImGui::TableNextRow(ImGuiTableRowFlags_Headers);
ImGui::TableNextColumn(); ImGui::TableNextColumn();
for (int i=0; i<16; i++) { for (int i=0; i<16; i++) {
ImGui::TableNextColumn(); ImGui::TableNextColumn();
@ -134,6 +135,7 @@ void FurnaceGUI::drawCSPlayer() {
for (int i=csClipper.DisplayStart; i<csClipper.DisplayEnd; i++) { for (int i=csClipper.DisplayStart; i<csClipper.DisplayEnd; i++) {
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::TableSetBgColor(ImGuiTableBgTarget_CellBg,ImGui::GetColorU32(ImGuiCol_TableHeaderBg));
ImGui::Text("%.4X",i<<4); ImGui::Text("%.4X",i<<4);
for (int j=0; j<16; j++) { for (int j=0; j<16; j++) {

3
src/gui/gui.cpp
View file

@ -1105,6 +1105,9 @@ float FurnaceGUI::calcBPM(const DivGroovePattern& speeds, float hz, int vN, int
} }
void FurnaceGUI::play(int row) { void FurnaceGUI::play(int row) {
if (e->getStreamPlayer()) {
e->killStream();
}
memset(chanOscVol,0,DIV_MAX_CHANS*sizeof(float)); memset(chanOscVol,0,DIV_MAX_CHANS*sizeof(float));
for (int i=0; i<DIV_MAX_CHANS; i++) { for (int i=0; i<DIV_MAX_CHANS; i++) {
chanOscChan[i].pitch=0.0f; chanOscChan[i].pitch=0.0f;