less bass data

This commit is contained in:
Joachim Fenkes 2012-08-10 22:58:47 +02:00
parent 5afe1e6bca
commit 479d4f4377

View file

@ -53,9 +53,6 @@ const uint32_t arptiming = B32(00001100,00110000,11111011,00001100);
const int bassbeat[8] = { 0, 0, 1, 0, 0, 1, 0, 1 }; const int bassbeat[8] = { 0, 0, 1, 0, 0, 1, 0, 1 };
const int bassline[BASSSIZE] = { const int bassline[BASSSIZE] = {
12, 12, 15, 10, 12, 12, 17, 10, 12, 12, 15, 7, 8, 8, 3, 7,
12, 12, 15, 10, 12, 12, 17, 10, 12, 12, 15, 7, 8, 8, 3, 7,
12, 12, 15, 10, 12, 12, 17, 10, 12, 12, 15, 7, 8, 8, 3, 7,
12, 12, 15, 10, 12, 12, 17, 10, 12, 12, 15, 7, 8, 8, 3, 7, 12, 12, 15, 10, 12, 12, 17, 10, 12, 12, 15, 7, 8, 8, 3, 7,
8, 8, 10, 10, 12, 12, 5, 5, 8, 8, 10, 10, 8, 8, 10, 10, 12, 12, 5, 5, 8, 8, 10, 10,
}; };
@ -138,7 +135,10 @@ static inline unsigned char voice_arp(unsigned long i)
static inline unsigned char voice_bass(unsigned long i) static inline unsigned char voice_bass(unsigned long i)
{ {
static uint16_t bassosc = 0, flangeosc = 0; static uint16_t bassosc = 0, flangeosc = 0;
int note = notes[bassline[i >> 13]]; uint8_t bassptr = (i >> 13) & 0xF;
if (i >> 19)
bassptr |= 0x10;
int note = notes[bassline[bassptr]];
if (bassbeat[(i >> 10) & 7]) if (bassbeat[(i >> 10) & 7])
note <<= 1; note <<= 1;
bassosc += note; bassosc += note;