mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-10 21:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

cellMic: check device ptr and log openal error codes

Browse Source
This commit is contained in:
Megamouse 2024-08-05 23:08:02 +02:00
parent f1d4e500ba
commit f09d22a00d
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
rpcs3/Emu/Cell/Modules/cellMic.cpp
View File

@ -410,9 +410,9 @@ error_code microphone_device::open_microphone(const u8 type, const u32 dsp_r, co
ALCdevice* device = alcCaptureOpenDevice(device_name[0].c_str(), raw_samplingrate, num_al_channels, inbuf_size); ALCdevice* device = alcCaptureOpenDevice(device_name[0].c_str(), raw_samplingrate, num_al_channels, inbuf_size);
if (alcGetError(device) != ALC_NO_ERROR) if (ALCenum err = alcGetError(device); err != ALC_NO_ERROR || !device)
{ {
cellMic.error("Error opening capture device %s", device_name[0]); cellMic.error("Error opening capture device %s (error=0x%x, device=*0x%x)", device_name[0], err, device);
#ifdef _WIN32 #ifdef _WIN32
cellMic.error("Make sure microphone use is authorized under \"Microphone privacy settings\" in windows configuration"); cellMic.error("Make sure microphone use is authorized under \"Microphone privacy settings\" in windows configuration");
#endif #endif
@ -428,10 +428,11 @@ error_code microphone_device::open_microphone(const u8 type, const u32 dsp_r, co
{ {
// Open a 2nd microphone into the same device // Open a 2nd microphone into the same device
device = alcCaptureOpenDevice(device_name[1].c_str(), raw_samplingrate, AL_FORMAT_MONO16, inbuf_size); device = alcCaptureOpenDevice(device_name[1].c_str(), raw_samplingrate, AL_FORMAT_MONO16, inbuf_size);
if (alcGetError(device) != ALC_NO_ERROR)
if (ALCenum err = alcGetError(device); err != ALC_NO_ERROR || !device)
{ {
// Ignore it and move on // Ignore it and move on
cellMic.error("Error opening 2nd SingStar capture device %s", device_name[1]); cellMic.error("Error opening 2nd SingStar capture device %s (error=0x%x, device=*0x%x)", device_name[1], err, device);
} }
else else
{ {
@ -472,12 +473,12 @@ error_code microphone_device::close_microphone()
error_code microphone_device::start_microphone() error_code microphone_device::start_microphone()
{ {
for (const auto& micdevice : input_devices) for (ALCdevice* micdevice : input_devices)
{ {
alcCaptureStart(micdevice); alcCaptureStart(micdevice);
if (alcGetError(micdevice) != ALC_NO_ERROR) if (ALCenum err = alcGetError(micdevice); err != ALC_NO_ERROR)
{ {
cellMic.error("Error starting capture"); cellMic.error("Error starting capture (error=0x%x)", err);
stop_microphone(); stop_microphone();
return CELL_MICIN_ERROR_FATAL; return CELL_MICIN_ERROR_FATAL;
} }
@ -490,12 +491,12 @@ error_code microphone_device::start_microphone()
error_code microphone_device::stop_microphone() error_code microphone_device::stop_microphone()
{ {
for (const auto& micdevice : input_devices) for (ALCdevice* micdevice : input_devices)
{ {
alcCaptureStop(micdevice); alcCaptureStop(micdevice);
if (alcGetError(micdevice) != ALC_NO_ERROR) if (ALCenum err = alcGetError(micdevice); err != ALC_NO_ERROR)
{ {
cellMic.error("Error stopping capture"); cellMic.error("Error stopping capture (error=0x%x)", err);
} }
} }
@ -532,13 +533,13 @@ u32 microphone_device::capture_audio()
u32 num_samples = inbuf_size / sample_size; u32 num_samples = inbuf_size / sample_size;
for (const auto micdevice : input_devices) for (ALCdevice* micdevice : input_devices)
{ {
ALCint samples_in = 0; ALCint samples_in = 0;
alcGetIntegerv(micdevice, ALC_CAPTURE_SAMPLES, 1, &samples_in); alcGetIntegerv(micdevice, ALC_CAPTURE_SAMPLES, 1, &samples_in);
if (alcGetError(micdevice) != ALC_NO_ERROR) if (ALCenum err = alcGetError(micdevice); err != ALC_NO_ERROR)
{ {
cellMic.error("Error getting number of captured samples"); cellMic.error("Error getting number of captured samples (error=0x%x)", err);
return CELL_MICIN_ERROR_FATAL; return CELL_MICIN_ERROR_FATAL;
} }
num_samples = std::min<u32>(num_samples, samples_in); num_samples = std::min<u32>(num_samples, samples_in);