Fix build, Core update
This commit is contained in:
parent
37216e323f
commit
8c214d40e1
|
@ -91,7 +91,7 @@ void es550x_shared_core::es550x_alu_t::loop_exec()
|
||||||
s32 es550x_shared_core::es550x_alu_t::interpolation()
|
s32 es550x_shared_core::es550x_alu_t::interpolation()
|
||||||
{
|
{
|
||||||
// SF = S1 + ACCfr * (S2 - S1)
|
// SF = S1 + ACCfr * (S2 - S1)
|
||||||
return m_sample[0] + ((bitfield<s32>(m_accum, std::min<u8>(0, m_fraction - 9), 9) * (m_sample[1] - m_sample[0])) >> 9);
|
return m_sample[0] + ((bitfield<s32>(m_accum, std::max<s8>(0, m_fraction - 9), 9) * (m_sample[1] - m_sample[0])) >> 9);
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 es550x_shared_core::es550x_alu_t::get_accum_integer()
|
u32 es550x_shared_core::es550x_alu_t::get_accum_integer()
|
||||||
|
|
|
@ -684,7 +684,7 @@ void FurnaceGUI::drawSampleEdit() {
|
||||||
if (end<sample->loopStart) {
|
if (end<sample->loopStart) {
|
||||||
end=sample->loopStart;
|
end=sample->loopStart;
|
||||||
}
|
}
|
||||||
if (end>sample->samples) {
|
if (end>(int)(sample->samples)) {
|
||||||
end=sample->samples;
|
end=sample->samples;
|
||||||
}
|
}
|
||||||
sample->loopEnd=end;
|
sample->loopEnd=end;
|
||||||
|
@ -1203,7 +1203,7 @@ void FurnaceGUI::drawSampleEdit() {
|
||||||
for (int i=0; i<availY; i++) {
|
for (int i=0; i<availY; i++) {
|
||||||
for (int j=0; j<availX; j++) {
|
for (int j=0; j<availX; j++) {
|
||||||
int scaledPos=samplePos+(j*sampleZoom);
|
int scaledPos=samplePos+(j*sampleZoom);
|
||||||
if (sample->isLoopable() && ((scaledPos>=sample->loopStart) && (scaledPos<sample->loopEnd))) {
|
if (sample->isLoopable() && ((scaledPos>=sample->loopStart) && (scaledPos<(int)(sample->loopEnd)))) {
|
||||||
data[i*availX+j]=bgColorLoop;
|
data[i*availX+j]=bgColorLoop;
|
||||||
} else {
|
} else {
|
||||||
data[i*availX+j]=bgColor;
|
data[i*availX+j]=bgColor;
|
||||||
|
|
Loading…
Reference in New Issue