M17 Cleanup and M17/Aero Jank Fixes;

This commit is contained in:
lwvmobile
2023-07-28 23:22:13 -04:00
parent 3bb9994589
commit e4f61115c6
2 changed files with 29 additions and 184 deletions

View File

@@ -103,6 +103,12 @@ void
noCarrier (dsd_opts * opts, dsd_state * state)
{
#ifdef AERO_BUILD
//TODO: Investigate why getSymbol needs to be run first in this context...truly confused here
if(opts->frame_m17 == 1) //&& opts->audio_in_type == 5
for (int i = 0; i < 960; i++) getSymbol(opts, state, 1); //I think this is actually just framesync being a pain
#endif
if (opts->floating_point == 1)
{
state->aout_gain = opts->audio_gain;
@@ -638,8 +644,8 @@ initOpts (dsd_opts * opts)
//this may not matter so much, since its already checked later on
//but better safe than sorry I guess
#ifdef AERO_BUILD
opts->audio_in_type = 5;
opts->audio_out_type = 5;
opts->audio_in_type = 9; //only assign when configured
opts->audio_out_type = 9; //only assign when configured
#else
opts->audio_in_type = 0;
opts->audio_out_type = 0;
@@ -1388,6 +1394,12 @@ if (opts->audio_out_type == 0)
openPulseOutput(opts);
}
#ifdef AERO_BUILD
//TODO: Investigate why getSymbol needs to be run first in this context...truly confused here
if(opts->frame_m17 == 1) //&& opts->audio_in_type == 5
for (int i = 0; i < 960; i++) getSymbol(opts, state, 1); //I think this is actually just framesync being a pain
#endif
while (!exitflag)
{
@@ -2788,6 +2800,8 @@ main (int argc, char **argv)
//TODO: Multiple output returns based on 8k/1, 8k/2, or maybe 48k/1? (2,3,5)??
if (opts.pulse_digi_out_channels == 2)
opts.audio_out_type = 2; //2 for 2 channel 8k OSS 16-bit short output
else if (opts.frame_m17 == 1)
opts.audio_out_type = 2;
else opts.audio_out_type = 5;
//debug