Merge remote-tracking branch 'upstream/master' into es5506_alt
This commit is contained in:
commit
02dbafb728
|
@ -2563,7 +2563,7 @@ struct ImGuiTableColumn
|
||||||
PrevEnabledColumn = NextEnabledColumn = -1;
|
PrevEnabledColumn = NextEnabledColumn = -1;
|
||||||
SortOrder = -1;
|
SortOrder = -1;
|
||||||
SortDirection = ImGuiSortDirection_None;
|
SortDirection = ImGuiSortDirection_None;
|
||||||
DrawChannelCurrent = DrawChannelFrozen = DrawChannelUnfrozen = (ImU8)-1;
|
DrawChannelCurrent = DrawChannelFrozen = DrawChannelUnfrozen = (ImU32)-1;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1998,6 +1998,11 @@ void ImGui::TableBeginCell(ImGuiTable* table, int column_n)
|
||||||
{
|
{
|
||||||
// FIXME-TABLE: Could avoid this if draw channel is dummy channel?
|
// FIXME-TABLE: Could avoid this if draw channel is dummy channel?
|
||||||
SetWindowClipRectBeforeSetChannel(window, column->ClipRect);
|
SetWindowClipRectBeforeSetChannel(window, column->ClipRect);
|
||||||
|
if (column->DrawChannelCurrent==(ImGuiTableDrawChannelIdx)-1) {
|
||||||
|
// temporary workaround for #502
|
||||||
|
//printf("sorry!\n");
|
||||||
|
column->DrawChannelCurrent=column_n;
|
||||||
|
}
|
||||||
table->DrawSplitter->SetCurrentChannel(window->DrawList, column->DrawChannelCurrent);
|
table->DrawSplitter->SetCurrentChannel(window->DrawList, column->DrawChannelCurrent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1852,6 +1852,9 @@ bool DivEngine::addWaveFromFile(const char* path, bool addRaw) {
|
||||||
// read as .dmw
|
// read as .dmw
|
||||||
reader.seek(0,SEEK_SET);
|
reader.seek(0,SEEK_SET);
|
||||||
int len=reader.readI();
|
int len=reader.readI();
|
||||||
|
if (len<=0 || len>256) {
|
||||||
|
throw EndOfFileException(&reader,reader.size());
|
||||||
|
}
|
||||||
wave->max=(unsigned char)reader.readC();
|
wave->max=(unsigned char)reader.readC();
|
||||||
if (wave->max==255) { // new wavetable format
|
if (wave->max==255) { // new wavetable format
|
||||||
unsigned char waveVersion=reader.readC();
|
unsigned char waveVersion=reader.readC();
|
||||||
|
|
|
@ -208,6 +208,7 @@ int DivPlatformZXBeeper::dispatch(DivCommand c) {
|
||||||
chan[c.chan].duty=c.value;
|
chan[c.chan].duty=c.value;
|
||||||
break;
|
break;
|
||||||
case DIV_CMD_SAMPLE_MODE:
|
case DIV_CMD_SAMPLE_MODE:
|
||||||
|
if (isMuted[c.chan]) break;
|
||||||
curSample=c.value;
|
curSample=c.value;
|
||||||
curSamplePos=0;
|
curSamplePos=0;
|
||||||
curSamplePeriod=0;
|
curSamplePeriod=0;
|
||||||
|
|
Loading…
Reference in New Issue