Skip to content

Fix build with exsid #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
drfiemost merged 1 commit into from
Jul 23, 2026
Merged

Fix build with exsid #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 22 additions & 24 deletions src/sound.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@ bool sound_init(unsigned mr, bool writer, unsigned m, unsigned ntsc,
}
}

#ifdef USE_EXSID
if (exsid)
{
#ifdef USE_EXSID
exsidfd = exSID_new();
if (!exsidfd)
return false;
Expand Down Expand Up @@ -136,38 +136,36 @@ bool sound_init(unsigned mr, bool writer, unsigned m, unsigned ntsc,

useexsid = true;
timer = SDL_AddTimer(1000 / framerate, sound_timer, nullptr);
goto SOUNDOK;
}
#else
(void)exsid;
#endif

int playspeed = mr;
if (playspeed < MINMIXRATE) playspeed = MINMIXRATE;
if (playspeed > MAXMIXRATE) playspeed = MAXMIXRATE;

if (!snd_init(playspeed, numsids))
{
return false;
#endif
}
else
{
int playspeed = mr;
if (playspeed < MINMIXRATE) playspeed = MINMIXRATE;
if (playspeed > MAXMIXRATE) playspeed = MAXMIXRATE;

if (!snd_init(playspeed, numsids))
{
return false;
}

midi_init();
midi_init();

if (!lbuffer) lbuffer = new Sint16[MIXBUFFERSIZE];
if (!rbuffer) rbuffer = new Sint16[MIXBUFFERSIZE];
if (!lbuffer) lbuffer = new Sint16[MIXBUFFERSIZE];
if (!rbuffer) rbuffer = new Sint16[MIXBUFFERSIZE];

if (writer)
writehandle = std::fopen("sidaudio.raw", "wb");
if (writer)
writehandle = std::fopen("sidaudio.raw", "wb");

playspeed = getmixrate();
sid_init(playspeed, m, ntsc, interpolate, customclockrate, numsids, filterbias, combwaves);
playspeed = getmixrate();
sid_init(playspeed, m, ntsc, interpolate, customclockrate, numsids, filterbias, combwaves);

snd_setplayer(&sound_playrout);
snd_setcustommixer(sound_mixer);
snd_setplayer(&sound_playrout);
snd_setcustommixer(sound_mixer);
}

#ifdef USE_EXSID
SOUNDOK:
#endif
initted = true;
return true;
}
Expand Down
Loading