| 修订版 | b08526de322d21b804761d8d5991fc0dc6d6c192 (tree) |
|---|---|
| 时间 | 2021-09-27 15:32:07 |
| 作者 | yyagi <yyagi.dtxmania@gmai...> |
| Commiter | yyagi |
#37271 ミキシング処理の並列化設定に失敗したときにWASAPIやASIOの設定全体を失敗扱いとしていたが、並列化に失敗しても従来同等になるだけなので、警告レベルに留めた。
FDK/コード/03.サウンド/CSoundDeviceASIO.cs (diff) FDK/コード/03.サウンド/CSoundDeviceWASAPI.cs (diff)| @@ -378,10 +378,11 @@ namespace FDK | ||
| 378 | 378 | if (!Bass.BASS_ChannelSetAttribute(this.hMixer_DeviceOut, (BASSAttribute)BASS_ATTRIB_MIXER_THREADS, nCPUCores)) |
| 379 | 379 | { |
| 380 | 380 | BASSError errcode = Bass.BASS_ErrorGetCode(); |
| 381 | - BassAsio.BASS_ASIO_Free(); | |
| 382 | - Bass.BASS_Free(); | |
| 383 | - this.bIsBASSFree = true; | |
| 384 | - throw new Exception(string.Format($"Failed to set the number of mixing threads: mixer_DeviceOut: {errcode}")); | |
| 381 | + //BassAsio.BASS_ASIO_Free(); | |
| 382 | + //Bass.BASS_Free(); | |
| 383 | + //this.bIsBASSFree = true; | |
| 384 | + //throw new Exception(string.Format($"Failed to set the number of mixing threads: mixer_DeviceOut: {errcode}")); | |
| 385 | + Trace.TraceWarning($"Failed to set the number of mixing threads: mixer_DeviceOut: {errcode}"); | |
| 385 | 386 | }; |
| 386 | 387 | } |
| 387 | 388 | #endregion |
| @@ -573,24 +573,26 @@ Trace.TraceInformation("WASAPI Device #{0}: {1}: IsDefault={2}, defPeriod={3}s, | ||
| 573 | 573 | const int BASS_ATTRIB_MIXER_THREADS = 0x15001; |
| 574 | 574 | for (int i = 0; i <= (int)CSound.EInstType.Unknown; i++) |
| 575 | 575 | { |
| 576 | - if ( !Bass.BASS_ChannelSetAttribute(this.hMixer_Chips[i], (BASSAttribute)BASS_ATTRIB_MIXER_THREADS, nCPUCores) ) | |
| 576 | + if (!Bass.BASS_ChannelSetAttribute(this.hMixer_Chips[i], (BASSAttribute)BASS_ATTRIB_MIXER_THREADS, nCPUCores)) | |
| 577 | 577 | { |
| 578 | 578 | BASSError errcode = Bass.BASS_ErrorGetCode(); |
| 579 | - BassWasapi.BASS_WASAPI_Free(); | |
| 580 | - Bass.BASS_Free(); | |
| 581 | - this.bIsBASSFree = true; | |
| 582 | - throw new Exception(string.Format( $"Failed to set the number of mixing threads: mixer {i}: {errcode}")); | |
| 583 | - }; | |
| 579 | + //BassWasapi.BASS_WASAPI_Free(); | |
| 580 | + //Bass.BASS_Free(); | |
| 581 | + //this.bIsBASSFree = true; | |
| 582 | + //throw new Exception(string.Format( $"Failed to set the number of mixing threads: mixer {i}: {errcode}")); | |
| 583 | + Trace.TraceWarning($"Failed to set the number of mixing threads: mixer {i}: {errcode}"); | |
| 584 | + } | |
| 584 | 585 | } |
| 585 | 586 | |
| 586 | 587 | if (!Bass.BASS_ChannelSetAttribute(this.hMixer_DeviceOut, (BASSAttribute)BASS_ATTRIB_MIXER_THREADS, nCPUCores)) |
| 587 | 588 | { |
| 588 | 589 | BASSError errcode = Bass.BASS_ErrorGetCode(); |
| 589 | - BassWasapi.BASS_WASAPI_Free(); | |
| 590 | - Bass.BASS_Free(); | |
| 591 | - this.bIsBASSFree = true; | |
| 592 | - throw new Exception(string.Format($"Failed to set the number of mixing threads: mixer_DeviceOut: {errcode}")); | |
| 593 | - }; | |
| 590 | + //BassWasapi.BASS_WASAPI_Free(); | |
| 591 | + //Bass.BASS_Free(); | |
| 592 | + //this.bIsBASSFree = true; | |
| 593 | + //throw new Exception(string.Format($"Failed to set the number of mixing threads: mixer_DeviceOut: {errcode}")); | |
| 594 | + Trace.TraceWarning($"Failed to set the number of mixing threads: mixer_DeviceOut: {errcode}"); | |
| 595 | + } | |
| 594 | 596 | |
| 595 | 597 | } |
| 596 | 598 | #endregion |
Fork