Compare commits
3 Commits
eb18b28928
...
ec4063641a
Author | SHA1 | Date |
---|---|---|
tildearrow | ec4063641a | |
tildearrow | 803c8b0582 | |
tildearrow | fc760eed43 |
|
@ -2016,6 +2016,10 @@ bool DivEngine::isPreviewingSample() {
|
|||
return (sPreview.sample>=0 && sPreview.sample<(int)song.sample.size());
|
||||
}
|
||||
|
||||
int DivEngine::getSamplePreviewSample() {
|
||||
return sPreview.sample;
|
||||
}
|
||||
|
||||
int DivEngine::getSamplePreviewPos() {
|
||||
return sPreview.pos;
|
||||
}
|
||||
|
|
|
@ -714,6 +714,7 @@ class DivEngine {
|
|||
|
||||
// sample preview query
|
||||
bool isPreviewingSample();
|
||||
int getSamplePreviewSample();
|
||||
int getSamplePreviewPos();
|
||||
double getSamplePreviewRate();
|
||||
|
||||
|
|
24233
src/gui/introTune.cpp
24233
src/gui/introTune.cpp
File diff suppressed because it is too large
Load Diff
|
@ -1676,7 +1676,7 @@ void FurnaceGUI::drawSampleEdit() {
|
|||
}
|
||||
|
||||
dl->PushClipRect(rectMin,rectMax);
|
||||
if (e->isPreviewingSample()) {
|
||||
if (e->isPreviewingSample() && e->getSamplePreviewSample()==curSample) {
|
||||
if (!statusBar2.empty()) {
|
||||
statusBar2+=" | ";
|
||||
}
|
||||
|
|
|
@ -1074,9 +1074,7 @@ void FurnaceGUI::drawSettings() {
|
|||
ImGui::TableNextColumn();
|
||||
ImGui::Text("Action");
|
||||
ImGui::TableNextColumn();
|
||||
ImGui::Text("Learn");
|
||||
ImGui::TableNextColumn();
|
||||
ImGui::Text("Remove");
|
||||
|
||||
for (size_t i=0; i<midiMap.binds.size(); i++) {
|
||||
MIDIBind& bind=midiMap.binds[i];
|
||||
|
@ -1178,13 +1176,15 @@ void FurnaceGUI::drawSettings() {
|
|||
}
|
||||
|
||||
ImGui::TableNextColumn();
|
||||
if (ImGui::Button((learning==(int)i)?("waiting...##BLearn"):(ICON_FA_SQUARE_O "##BLearn"))) {
|
||||
pushToggleColors(learning==(int)i);
|
||||
if (ImGui::Button((learning==(int)i)?("waiting...##BLearn"):("Learn##BLearn"))) {
|
||||
if (learning==(int)i) {
|
||||
learning=-1;
|
||||
} else {
|
||||
learning=i;
|
||||
}
|
||||
}
|
||||
popToggleColors();
|
||||
|
||||
ImGui::TableNextColumn();
|
||||
if (ImGui::Button(ICON_FA_TIMES "##BRemove")) {
|
||||
|
|
Loading…
Reference in New Issue