Fix Cygwin/Aero/OSS/M17 Junk;

This commit is contained in:
lwvmobile
2023-07-26 18:43:52 -04:00
parent 6f1cf0a279
commit 3bd3edb36f
3 changed files with 119 additions and 39 deletions

View File

@@ -1319,6 +1319,13 @@ 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 != 0 && opts->audio_out_type != 0) //
for (int i = 0; i < 960; i++) getSymbol(opts, state, 1); //I think this is actually just framesync being a pain
#endif
while (1)
{
@@ -1450,7 +1457,7 @@ main (int argc, char **argv)
}
#ifdef AERO_BUILD
fprintf (stderr, "Build Version: v2.1b (20230714)\n");
fprintf (stderr, "Build Version: v2.1b (20230726)\n");
#else
fprintf (stderr, "Build Version: %s \n", GIT_TAG);
#endif
@@ -2530,9 +2537,15 @@ main (int argc, char **argv)
opts.audio_in_type = 5; //5 will become OSS input type
}
//Codec2 only running at 8k output currently, need to match for OSS
//OSS cannot open different rate/channel configs on /dev/dsp on real hardware and in Cygwin
//So, in Aero builds, we need to keep the rate the same but upscale Codec2
//padsp opens a virtual output, so mixing and matching rates/channels is possible there
#ifdef AERO_BUILD
// speed = 48000;
#else
if (opts.frame_m17 == 1)
speed = 8000;
#endif
if((strncmp(opts.audio_out_dev, "/dev/audio", 10) == 0))
{