From b83e61259c0244d5618c5ed9dcc8602205580886 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 8 Nov 2020 22:13:34 +0100
Subject: [PATCH] Remove references to / support for old RtError class (now
 RtAudioError).

---
 src/wx/config_dialog.cc | 16 ----------------
 src/wx/film_viewer.cc   |  8 --------
 src/wx/wscript          | 10 ----------
 3 files changed, 34 deletions(-)

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 40bb43407..957fd32db 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -886,11 +886,7 @@ SoundPage::setup ()
 			if (dev.probed && dev.outputChannels > 0) {
 				_sound_output->Append (std_to_wx (dev.name));
 			}
-#ifdef DCPOMATIC_USE_RTERROR
-		} catch (RtError&) {
-#else
 		} catch (RtAudioError&) {
-#endif
 			/* Something went wrong so let's just ignore that device */
 		}
 	}
@@ -927,11 +923,7 @@ SoundPage::sound_output_changed ()
 	string default_device;
 	try {
 		default_device = audio.getDeviceInfo(audio.getDefaultOutputDevice()).name;
-#ifdef DCPOMATIC_USE_RTERROR
-	} catch (RtError&) {
-#else
 	} catch (RtAudioError&) {
-#endif
 		/* Never mind */
 	}
 	if (!so || *so == default_device) {
@@ -958,11 +950,7 @@ SoundPage::config_changed ()
 		RtAudio audio (DCPOMATIC_RTAUDIO_API);
 		try {
 			configured_so = audio.getDeviceInfo(audio.getDefaultOutputDevice()).name;
-#ifdef DCPOMATIC_USE_RTERROR
-		} catch (RtError&) {
-#else
 		} catch (RtAudioError&) {
-#endif
 			/* Probably no audio devices at all */
 		}
 	}
@@ -1000,11 +988,7 @@ SoundPage::config_changed ()
 				if (info.name == *configured_so && info.outputChannels > 0) {
 					channels = info.outputChannels;
 				}
-#ifdef DCPOMATIC_USE_RTERROR
-			} catch (RtError&) {
-#else
 			} catch (RtAudioError&) {
-#endif
 				/* Never mind */
 			}
 		}
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 997fe88c8..20cbb434c 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -534,11 +534,7 @@ FilmViewer::config_changed (Config::Property p)
 					if (_audio.getDeviceInfo(st).name == Config::instance()->sound_output().get()) {
 						break;
 					}
-#ifdef DCPOMATIC_USE_RTERROR
-				} catch (RtError&) {
-#else
 				} catch (RtAudioError&) {
-#endif
 					/* Something went wrong with that device so we don't want to use it anyway */
 				}
 				++st;
@@ -557,11 +553,7 @@ FilmViewer::config_changed (Config::Property p)
 			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(),
diff --git a/src/wx/wscript b/src/wx/wscript
index d72c20940..3f0ca2b97 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -263,16 +263,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)
-
     if conf.env.TARGET_WINDOWS or conf.env.TARGET_LINUX:
         conf.check_cfg(package='gl', args='--cflags --libs', uselib_store='GL', mandatory=True)
         conf.check_cfg(package='glu', args='--cflags --libs', uselib_store='GLU', mandatory=True)
-- 
2.30.2