otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactoring

Browse source
This commit is contained in:
Waldemar Pawlaszek 2022-12-23 07:06:17 +01:00
parent f1c40082d6
commit 2423ec9bc6
4 changed files with 34 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/engine/platform/sound/pokey/AltASAP.cpp
View file

@ -283,9 +283,8 @@ public:
PokeyPimpl( uint32_t pokeyClock, uint32_t sampleRate ) : PokeyBase{}, mQueue{ std::make_unique<ActionQueue>() },
mAudioChannels{ AudioChannel{ *mQueue, 0u }, AudioChannel{ *mQueue, 1u }, AudioChannel{ *mQueue, 2u }, AudioChannel{ *mQueue, 3u } },
mRegisterPool{}, mPokeyClock{ pokeyClock * 8 }, mTick{}, mNextTick{}, mSampleRate{ sampleRate }, mSamplesRemainder{},
mReloadCycles1{ 28 }, mReloadCycles3{ 28 }, mDivCycles{ 28 },
mTicksPerSample{ mPokeyClock / mSampleRate, mPokeyClock % mSampleRate }
mRegisterPool{}, mTick{}, mNextTick{}, mReloadCycles1{ 28 }, mReloadCycles3{ 28 }, mDivCycles{ 28 }, mSampleRate{ sampleRate }, mSamplesRemainder{},
mTicksPerSample{ ( pokeyClock * 8 ) / mSampleRate, ( pokeyClock * 8 ) % mSampleRate }
{
std::fill_n( mRegisterPool.data(), mRegisterPool.size(), (uint8_t)0xff );
enqueueSampling();
@ -468,7 +467,7 @@ public:
for ( int i = 0; i < 4; i++ )
mAudioChannels[i].doStimer( cycle );
break;
case 0x0f:
case 0x0f:
{
if ( value == mSkctl )
break;
@ -600,45 +599,53 @@ private:
std::array<uint8_t, 4 * 2 + 1> mRegisterPool;
uint32_t mPokeyClock;
uint64_t mTick;
uint64_t mNextTick;
int64_t mReloadCycles1;
int64_t mReloadCycles3;
int64_t mDivCycles;
uint32_t mSampleRate;
uint32_t mSamplesRemainder;
int mReloadCycles1;
int mReloadCycles3;
int mDivCycles;
std::pair<uint32_t, uint32_t> mTicksPerSample;
};
Pokey::Pokey( uint32_t pokeyClock, uint32_t sampleRate ) : mPokey{ std::make_unique<PokeyPimpl>( mPokeyClock, mSampleRate ) }, mPokeyClock{ pokeyClock }, mSampleRate{ sampleRate }
//Initializing periods with safe defaults
Pokey::Pokey() : mPokeyClock{ (uint32_t)COLOR_NTSC / 2 }, mSampleRate{ mPokeyClock / 7 }, mPokey{}
{
}
void Pokey::init( uint32_t pokeyClock, uint32_t sampleRate )
{
mPokey.reset();
mPokeyClock = pokeyClock;
mSampleRate = sampleRate;
}
void Pokey::reset()
{
mPokey = std::make_unique<PokeyPimpl>( mPokeyClock, mSampleRate );
}
Pokey::~Pokey()
{
}
void Pokey::write( uint8_t address, uint8_t value )
{
assert( mPokey );
mPokey->write( address, value );
}
int16_t Pokey::sampleAudio( DivDispatchOscBuffer** oscb )
{
assert( mPokey );
return mPokey->sampleAudio( oscb );
}
uint8_t const* Pokey::getRegisterPool()
{
assert( mPokey );
return mPokey->getRegisterPool();
}
void Pokey::reset()
{
mPokey = std::make_unique<PokeyPimpl>( mPokeyClock, mSampleRate );
}
}

6
src/engine/platform/sound/pokey/AltASAP.hpp
View file

@ -15,7 +15,8 @@ class Pokey
{
public:
Pokey( uint32_t pokeyClock, uint32_t sampleRate );
Pokey();
void init( uint32_t pokeyClock, uint32_t sampleRate );
~Pokey();
void write( uint8_t address, uint8_t value );
@ -26,10 +27,9 @@ public:
void reset();
private:
std::unique_ptr<PokeyPimpl> mPokey;
uint32_t mPokeyClock;
uint32_t mSampleRate;
std::unique_ptr<PokeyPimpl> mPokey;
};
}