CMakeLists: Add flag to disable Cubeb #13306
Conversation
OatmealDome
force-pushed
the
cubeb-optional
branch
from
0429f17 to
c78c81d
Compare
| if (CubebStream::IsValid()) | ||
| backend = BACKEND_CUBEB; |
There was a problem hiding this comment.
Can we just move this out of the #ifdef soup and do it all the time? I'd expect that any platforms not in this chain (like ANDROID for example) to return false so it'd be skipped anyways.
There was a problem hiding this comment.
afaik Android uses OpenSL ES by default, so moving this block out of the ifdefs would cause Android to default to Cubeb.
There was a problem hiding this comment.
Yeah well, you could move it in front, but I guess either is fine then 🤷
There was a problem hiding this comment.
I think that would then affect Linux instead and make ALSA the default backend instead of Cubeb?
There was a problem hiding this comment.
Hm true. Bleh. Nevermind then I guess. But such define chains usually irk the heck out of me, and I try to avoid (or rewrite) them in favor of making it easier to follow. Not today I suppose.
| @@ -25,6 +28,7 @@ class CubebStream final : public SoundStream | |||
| bool Init() override; | |||
| bool SetRunning(bool running) override; | |||
| void SetVolume(int) override; | |||
| static bool IsValid() { return true; } | |||
There was a problem hiding this comment.
Shouldn't this have a symmetric one in the #else portion that returns false instead? Unless I missed something, this shouldn't compile correctly without HAVE_CUBEB, since there's no CubebStream::IsValid member in that case.
There was a problem hiding this comment.
If it isn't defined, then it will fall back to the IsValid definition in SoundStream:
There was a problem hiding this comment.
Oh, great, I didn't realize it was a base class method. Too bad you can't slap override on a static method to make it explicit. Guess you can ignore both my comments then 👍
OatmealDome
force-pushed
the
cubeb-optional
branch
from
c78c81d to
d89e7c8
Compare
Cubeb doesn't support some platforms, so we should have the ability to disable it.
Outside of AudioCommon,
CEXIMicuses Cubeb to get microphone input, so I added a panic alert when the Microphone device is selected and Cubeb is unavailable.