From e91ab84201d0ccb1ec7aff3c410a8ced9e62f62f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 8 Nov 2020 21:40:43 +0100 Subject: [PATCH] Remove checks/support for obsolete RtError class (now RtAudioError). --- src/wx/film_viewer.cc | 4 ---- src/wx/wscript | 11 ----------- 2 files changed, 15 deletions(-) diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 428b5c4fa..c05e76f83 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -684,11 +684,7 @@ FilmViewer::config_changed (Config::Property p) sp.firstChannel = 0; try { _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 error_dialog ( _panel, _("Could not set up audio output. There will be no audio during the preview."), std_to_wx(e.what()) diff --git a/src/wx/wscript b/src/wx/wscript index 105a61f2d..aabe0c32d 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -233,17 +233,6 @@ def configure(conf): conf.env.LIB_RTAUDIO.append('mfuuid') conf.env.LIB_RTAUDIO.append('wmcodecdspuuid') - conf.check_cxx(fragment=""" - #include \n - int main() { throw RtError("Hello"); } - """, - msg='Checking for RtError class', - use='RTAUDIO', - uselib_store='', - define_name='DCPOMATIC_USE_RTERROR', - mandatory=False) - - def build(bld): if bld.env.STATIC_DCPOMATIC: -- 2.30.2