Merge branch 'stable-1.2'

# Conflicts:
#	cmake/modules/MinGWCrossCompile.cmake
#	plugins/FreeBoy/FreeBoy.cpp
This commit is contained in:
Hyunjin Song
2018-08-24 09:54:39 +09:00
6 changed files with 86 additions and 39 deletions

View File

@@ -283,9 +283,6 @@ void FreeBoyInstrument::playNote( NotePlayHandle * _n,
data += m_ch4SweepStepLengthModel.value();
papu->write_register( fakeClock(), 0xff21, data );
//channel 4 init
papu->write_register( fakeClock(), 0xff23, 128 );
_n->m_pluginData = papu;
}
@@ -387,6 +384,9 @@ void FreeBoyInstrument::playNote( NotePlayHandle * _n,
data = data << 3;
data += ropt;
papu->write_register( fakeClock(), 0xff22, data );
//channel 4 init
papu->write_register( fakeClock(), 0xff23, 128 );
}
int const buf_size = 2048;