diff --git a/ChangeLog b/ChangeLog index 4267b43c..b656a56c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22318,3 +22318,5 @@ * Renamed audio driver components in caed(8). 2021-08-20 Fred Gleason * Removed vestigal JACK dependencies from the core caed(8) code. +2021-08-20 Fred Gleason + * Fixed a bug that broke the build with ALSA support disabled. diff --git a/cae/cae.cpp b/cae/cae.cpp index 2e98c650..43ca7523 100644 --- a/cae/cae.cpp +++ b/cae/cae.cpp @@ -1629,7 +1629,7 @@ void MainObject::MakeDriver(unsigned *next_card,RDStation::AudioDriver type) dvr=new DriverHpi(this); rda->station()->setDriverVersion(RDStation::Hpi,"v"+dvr->version()); #else - rda->station()->setDriverVersion(RDStation::Hpi,"[not enabled]"); + rda->station()->setDriverVersion(RDStation::Hpi,"not enabled"); #endif // HPI break; @@ -1638,7 +1638,7 @@ void MainObject::MakeDriver(unsigned *next_card,RDStation::AudioDriver type) dvr=new DriverAlsa(this); rda->station()->setDriverVersion(RDStation::Alsa,"v"+dvr->version()); #else - rda->station()->setDriverVersion(RDStation::Alsa,"[not enabled]"); + rda->station()->setDriverVersion(RDStation::Alsa,"not enabled"); #endif // ALSA break; @@ -1647,7 +1647,7 @@ void MainObject::MakeDriver(unsigned *next_card,RDStation::AudioDriver type) dvr=new DriverJack(this); rda->station()->setDriverVersion(RDStation::Jack,"v"+dvr->version()); #else - rda->station()->setDriverVersion(RDStation::Jack,"[not enabled]"); + rda->station()->setDriverVersion(RDStation::Jack,"not enabled"); #endif // JACK break; diff --git a/cae/driver_alsa.cpp b/cae/driver_alsa.cpp index da81d58d..0298ccf0 100644 --- a/cae/driver_alsa.cpp +++ b/cae/driver_alsa.cpp @@ -660,6 +660,7 @@ QString DriverAlsa::version() const bool DriverAlsa::initialize(unsigned *next_cardnum) { +#ifdef ALSA QString dev; snd_pcm_t *pcm_play_handle; snd_pcm_t *pcm_capture_handle; @@ -723,6 +724,9 @@ bool DriverAlsa::initialize(unsigned *next_cardnum) (*next_cardnum)++; } return card>0; +#else + return false; +#endif // ALSA } @@ -1904,9 +1908,9 @@ void DriverAlsa::FillAlsaOutputStream(int card,int stream) #endif // ALSA +#ifdef ALSA void DriverAlsa::AlsaClock() { -#ifdef ALSA for(int i=0;i