Remove checks/support for obsolete RtError class (now RtAudioError).
authorCarl Hetherington <cth@carlh.net>
Sun, 8 Nov 2020 20:40:43 +0000 (21:40 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 8 Nov 2020 20:40:43 +0000 (21:40 +0100)
src/wx/film_viewer.cc
src/wx/wscript

index 428b5c4fa089ac4b842d9345f07d09df28910d18..c05e76f83b902b67bb52ffc9dadaa6c13da5721c 100644 (file)
@@ -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())
index 105a61f2dbec34683e93789c02d46d8c0ad7a520..aabe0c32d4e5f5ab576c46f84de8da6f83a53076 100644 (file)
@@ -233,17 +233,6 @@ def configure(conf):
         conf.env.LIB_RTAUDIO.append('mfuuid')
         conf.env.LIB_RTAUDIO.append('wmcodecdspuuid')
 
-    conf.check_cxx(fragment="""
-                            #include <RtAudio.h>\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: