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

Merge branch 'tildearrow:master' into guimprove

Browse source
This commit is contained in:
Eknous 2023-08-27 10:03:06 +04:00 • committed by GitHub
commit 8192a8e0f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 81 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/audio/sdlAudio.cpp
View file

@ -127,6 +127,7 @@ bool TAAudioSDL::init(TAAudioDesc& request, TAAudioDesc& response) {
ac.callback=taSDLProcess;
ac.userdata=this;
logV("opening audio device...");
ai=SDL_OpenAudioDevice(request.deviceName.empty()?NULL:request.deviceName.c_str(),0,&ac,&ar,0);
if (ai==0) {
logE("could not open audio device: %s",SDL_GetError());
@ -147,6 +148,8 @@ bool TAAudioSDL::init(TAAudioDesc& request, TAAudioDesc& response) {
desc.bufsize=ar.samples;
desc.fragments=1;
logV("got info: %d channels, %d bufsize",desc.outChans,desc.bufsize);
if (desc.outChans>0) {
outBufs=new float*[desc.outChans];
for (int i=0; i<desc.outChans; i++) {

19
src/engine/engine.cpp
View file

@ -3216,6 +3216,7 @@ void DivEngine::rescanAudioDevices() {
void DivEngine::initDispatch(bool isRender) {
BUSY_BEGIN;
logV("initializing dispatch...");
if (isRender) logI("render cores set");
for (int i=0; i<song.systemLen; i++) {
disCont[i].init(song.system[i],this,getChannelCount(song.system[i]),got.rate,song.systemFlags[i],isRender);
@ -3233,6 +3234,7 @@ void DivEngine::initDispatch(bool isRender) {
void DivEngine::quitDispatch() {
BUSY_BEGIN;
logV("terminating dispatch...");
for (int i=0; i<song.systemLen; i++) {
disCont[i].quit();
}
@ -3338,6 +3340,7 @@ bool DivEngine::initAudioBackend() {
return false;
}
logV("listing audio devices");
audioDevs=output->listAudioDevices();
want.deviceName=getConfString("audioDevice","");
@ -3352,8 +3355,10 @@ bool DivEngine::initAudioBackend() {
if (want.outChans<1) want.outChans=1;
if (want.outChans>16) want.outChans=16;
logV("setting callback");
output->setCallback(process,this);
logV("calling init");
if (!output->init(want,got)) {
logE("error while initializing audio!");
delete output;
@ -3362,6 +3367,7 @@ bool DivEngine::initAudioBackend() {
return false;
}
logV("allocating oscBuf...");
for (int i=0; i<got.outChans; i++) {
if (oscBuf[i]==NULL) {
oscBuf[i]=new float[32768];
@ -3369,6 +3375,7 @@ bool DivEngine::initAudioBackend() {
memset(oscBuf[i],0,32768*sizeof(float));
}
logI("initializing MIDI.");
if (output->initMidi(false)) {
midiIns=output->midiIn->listDevices();
midiOuts=output->midiOut->listDevices();
@ -3400,6 +3407,7 @@ bool DivEngine::initAudioBackend() {
}
}
logV("initAudioBackend done");
return true;
}
@ -3443,6 +3451,13 @@ void DivEngine::preInit() {
logI("Furnace version " DIV_VERSION ".");
loadConf();
#ifdef HAVE_SDL2
String audioDriver=getConfString("sdlAudioDriver","");
if (!audioDriver.empty()) {
SDL_SetHint("SDL_HINT_AUDIODRIVER",audioDriver.c_str());
}
#endif
}
bool DivEngine::init() {
@ -3480,6 +3495,8 @@ bool DivEngine::init() {
haveAudio=true;
}
logV("creating blip_buf");
samp_bb=blip_new(32768);
if (samp_bb==NULL) {
logE("not enough memory!");
@ -3493,6 +3510,8 @@ bool DivEngine::init() {
metroBuf=new float[8192];
metroBufLen=8192;
logV("setting blip rate of samp_bb (%f)",got.rate);
blip_set_rates(samp_bb,44100,got.rate);

4
src/engine/platform/tx81z.cpp
View file

@ -206,7 +206,7 @@ void DivPlatformTX81Z::tick(bool sysTick) {
if (chan[i].std.alg.had) {
chan[i].state.alg=chan[i].std.alg.val;
immWrite(chanOffs[i]+ADDR_LR_FB_ALG,(chan[i].state.alg&7)|(chan[i].state.fb<<3)|(chan[i].active?0:0x40)|(chan[i].chVolR<<7));
immWrite(chanOffs[i]+ADDR_LR_FB_ALG,(chan[i].state.alg&7)|(chan[i].state.fb<<3)|(chan[i].active?0x40:0)|(chan[i].chVolR<<7));
if (!parent->song.algMacroBehavior) for (int j=0; j<4; j++) {
unsigned short baseAddr=chanOffs[i]|opOffs[j];
DivInstrumentFM::Operator& op=chan[i].state.op[j];
@ -223,7 +223,7 @@ void DivPlatformTX81Z::tick(bool sysTick) {
}
if (chan[i].std.fb.had) {
chan[i].state.fb=chan[i].std.fb.val;
immWrite(chanOffs[i]+ADDR_LR_FB_ALG,(chan[i].state.alg&7)|(chan[i].state.fb<<3)|(chan[i].active?0:0x40)|(chan[i].chVolR<<7));
immWrite(chanOffs[i]+ADDR_LR_FB_ALG,(chan[i].state.alg&7)|(chan[i].state.fb<<3)|(chan[i].active?0x40:0)|(chan[i].chVolR<<7));
}
if (chan[i].std.fms.had) {
chan[i].state.fms=chan[i].std.fms.val;