actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Allow Windows users to select a device to use with WaveOut

Browse Source
This commit is contained in:
teejusb
2023-02-18 09:00:58 -08:00
parent fdfc9848b8
commit c2b9b09418
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arch/Sound/RageSoundDriver_WaveOut.cpp
+23 -2
View File
@@ -124,9 +124,30 @@ RString RageSoundDriver_WaveOut::Init()
fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8; fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8;
fmt.nAvgBytesPerSec = fmt.nSamplesPerSec * fmt.nBlockAlign; fmt.nAvgBytesPerSec = fmt.nSamplesPerSec * fmt.nBlockAlign;
MMRESULT ret = waveOutOpen( &m_hWaveOut, WAVE_MAPPER, &fmt, (DWORD_PTR) m_hSoundEvent, NULL, CALLBACK_EVENT ); std::vector<UINT> deviceIds;
if( ret != MMSYSERR_NOERROR ) if (!PREFSMAN->m_iSoundDevice.Get().empty()) {
std::vector<RString> portNames;
split(PREFSMAN->m_iSoundDevice.Get(), ",", portNames, true);
for (const RString& device : portNames) {
int id = StringToInt(device, /*pos=*/0, /*base=*/10, /*exceptVal=*/-1);
if (id != -1) {
deviceIds.push_back(id);
}
}
}
deviceIds.push_back(WAVE_MAPPER); // Fallback to WAVE_MAPPER
MMRESULT ret = MMSYSERR_ERROR;
for (UINT id : deviceIds) {
ret = waveOutOpen( &m_hWaveOut, id, &fmt, (DWORD_PTR) m_hSoundEvent, NULL, CALLBACK_EVENT );
if (ret == MMSYSERR_NOERROR) {
break;
}
}
if (ret != MMSYSERR_NOERROR) {
return wo_ssprintf( ret, "waveOutOpen failed" ); return wo_ssprintf( ret, "waveOutOpen failed" );
}
ZERO( m_aBuffers ); ZERO( m_aBuffers );
for(int b = 0; b < num_chunks; ++b) for(int b = 0; b < num_chunks; ++b)