diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-08-29 20:33:45 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-08-29 20:33:45 +0200 |
| commit | 47245166de02206389a0cb18aae7de35f8517c7d (patch) | |
| tree | 3648813c1b22accc9ef76dece9600d3e205c96e4 /src/wx/film_viewer.cc | |
| parent | ffb5e31b6a35a09f40afef45b787aa8bb345071d (diff) | |
Try to fix crashes when things go wrong with getDeviceInfo.v2.15.99
Diffstat (limited to 'src/wx/film_viewer.cc')
| -rw-r--r-- | src/wx/film_viewer.cc | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index d3a6c12e4..5f609856f 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -527,8 +527,12 @@ FilmViewer::config_changed (Config::Property p) unsigned int st = 0; if (Config::instance()->sound_output()) { while (st < _audio.getDeviceCount()) { - if (_audio.getDeviceInfo(st).name == Config::instance()->sound_output().get()) { - break; + try { + if (_audio.getDeviceInfo(st).name == Config::instance()->sound_output().get()) { + break; + } + } catch (RtAudioError&) { + /* Something went wrong with that device so we don't want to use it anyway */ } ++st; } @@ -539,19 +543,19 @@ FilmViewer::config_changed (Config::Property p) st = _audio.getDefaultOutputDevice(); } - _audio_channels = _audio.getDeviceInfo(st).outputChannels; - - RtAudio::StreamParameters sp; - sp.deviceId = st; - sp.nChannels = _audio_channels; - sp.firstChannel = 0; try { + _audio_channels = _audio.getDeviceInfo(st).outputChannels; + RtAudio::StreamParameters sp; + sp.deviceId = st; + sp.nChannels = _audio_channels; + sp.firstChannel = 0; _audio.openStream (&sp, 0, RTAUDIO_FLOAT32, 48000, &_audio_block_size, &rtaudio_callback, this); #ifdef DCPOMATIC_USE_RTERROR } catch (RtError& e) { #else } catch (RtAudioError& e) { #endif + _audio_channels = 0; error_dialog ( _video_view->get(), _("Could not set up audio output. There will be no audio during the preview."), std_to_wx(e.what()) |