etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-15 17:25:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed gcc errors

Browse source
This commit is contained in:
Waldemar Pawlaszek 2022-02-21 19:58:14 +01:00
parent 6e79e84e53
commit de6cbba472
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/engine/platform/sound/lynx/Mikey.cpp
View file

@ -55,7 +55,7 @@ int32_t clamp( int32_t v, int32_t lo, int32_t hi )
class Timer class Timer
{ {
public: public:
Timer() : mResetDone{}, mEnableReload{}, mEnableCount{}, mAudShift{}, mValue{}, mCtrlA{-1}, mBackup{}, mTimerDone{} Timer() : mAudShift{}, mCtrlA{ -1 }, mResetDone{}, mEnableReload{}, mEnableCount{}, mTimerDone{}, mBackup{}, mValue{}
{ {
} }
@ -199,7 +199,7 @@ public:
void setOther( uint64_t tick, uint8_t value ) void setOther( uint64_t tick, uint8_t value )
{ {
mShiftRegister = mShiftRegister & 0b0000'1111'1111 | ( ( (int)value & 0b1111'0000 ) << 4 ); mShiftRegister = ( mShiftRegister & 0b0000'1111'1111 ) | ( ( (int)value & 0b1111'0000 ) << 4 );
mTimer.setControlB( value & 0b0000'1111 ); mTimer.setControlB( value & 0b0000'1111 );
} }
@ -288,7 +288,7 @@ public:
uint64_t min4 = std::min( min2, min3 ); uint64_t min4 = std::min( min2, min3 );
assert( ( min4 & 15 ) < mTab.size() ); assert( ( min4 & 15 ) < mTab.size() );
mTab[min4 & 15] = ~15ull | min4 & 15; mTab[min4 & 15] = ~15ull | ( min4 & 15 );
return min4; return min4;
} }
@ -344,25 +344,25 @@ public:
switch ( address & 0x7 ) switch ( address & 0x7 )
{ {
case VOLCNTRL: case VOLCNTRL:
mAudioChannels[( address >> 3 ) & 3]->setVolume( (int8_t)value ); mAudioChannels[idx]->setVolume( (int8_t)value );
break; break;
case FEEDBACK: case FEEDBACK:
mAudioChannels[( address >> 3 ) & 3]->setFeedback( value ); mAudioChannels[idx]->setFeedback( value );
break; break;
case OUTPUT: case OUTPUT:
mAudioChannels[( address >> 3 ) & 3]->setOutput( value ); mAudioChannels[idx]->setOutput( value );
break; break;
case SHIFT: case SHIFT:
mAudioChannels[( address >> 3 ) & 3]->setShift( value ); mAudioChannels[idx]->setShift( value );
break; break;
case BACKUP: case BACKUP:
return mAudioChannels[( address >> 3 ) & 3]->setBackup( tick, value ); return mAudioChannels[idx]->setBackup( tick, value );
case CONTROL: case CONTROL:
return mAudioChannels[( address >> 3 ) & 3]->setControl( tick, value ); return mAudioChannels[idx]->setControl( tick, value );
case COUNTER: case COUNTER:
return mAudioChannels[( address >> 3 ) & 3]->setCounter( tick, value ); return mAudioChannels[idx]->setCounter( tick, value );
case OTHER: case OTHER:
mAudioChannels[( address >> 3 ) & 3]->setOther( tick, value ); mAudioChannels[idx]->setOther( tick, value );
break; break;
} }
} }
@ -461,7 +461,7 @@ void Mikey::enqueueSampling()
mNextTick += 1; mNextTick += 1;
} }
mQueue->push( mNextTick & ~15 | 4 ); mQueue->push( ( mNextTick & ~15 ) | 4 );
} }
void Mikey::sampleAudio( int16_t* bufL, int16_t* bufR, size_t size ) void Mikey::sampleAudio( int16_t* bufL, int16_t* bufR, size_t size )

1
src/engine/vgmOps.cpp
View file

@ -685,6 +685,7 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop) {
hasOPM|=0x40000000; hasOPM|=0x40000000;
howManyChips++; howManyChips++;
} }
break;
case DIV_SYSTEM_LYNX: case DIV_SYSTEM_LYNX:
if (!hasLynx) { if (!hasLynx) {
hasLynx=disCont[i].dispatch->chipClock; hasLynx=disCont[i].dispatch->chipClock;